s416178/Punktonerzy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'pop'

Browse Source
This commit is contained in:
yetju000 2019-12-08 19:50:08 +01:00
commit d5aad7ea5b
7 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BackEnd/src/main/java/studycave/studycaverestservice/controller/SetController.java
View File

@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@ -301,7 +300,7 @@ public class SetController {
return new ResponseEntity<>(new String("User not found"), HttpStatus.NOT_FOUND);
ArrayList<SimpleSetDTO> setDTOs = new ArrayList<SimpleSetDTO>();
List<SimpleSet> sets = simpleSetRepository.findByOptionalPermissionAndOptionalOwner(permission, ownerId);
List<SimpleSet> sets = simpleSetRepository.findByOptionalPermissionAndOptionalOwnerAndGroupIdNull(permission, ownerId);
for (SimpleSet set : sets) {
String username = userRepository.findById((long) set.getIdOwner()).get().getUsername();

2
BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java
View File

@ -291,7 +291,7 @@ public class TestController {
ArrayList<SimpleTestDTO> testDTOs = new ArrayList<SimpleTestDTO>();
List<SimpleTest> tests = simpleTestRepository.findByOptionalPermissionAndOptionalOwner(permission, ownerId);
List<SimpleTest> tests = simpleTestRepository.findByGroupIdNullAndOptionalPermissionAndOptionalOwner(permission, ownerId);
for (SimpleTest test : tests) {
String username = userRepository.findById((long) test.getIdOwner()).get().getUsername();
SimpleTestDTO testDTO = modelMapper.map(test, SimpleTestDTO.class);

5
BackEnd/src/main/java/studycave/studycaverestservice/controller/UploadController.java
View File

@ -2,7 +2,6 @@ package studycave.studycaverestservice.controller;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@ -29,10 +28,8 @@ import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
@ -155,7 +152,7 @@ public class UploadController {
System.out.println("Permission: " + permission);
List<MaterialGetDTO> materialDTOs = new ArrayList<>();
List<Material> materials = materialRepository.findByOptionalPermissionAndOptionalOwner(permission,ownerId);
List<Material> materials = materialRepository.findByOptionalPermissionAndOptionalOwnerAndGroupIdNull(permission,ownerId);
for(Material material : materials) {
System.out.println(material);

8
BackEnd/src/main/java/studycave/studycaverestservice/controller/UserContentController.java
View File

@ -1,9 +1,7 @@
package studycave.studycaverestservice.controller;
import java.sql.Date;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Optional;
@ -62,7 +60,7 @@ public class UserContentController {
return new ResponseEntity<>(new String("User not found"), HttpStatus.NOT_FOUND);
ArrayList<SimpleSetDTO> setDTOs = new ArrayList<SimpleSetDTO>();
List<SimpleSet> sets = simpleSetRepository.findByOptionalPermissionAndOptionalOwner(null, ownerId);
List<SimpleSet> sets = simpleSetRepository.findByOptionalPermissionAndOptionalOwnerAndGroupIdNull(null, ownerId);
for (SimpleSet set : sets) {
Boolean isInGroup = false;
@ -100,7 +98,7 @@ public class UserContentController {
return new ResponseEntity<>(new String("User not found"), HttpStatus.NOT_FOUND);
ArrayList<MaterialGetDTO> materialDTOs = new ArrayList<MaterialGetDTO>();
List<Material> materials = materialRepository.findByOptionalPermissionAndOptionalOwner(null, ownerId);
List<Material> materials = materialRepository.findByOptionalPermissionAndOptionalOwnerAndGroupIdNull(null, ownerId);
for (Material material : materials) {
Boolean isInGroup = false;
@ -138,7 +136,7 @@ public class UserContentController {
return new ResponseEntity<>(new String("User not found"), HttpStatus.NOT_FOUND);
ArrayList<SimpleTestDTO> testDTOs = new ArrayList<SimpleTestDTO>();
List<SimpleTest> tests = simpleTestRepository.findByOptionalPermissionAndOptionalOwner(null, new Long(ownerId));
List<SimpleTest> tests = simpleTestRepository.findByGroupIdNullAndOptionalPermissionAndOptionalOwner(null, new Long(ownerId));
for (SimpleTest test : tests) {
Boolean isInGroup = false;

6
BackEnd/src/main/java/studycave/studycaverestservice/model/material/MaterialRepository.java
View File

@ -12,9 +12,9 @@ public interface MaterialRepository extends JpaRepository<Material, Long> {
@Query("select m from Material m where (:permission is null or m.permission = :permission) and "
+ "(:owner is null or m.owner = :owner)")
List<Material> findByOptionalPermissionAndOptionalOwner(@Param("permission") String permission,
@Param("owner") Integer owner);
+ "(:owner is null or m.owner = :owner) and m.group is null")
List<Material> findByOptionalPermissionAndOptionalOwnerAndGroupIdNull(@Param("permission") String permission,
@Param("owner") Integer owner);
@Query("select t from Material t where (t.permission = 'GROUP' and t.group.id = :g and t.status = 'VERIFIED' )")

6
BackEnd/src/main/java/studycave/studycaverestservice/model/simpleSet/SimpleSetRepository.java
View File

@ -16,7 +16,7 @@ public interface SimpleSetRepository extends JpaRepository<SimpleSet, Long> {
@Query("select s from SimpleSet s where (:permission is null or s.permission = :permission) and "
+ "(:owner is null or s.idOwner = :owner)")
List<SimpleSet> findByOptionalPermissionAndOptionalOwner(@Param("permission") String permission,
@Param("owner") Integer owner);
+ "(:owner is null or s.idOwner = :owner) and groupId is null")
List<SimpleSet> findByOptionalPermissionAndOptionalOwnerAndGroupIdNull(@Param("permission") String permission,
@Param("owner") Integer owner);
}

6
BackEnd/src/main/java/studycave/studycaverestservice/model/simpleTest/SimpleTestRepository.java
View File

@ -10,7 +10,7 @@ public interface SimpleTestRepository extends JpaRepository<SimpleTest, Long> {
List<SimpleTest> findAll();
@Query("select t from SimpleTest t where (:permission is null or t.permission = :permission) and "
+ "(:owner is null or t.idOwner = :owner)")
List<SimpleTest> findByOptionalPermissionAndOptionalOwner(@Param("permission") String permission,
@Param("owner") Long owner);
+ "(:owner is null or t.idOwner = :owner) and t.groupId is null")
List<SimpleTest> findByGroupIdNullAndOptionalPermissionAndOptionalOwner(@Param("permission") String permission,
@Param("owner") Long owner);
}