Revize 212b0072

https://kivprogrammers.atlassian.net/browse/TSP2-63

dotazeni distinct typu kategorie a typu work unitu pro filtrovani z db - parsovani nactenych work unitu neni viable

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/repository/managment/WorkUnitRepository.java

@@ -62 +62 @@
     @Modifying
     @Transactional
     int updateWuActivity(@Param("activityId")Long activityId, @Param("wuIds") List<Long> wuIds);
+    @Query("SELECT DISTINCT cat.name from WorkUnit  unit INNER JOIN Category cat on cat MEMBER OF unit.categories AND unit.project.id = ?1")
+    List<String> fetchProjectWorkUnitsCategories(Long projectId);
+    @Query("SELECT DISTINCT unit.type.name from WorkUnit  unit WHERE unit.project.id = ?1")
+    List<String> fetchProjectWorkUnitsTypes(Long projectId);
+
+
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/controller/management/WorkUnitController.java

@@ -30 +30 @@
             return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
         }
         List<WorkUnit> units = this.workUnitService.fetchProjectWorkUnits(projectId, category, type);
-        Set<String> workUnitCategories = this.workUnitService.parseWorkUnitCategories(units);
-        Set<String> workUnitTypes = this.workUnitService.parseWorkUnitTypes(units);
+        //jde optimalizovat - neni cas
+        List<String> workUnitCategories = this.workUnitService.fetchProjectWorkUnitCategories(projectId);
+        List<String> workUnitTypes = this.workUnitService.fetchProjectWorkUnitTypes(projectId);
 
         if(units.size() == 0) {
             return ResponseEntity.ok(null);

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/workUnit/WorkUnitServiceV2.java

@@ -3 +3 @@
 import com.sun.istack.NotNull;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.management.WorkUnit;
 
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Set;
 
 public interface WorkUnitServiceV2 {
     List<WorkUnit> fetchProjectWorkUnits(long activityId, String category, List <String> type);
     boolean updateWorkUnitsActivity(long activityId, List<Long> wuIds);
-    Set<String> parseWorkUnitCategories(@NotNull List<WorkUnit> workUnits);
-    Set<String> parseWorkUnitTypes(@NotNull List<WorkUnit> workUnits);
+
+    List<String> fetchProjectWorkUnitCategories(Long projectId);
+    List<String> fetchProjectWorkUnitTypes(Long projectId);
+
+
 
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/workUnit/WorkUnitServiceV2Impl.java

@@ -42 +42 @@
     }
 
     @Override
-    public Set<String> parseWorkUnitCategories(List<WorkUnit> workUnits) {
-        Set<String> workUnitCategories = new HashSet<>();
-        for(WorkUnit unit : workUnits) {
-            for(Category categ : unit.getCategories())
-                workUnitCategories.add(categ.getName());
-        }
-        return workUnitCategories;
+    public List<String> fetchProjectWorkUnitCategories(Long projectId) {
+
+        return this.workUnitRepository.fetchProjectWorkUnitsCategories(projectId);
     }
 
     @Override
-    public Set<String> parseWorkUnitTypes(List<WorkUnit> workUnits) {
-        Set<String> workUnitTypes = new HashSet<>();
-        for(WorkUnit unit : workUnits) {
-            workUnitTypes.add(unit.getType().getName());
-        }
-        return workUnitTypes;
+    public List<String> fetchProjectWorkUnitTypes(Long projectId) {
+        return this.workUnitRepository.fetchProjectWorkUnitsTypes(projectId);
     }
 
+
 }