Merge pull request #284 from TexasDigitalLibrary/4.0.x-sprint17-vir-1…

…44-further-filter-by-merging 4.0.x sprint17 vir 144 further filter by merging
TexasDigitalLibrary · Oct 14, 2016 · 299513a · 299513a
2 parents 3ae7662 + 299fefd
commit 299513a
Show file tree

Hide file tree

Showing 53 changed files with 1,419 additions and 1,028 deletions.
diff --git a/src/main/java/org/tdl/vireo/controller/SubmissionController.java b/src/main/java/org/tdl/vireo/controller/SubmissionController.java
@@ -108,7 +108,8 @@ public ApiResponse updateSubmission(@ApiVariable("submissionId") Long submission
     @ApiMapping("/query/{page}/{size}")
     @Auth(role = "MANAGER")
     public ApiResponse querySubmission(@ApiCredentials Credentials credentials, @ApiVariable Integer page, @ApiVariable Integer size, @ApiModel List<SubmissionListColumn> submissionListColumns) {
-        return new ApiResponse(SUCCESS, submissionRepo.pageableDynamicSubmissionQuery(credentials, submissionListColumns, new PageRequest(page, size)));
+        User user = userRepo.findByEmail(credentials.getEmail());       
+        return new ApiResponse(SUCCESS, submissionRepo.pageableDynamicSubmissionQuery(user.getActiveFilter(), submissionListColumns, new PageRequest(page, size)));
     }
 
     @ApiMapping("/all-submission-state")
@@ -124,7 +125,7 @@ public ApiResponse batchUpdateSubmissionStates(@ApiCredentials Credentials crede
 
         User user = userRepo.findByEmail(credentials.getEmail());
 
-        submissionRepo.dynamicSubmissionQuery(credentials, user.getSubmissionViewColumns()).forEach(sub -> {
+        submissionRepo.batchDynamicSubmissionQuery(user.getActiveFilter(), user.getSubmissionViewColumns()).forEach(sub -> {
             sub.setState(submissionState);
             submissionRepo.save(sub);
         });
@@ -140,7 +141,7 @@ public ApiResponse batchAssignTo(@ApiCredentials Credentials credentials, @ApiMo
 
         User user = userRepo.findByEmail(credentials.getEmail());
 
-        submissionRepo.dynamicSubmissionQuery(credentials, user.getSubmissionViewColumns()).forEach(sub -> {
+        submissionRepo.batchDynamicSubmissionQuery(user.getActiveFilter(), user.getSubmissionViewColumns()).forEach(sub -> {
             sub.setAssignee(assignee);
             submissionRepo.save(sub);
         });