Merge pull request #576 from mauroz77/master

Removing summary status logic from project mapper.

impc_prod_tracker/core/src/main/java/org/gentar/biology/plan/engine/PlanCreator.java

@@ -4,13 +4,11 @@
 import org.gentar.audit.history.HistoryService;
 import org.gentar.biology.plan.Plan;
 import org.gentar.biology.plan.PlanStatusManager;
-import org.gentar.biology.plan.attempt.phenotyping.PhenotypingAttempt;
-import org.gentar.biology.plan.attempt.phenotyping.stage.PhenotypingStage;
+import org.gentar.biology.project.ProjectService;
 import org.springframework.stereotype.Component;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.transaction.Transactional;
-import java.util.Set;
 
 /**
  * Class with the logic to save a plan in the system.
@@ -23,27 +21,32 @@ public class PlanCreator
     private EntityManager entityManager;
     private HistoryService<Plan> historyService;
     private PlanStatusManager planStatusManager;
+    private ProjectService projectService;
 
     public PlanCreator(
         EntityManager entityManager,
         HistoryService<Plan> historyService,
-        PlanStatusManager planStatusManager)
+        PlanStatusManager planStatusManager,
+        ProjectService projectService)
     {
         this.entityManager = entityManager;
         this.historyService = historyService;
         this.planStatusManager = planStatusManager;
+        this.projectService = projectService;
     }
 
     /**
      * Create a project in the system and keep trace of the event in the history.
      * @param plan Object with the project information before it is saved in database.
      * @return Created project.
      */
+    @Transactional
     public Plan createPlan(Plan plan)
     {
         setStatusAndSummaryStatus(plan);
         Plan createdPlan = savePlan(plan);
         registerCreationInHistory(createdPlan);
+        updateProjectDueToChangesInChild(plan);
         return createdPlan;
     }
 
@@ -78,4 +81,14 @@ private String buildPin(Long id)
         identifier = "PIN:" + identifier;
         return identifier;
     }
+
+    /**
+     * The creation in the plan can lead to changes in the project (summary status or
+     * assignment status, for instance). So we need to notify the project about this.
+     * @param plan Plan that was created.
+     */
+    private void updateProjectDueToChangesInChild(Plan plan)
+    {
+        projectService.checkForUpdates(plan.getProject());
+    }
 }

impc_prod_tracker/core/src/main/java/org/gentar/biology/plan/engine/PlanUpdaterImpl.java

@@ -49,7 +49,7 @@ public History updatePlan(Plan originalPlan, Plan newPlan)
         History history = detectTrackOfChanges(originalPlan, newPlan);
         saveChanges(newPlan);
         saveTrackOfChanges(history);
-        projectService.checkForUpdates(newPlan.getProject());
+        updateProjectDueToChangesInChild(newPlan);
         return history;
     }
 
@@ -113,4 +113,14 @@ private void saveTrackOfChanges(History history)
     {
         historyService.saveTrackOfChanges(history);
     }
+
+    /**
+     * The modification in the plan can lead to changes in the project (summary status or
+     * assignment status, for instance). So we need to notify the project about this.
+     * @param plan Plan that was updated.
+     */
+    private void updateProjectDueToChangesInChild(Plan plan)
+    {
+        projectService.checkForUpdates(plan.getProject());
+    }
 }

impc_prod_tracker/core/src/main/java/org/gentar/biology/project/summary_status/ProjectSummaryStatusUpdater.java

@@ -43,7 +43,10 @@ public void calculateSummaryStatus(Project project)
         {
             summaryStatus = getMostAdvancedSummaryStatusFromPlans(project);
         }
-        setAndLogNewSummaryStatus(project, summaryStatus);
+        if (summaryStatus != null)
+        {
+            setAndLogNewSummaryStatus(project, summaryStatus);
+        }
     }
 
     private Status getMostAdvancedSummaryStatusFromPlans(Project project)

impc_prod_tracker/rest-api/src/main/asciidoc/restapi.adoc

@@ -220,12 +220,13 @@ include::{snippets}/projects/allProjectsWithFilter/http-response.adoc[]
 
 ==== Create a project
 
-Currently the rules to be able to create a project are:
+In order to create a project, it's necessary to create also a plan attached to it.
 
-TODO!!!: <<Verify which rules still aply>>
+===== Example Request
+
+Curl:
+include::{snippets}/projects/createProject/request-body.adoc[]
 
-- A user from a consortium can create a project without a plan associated with it.
-- A user from a work unit can create a project with a plan associated with it.
 
 
 

impc_prod_tracker/rest-api/src/main/java/org/gentar/biology/plan/PlanMapper.java

@@ -186,7 +186,17 @@ public Plan toEntity(PlanDTO planDTO)
     {
         Plan plan = entityMapper.toTarget(planDTO, Plan.class);
         setEvent(plan, planDTO);
-        plan.setProject(projectService.getProjectByTpn(planDTO.getTpn()));
+        Project project = projectService.getProjectByTpn(planDTO.getTpn());
+        plan.setProject(project);
+        // Making the association explicit.
+        if (project.getPlans() == null)
+        {
+            Set<Plan> plans = new HashSet<>();
+
+            project.setPlans(plans);
+        }
+        project.getPlans().add(plan);
+
         Set<Funder> funders = new HashSet<>(funderMapper.toEntities(planDTO.getFunderNames()));
         plan.setFunders(funders);
         plan.setWorkUnit(workUnitMapper.toEntity(planDTO.getWorkUnitName()));

impc_prod_tracker/rest-api/src/main/java/org/gentar/biology/project/ProjectDtoToEntityMapper.java

@@ -61,7 +61,6 @@ public ProjectDtoToEntityMapper(
     public Project toEntity(ProjectDTO projectDTO)
     {
         Project project = entityMapper.toTarget(projectDTO, Project.class);
-        setSummaryStatus(project, projectDTO);
         setProjectIntention(project, projectDTO);
         setPrivacy(project, projectDTO);
         setConsortia(project, projectDTO);
@@ -75,17 +74,6 @@ private void setSpecies(Project project, ProjectDTO projectDTO)
         project.setSpecies(species);
     }
 
-    private void setSummaryStatus(Project project, ProjectDTO projectDTO)
-    {
-        if (projectDTO.getSummaryStatusName() == null) {
-            project.setSummaryStatus(
-                    summaryStatusMapper.toEntity("Plan Created"));
-        } else {
-            project.setSummaryStatus(
-                    summaryStatusMapper.toEntity(projectDTO.getSummaryStatusName()));
-        }
-    }
-
     private void setProjectIntention(Project project, ProjectDTO projectDTO)
     {
         List<ProjectIntention> projectIntentions =

impc_prod_tracker/rest-api/src/test/java/org/gentar/web/controller/project/ProjectControllerTest.java

@@ -20,10 +20,8 @@
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.core.StringContains.containsString;
 import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath;
 import static org.springframework.restdocs.payload.PayloadDocumentation.responseFields;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 class ProjectControllerTest extends ControllerTestTemplate

impc_prod_tracker/rest-api/src/test/resources/dbunit/projects/multipleProjects.xml

@@ -82,4 +82,5 @@
     <PLAN_STATUS_STAMP/>
     <PLAN_SUMMARY_STATUS_STAMP/>
     <ASSIGNMENT_STATUS_STAMP/>
+    <PROJECT_SUMMARY_STATUS_STAMP/>
 </dataset>