diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/controller/UserContentController.java b/BackEnd/src/main/java/studycave/studycaverestservice/controller/UserContentController.java index d760ce6..8cb770f 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/controller/UserContentController.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/controller/UserContentController.java @@ -153,6 +153,10 @@ public class UserContentController { } } } + if (!isInGroup) { + if (simpleTestRepository.findByGroupIdAndTitleLike(Integer.parseInt(groupId), test.getTitle()).isPresent()) + isInGroup = true; + } if (!isInGroup) { SimpleTestDTO testDTO = modelMapper.map(test, SimpleTestDTO.class); testDTO.setOwner(currentPrincipalName); diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/model/simpleTest/SimpleTestRepository.java b/BackEnd/src/main/java/studycave/studycaverestservice/model/simpleTest/SimpleTestRepository.java index 56feac3..a82d04b 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/model/simpleTest/SimpleTestRepository.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/model/simpleTest/SimpleTestRepository.java @@ -5,10 +5,13 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import java.util.List; +import java.util.Optional; public interface SimpleTestRepository extends JpaRepository { List findAll(); + Optional findByGroupIdAndTitleLike(Integer groupId, String title); + @Query("select t from SimpleTest t where (:permission is null or t.permission = :permission) and " + "(:owner is null or t.idOwner = :owner) and t.groupId is null") List findByGroupIdNullAndOptionalPermissionAndOptionalOwner(@Param("permission") String permission,