avniproject/avni-product#1576 | GET /api/approvalStatuses - Fix query by entityType

Author: 1t5j0y

avni-server-api/src/main/java/org/avni/server/dao/EntityApprovalStatusRepository.java

@@ -49,7 +49,7 @@ default Page<EntityApprovalStatus> findEntityApprovalStatuses(EntityApprovalStat
         return findAll(specification, pageable);
     }
 
-    default Specification<EntityApprovalStatus> findByEntityTypeSpec(String entityType) {
+    default Specification<EntityApprovalStatus> findByEntityTypeSpec(EntityApprovalStatus.EntityType entityType) {
         Specification<EntityApprovalStatus> spec = (Root<EntityApprovalStatus> root, CriteriaQuery<?> query, CriteriaBuilder cb) -> {
             return cb.and(cb.equal(root.get("entityType"), entityType));
         };

avni-server-api/src/main/java/org/avni/server/dao/EntityApprovalStatusSearchParams.java

@@ -1,15 +1,16 @@
 package org.avni.server.dao;
 
+import org.avni.server.domain.EntityApprovalStatus;
 import org.joda.time.DateTime;
 
 
 public class EntityApprovalStatusSearchParams {
     private final DateTime lastModifiedDateTime;
     private final DateTime now;
-    private final String entityType;
+    private final EntityApprovalStatus.EntityType entityType;
     private final String entityTypeUuid;
 
-    public EntityApprovalStatusSearchParams(DateTime lastModifiedDateTime, DateTime now, String entityType, String entityTypeUuid) {
+    public EntityApprovalStatusSearchParams(DateTime lastModifiedDateTime, DateTime now, EntityApprovalStatus.EntityType entityType, String entityTypeUuid) {
         this.lastModifiedDateTime = lastModifiedDateTime;
         this.now = now;
         this.entityType = entityType;
@@ -24,7 +25,7 @@ public DateTime getNow() {
         return now;
     }
 
-    public String getEntityType() {
+    public EntityApprovalStatus.EntityType getEntityType() {
         return entityType;
     }
 

avni-server-api/src/main/java/org/avni/server/web/api/EntityApprovalStatusApiController.java

@@ -42,10 +42,10 @@ public ResponsePage getEntityApprovalStatuses(@RequestParam(value = "lastModifie
                                                   @RequestParam(value = "entityTypeId", required = false) String entityTypeUuid,
                                                   Pageable pageable) {
 
-        Page<EntityApprovalStatus> entityApprovalStatuses = entityApprovalStatusRepository.findEntityApprovalStatuses(new EntityApprovalStatusSearchParams(lastModifiedDateTime, now, entityType, entityTypeUuid), pageable);
+        Page<EntityApprovalStatus> entityApprovalStatuses = entityApprovalStatusRepository.findEntityApprovalStatuses(new EntityApprovalStatusSearchParams(lastModifiedDateTime, now, EntityApprovalStatus.EntityType.valueOf(entityType), entityTypeUuid), pageable);
+        accessControlService.checkApprovePrivilegeOnEntityApprovalStatuses(entityApprovalStatuses.getContent());
         ArrayList<EntityApprovalStatusResponse> entityApprovalStatusResponse = new ArrayList<>();
         entityApprovalStatuses.forEach(entityApprovalStatus -> entityApprovalStatusResponse.add(EntityApprovalStatusResponse.fromEntityApprovalStatus(entityApprovalStatus, entityApprovalStatusService.getEntityUuid(entityApprovalStatus))));
-        accessControlService.checkApprovePrivilegeOnEntityApprovalStatuses(entityApprovalStatuses.getContent());
         return new ResponsePage(entityApprovalStatusResponse, entityApprovalStatuses.getNumberOfElements(), entityApprovalStatuses.getTotalPages(), entityApprovalStatuses.getSize());
     }
 }