Revize ba3279e3

https://kivprogrammers.atlassian.net/browse/TSP2-48 Implementace merge osob

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

@@ -16 +16 @@
 public class Person 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/service/managment/PersonService.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.service.managment;
 
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.Project;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.management.Person;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.PersonDto;
 
 import java.util.List;
 
@@ -39 +41 @@
      * @param id    Identifier of person
      */
     void deletePerson(Long id);
+
+    boolean mergePersons(Project project, List<PersonDto> personsToMerge, PersonDto personToMergeIn, String newName);
 }

src/main/java/cz/zcu/fav/kiv/antipatterndetectionapp/service/managment/PersonServiceImpl.java

@@ -1 +1 @@
 package cz.zcu.fav.kiv.antipatterndetectionapp.service.managment;
 
+import cz.zcu.fav.kiv.antipatterndetectionapp.model.Project;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.management.Person;
 import cz.zcu.fav.kiv.antipatterndetectionapp.repository.managment.PersonRepository;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.PersonDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -57 +59 @@
     public void deletePerson(Long id) {
         personRepository.deleteById(id);
     }
+
+    public boolean mergePersons(Project project, List<PersonDto> personsToMerge, PersonDto personToMergeIn, String newName) {
+        Person newPerson = null;
+
+        if (newName == null) {
+            newPerson = getPersonById(personToMergeIn.getId());
+        }
+        else if (personToMergeIn == null) {
+            newPerson = new Person(newName, project);
+            newPerson = savePerson(newPerson);
+        }
+        else {
+            return false;
+        }
+
+        if (newPerson == null || project == null || personsToMerge == null)
+            return false;
+
+
+        for(PersonDto personDto : personsToMerge) { // Relation update for every selected person
+            if (personDto.getId().longValue() == newPerson.getId().longValue())
+                continue;
+
+            Person person = getPersonById(personDto.getId());
+            updatePersonRelations(person.getId(), newPerson.getId());
+            deletePerson(person.getId());
+        }
+
+        return true;
+    }
 }

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

@@ -4 +4 @@
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.Project;
 import cz.zcu.fav.kiv.antipatterndetectionapp.model.management.Person;
 import cz.zcu.fav.kiv.antipatterndetectionapp.service.ProjectService;
+import cz.zcu.fav.kiv.antipatterndetectionapp.service.managment.PersonService;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.PersonDto;
+import cz.zcu.fav.kiv.antipatterndetectionapp.v2.model.PersonMergeRequest;
 import cz.zcu.fav.kiv.antipatterndetectionapp.v2.utils.converters.PersonToDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -29 +31 @@
     @Autowired
     private ProjectService projectService;
 
+    @Autowired
+    private PersonService personService;
+
     @PostMapping("/personsFromProject")
     public ResponseEntity<String> getPersonsFromProject(@RequestBody Map<String, String> requestData) {
         long ProjectId = Long.parseLong(requestData.get("projectId").toString());
@@ -51 +56 @@
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Failed to serialize data to JSON");
         }
     }
+
+    @PostMapping("/mergePersons")
+    public ResponseEntity<String> mergeToSelected(@RequestBody PersonMergeRequest mergeRequest) {
+        long projectId = mergeRequest.getProjectId();
+        Project personProject = projectService.getProjectById(projectId);
+
+        List<PersonDto> personsToMerge = mergeRequest.getPersons();
+        PersonDto personToMergeIn = mergeRequest.getPerson();
+        String newName = mergeRequest.getNewPersonName();
+
+        if (personService.mergePersons(personProject, personsToMerge, personToMergeIn, newName)) {
+            return ResponseEntity.status(HttpStatus.OK).body("Persons successfully merged");
+        }
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("Persons merge failed");
+    }
 }
+

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

@@ +1 @@
+package cz.zcu.fav.kiv.antipatterndetectionapp.v2.model;
+
+import java.util.List;
+
+public class PersonMergeRequest {
+
+    private List<PersonDto> persons;
+
+    private String newPersonName;
+
+    private PersonDto person;
+
+    private long projectId;
+
+    public List<PersonDto> getPersons() {
+        return persons;
+    }
+
+    public void setPersons(List<PersonDto> persons) {
+        this.persons = persons;
+    }
+
+    public String getNewPersonName() {
+        return newPersonName;
+    }
+
+    public void setNewPersonName(String newPersonName) {
+        this.newPersonName = newPersonName;
+    }
+
+    public PersonDto getPerson() {
+        return person;
+    }
+
+    public void setPerson(PersonDto person) {
+        this.person = person;
+    }
+
+    public long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(long projectId) {
+        this.projectId = projectId;
+    }
+}