Merge branch 'master' of https://git.wmi.amu.edu.pl/s416178/Punktonerzy
This commit is contained in:
commit
def718a76a
@ -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,
|
||||||
|
@ -35,7 +35,7 @@ public class StudyGroup {
|
|||||||
@Column(unique = true)
|
@Column(unique = true)
|
||||||
private String groupKey;
|
private String groupKey;
|
||||||
|
|
||||||
@OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
|
@OneToMany(mappedBy = "group", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
|
||||||
List<StudyGroupMember> members = new ArrayList<>();
|
List<StudyGroupMember> members = new ArrayList<>();
|
||||||
|
|
||||||
@OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
|
@OneToMany(mappedBy = "group", cascade = CascadeType.ALL)
|
||||||
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user