PUNKT-36 naprawa błędu z dodawaniem testów do grupy

This commit is contained in:
yetju000 2019-12-14 22:28:43 +01:00
parent 3bf021aa3b
commit 35eb2591ff
2 changed files with 7 additions and 0 deletions

View File

@ -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);

View File

@ -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<SimpleTest, Long> {
List<SimpleTest> findAll();
Optional<SimpleTest> 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<SimpleTest> findByGroupIdNullAndOptionalPermissionAndOptionalOwner(@Param("permission") String permission,