Revize f6e7917d

https://kivprogrammers.atlassian.net/browse/TSP2-60
Implementace změn kategorií

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/model/management/Activity.java

@@ -16 +16 @@
 public class Activity implements DatabaseObject {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false)
     private Long id;
 

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/model/management/Iteration.java

@@ -16 +16 @@
 public class Iteration implements DatabaseObject {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false)
     private Long id;
 

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/model/management/Phase.java

@@ -16 +16 @@
 public class Phase implements DatabaseObject {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false)
     private Long id;
 

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/model/management/WorkUnit.java

@@ -57 +57 @@
     private Project project;
 
     @ManyToMany
-    @JoinTable(name = "WorkUnitCategory",
+    @JoinTable(name = "work_unit_category",
             joinColumns = @JoinColumn(name = "workunitid"),
             inverseJoinColumns = @JoinColumn(name = "categoryid"))
     private Set<Category> categories = new LinkedHashSet<>();

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

@@ -2 +2 @@
 
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.management.Category;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.AdditionalInformationDto;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.CategoryChangeRequest;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.CategoryDto;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.GeneralResponseDto;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.service.management.category.ICategories;
@@ -32 +33 @@
     }
 
     @PostMapping("/changeCategory")
-    public ResponseEntity<GeneralResponseDto<CategoryDto, AdditionalInformationDto<String>>> changeCategory(@RequestParam(value = "selectedBox", required = false) List<CategoryDto> selectedCategories,
-                                                                                                            @RequestParam(value = "submitType", required = false) Integer submitType,
-                                                                                                            @RequestParam(value = "submitId", required = false) String submitId) {
-        return categories.handleCategoryChangeRequest(selectedCategories, submitType, submitId);
+    public ResponseEntity<GeneralResponseDto<CategoryDto, AdditionalInformationDto<String>>> changeCategory(@RequestBody CategoryChangeRequest categoryChangeRequest) {
+        return categories.handleCategoryChangeRequest(categoryChangeRequest);
     }
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/model/CategoryChangeRequest.java

@@ +1 @@
+package cz.zcu.fav.kiv.antipatterndetectionapp.v2.model;
+
+import java.util.List;
+
+public class CategoryChangeRequest {
+
+    private List<CategoryDto> categories;
+
+    private Integer submitType;
+
+    private long projectId;
+
+    public List<CategoryDto> getCategories() {
+        return categories;
+    }
+
+    public void setCategories(List<CategoryDto> categories) {
+        this.categories = categories;
+    }
+
+    public Integer getSubmitType() {
+        return submitType;
+    }
+
+    public void setSubmitType(Integer submitType) {
+        this.submitType = submitType;
+    }
+
+    public long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(long projectId) {
+        this.projectId = projectId;
+    }
+}

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/model/CategoryDto.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.v2.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class CategoryDto {
 
     private Long id;
@@ -15 +19 @@
 
     public static CategoryDtoBuilder builder() { return new CategoryDtoBuilder(); }
 
+    public Long getId() {
+        return id;
+    }
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/management/category/ICategories.java

@@ -2 +2 @@
 
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.management.Category;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.AdditionalInformationDto;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.CategoryChangeRequest;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.CategoryDto;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.GeneralResponseDto;
 import org.springframework.http.ResponseEntity;
@@ -11 +12 @@
 
 public interface ICategories {
 
+    /**
+     * Returns the list of categories for given project id
+     * @param projectId project ID
+     * @return ResponseEntity with the list of categories
+     */
     ResponseEntity<GeneralResponseDto<CategoryDto, AdditionalInformationDto<String>>> findCategoriesForProject(String projectId);
 
-    ResponseEntity<GeneralResponseDto<CategoryDto, AdditionalInformationDto<String>>> handleCategoryChangeRequest(@Nullable List<CategoryDto> selectedCategories,
-                                                                                                                  @Nullable Integer submitType,
-                                                                                                                  @Nullable String submitId);
+    /**
+     * Manage the request for categories change according to the given data
+     * @param categoryChangeRequest Input data with categories to change and type of the operation
+     * @return ResponseEntity with the results of the operation
+     */
+    ResponseEntity<GeneralResponseDto<CategoryDto, AdditionalInformationDto<String>>> handleCategoryChangeRequest(CategoryChangeRequest categoryChangeRequest);
 
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/v2/service/management/category/impl/CategoriesImpl.java

@@ -7 +7 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.service.ProjectService;
 import cz.zcu.fav.kiv.antipatterndetectionapp.service.managment.*;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.AdditionalInformationDto;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.CategoryChangeRequest;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.CategoryDto;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.GeneralResponseDto;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.service.management.category.ICategories;
@@ -35 +36 @@
     private final ActivityService activityService;
     private final PhaseService phaseService;
     private final String GENERAL_ERROR_MESSAGE = "ERROR: Application error occurred";
-    private final String SUBMISSION_ERROR_MESSAGE = "Cannot proceed: Submission went wrong";
     private final CategoryToDto categoryMapper = new CategoryToDto();
     private final String PROJECT_NOT_FOUND_MESSAGE = "Project not found!";
     private final String CATEGORIES_NOT_FOUND_MESSAGE = "Categories not found for the project!";
     private final String INVALID_PROJECT_ID = "Provided project ID is in invalid format!";
+    private final String CATEGORY_NOT_FOUND = "Category not found!";
 
     private Project getProjectById(Long id) {
         return projectService.getProjectById(id);
     }
 
     @Override
-    public ResponseEntity<GeneralResponseDto<CategoryDto, AdditionalInformationDto<String>>> handleCategoryChangeRequest(@Nullable List<CategoryDto> selectedCategories,
-                                                                                                                         @Nullable Integer submitType,
-                                                                                                                         @Nullable String submitId) {
-        List<Category> categories = new ArrayList<>();
+    public ResponseEntity<GeneralResponseDto<CategoryDto, AdditionalInformationDto<String>>> handleCategoryChangeRequest(CategoryChangeRequest categoryChangeRequest) {
+        List<CategoryDto> categoryDtos = categoryChangeRequest.getCategories();
+        Integer submitType = categoryChangeRequest.getSubmitType();
 
-        if (selectedCategories != null && submitType != null) { // Selected submit
+        // Checking input data
+        if (categoryDtos != null && submitType != null) {
             if (submitType <= 0 || submitType > Constants.SUBMIT_TYPES) { // ERROR: Unknown submitType
-                logger.warn("@PostMapping(\"/v2/management/changeCategory\") - Cannot proceed: Unknown submitType " + submitType);
-                return createResponseEntity(HttpStatus.BAD_REQUEST, GENERAL_ERROR_MESSAGE, null, null);
-            }
-        } else if (submitId != null) { //Inline submit
-            Pair<Integer, Long> resultPair = extractTypeAndId(submitId);
-            if (resultPair == null) { // Cannot be extracted
-                logger.warn("@PostMapping(\"/v2/management/changeCategory\") - Cannot proceed: Unknown submitId " + submitId);
                 return createResponseEntity(HttpStatus.BAD_REQUEST, GENERAL_ERROR_MESSAGE, null, null);
             }
+        }
 
-            // Add one category into new list
-            submitType = resultPair.getFirst();
-            Long id = resultPair.getSecond();
-            categories.add(categoryService.getCategoryById(id));
-
-        } else { //Unspecific error
-            logger.warn("@PostMapping(\"/management/segment-category\") - Cannot proceed: Submission went wrong");
-            return createResponseEntity(HttpStatus.BAD_REQUEST, SUBMISSION_ERROR_MESSAGE, null, null);
+        // Mapping CategoryDto to Category
+        List<Category> categories = new ArrayList<>();
+        for (CategoryDto categoryDto : categoryDtos) {
+            Category categoryTmp = categoryService.getCategoryById(categoryDto.getId());
+            if (categoryTmp != null) {
+                categories.add(categoryTmp);
+            }
+            else {
+                return createResponseEntity(HttpStatus.BAD_REQUEST, CATEGORY_NOT_FOUND, null, null);
+            }
         }
 
-        // Process all selected categories
+        // Processing all selected categories
         Pair<String, Boolean> result = processSelectedCategories(submitType, categories);
 
+        // Creating reponse information
         AdditionalInformationDto<String> additionalInformation = new AdditionalInformationDto<>();
+
         if (!result.getSecond()) {
             additionalInformation.addIntoCollection("successMessage", "All selected categories (" + categories.size() + ") were assign");
         } else {
@@ -130 +129 @@
                                                                                                                    @Nullable String message,
                                                                                                                    @Nullable List<CategoryDto> categories,
                                                                                                                    @Nullable AdditionalInformationDto<String> additionalInfo) {
-
-
         return new ResponseEntity<>(
                 GeneralResponseDto
                         .<CategoryDto, AdditionalInformationDto<String>>builder()