PUNKT-36 naprawa błędu z dodawaniem testów do grupy
This commit is contained in:
parent
3bf021aa3b
commit
35eb2591ff
@ -153,6 +153,10 @@ public class UserContentController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (!isInGroup) {
|
||||||
|
if (simpleTestRepository.findByGroupIdAndTitleLike(Integer.parseInt(groupId), test.getTitle()).isPresent())
|
||||||
|
isInGroup = true;
|
||||||
|
}
|
||||||
if (!isInGroup) {
|
if (!isInGroup) {
|
||||||
SimpleTestDTO testDTO = modelMapper.map(test, SimpleTestDTO.class);
|
SimpleTestDTO testDTO = modelMapper.map(test, SimpleTestDTO.class);
|
||||||
testDTO.setOwner(currentPrincipalName);
|
testDTO.setOwner(currentPrincipalName);
|
||||||
|
@ -5,10 +5,13 @@ import org.springframework.data.jpa.repository.Query;
|
|||||||
import org.springframework.data.repository.query.Param;
|
import org.springframework.data.repository.query.Param;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
public interface SimpleTestRepository extends JpaRepository<SimpleTest, Long> {
|
public interface SimpleTestRepository extends JpaRepository<SimpleTest, Long> {
|
||||||
List<SimpleTest> findAll();
|
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 "
|
@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")
|
+ "(:owner is null or t.idOwner = :owner) and t.groupId is null")
|
||||||
List<SimpleTest> findByGroupIdNullAndOptionalPermissionAndOptionalOwner(@Param("permission") String permission,
|
List<SimpleTest> findByGroupIdNullAndOptionalPermissionAndOptionalOwner(@Param("permission") String permission,
|
||||||
|
Loading…
Reference in New Issue
Block a user