Merge pull request #45 from consiglionazionaledellericerche/44-errore…

…-durante-laggiornamento-dei-contratti-per-chiave-duplicata-in-contractmonthrecat Corretta gestione merge e persist nell'aggiornamento contratti.
consiglionazionaledellericerche · Sep 9, 2024 · a29488c · a29488c
2 parents b6f3159 + bc5e719
commit a29488c
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 22 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.4.1
+0.4.2
diff --git a/src/main/java/it/cnr/iit/epas/config/OpenApiConfiguration.java b/src/main/java/it/cnr/iit/epas/config/OpenApiConfiguration.java
@@ -36,7 +36,7 @@
 @Configuration
 @OpenAPIDefinition(
     info = @Info(title = "ePAS Service", 
-    version = "4.0.0-beta.2", 
+    version = "4.0.0-beta.3", 
     description = "ePAS Service contains all the business logic and related REST endpoints"
         + " to manage all the personnel information."),
     servers = {@Server(url = "/", description = "ePAS Service URL")}

diff --git a/src/main/java/it/cnr/iit/epas/dao/wrapper/WrapperContract.java b/src/main/java/it/cnr/iit/epas/dao/wrapper/WrapperContract.java
@@ -17,6 +17,16 @@
 
 package it.cnr.iit.epas.dao.wrapper;
 
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import javax.inject.Inject;
+
+import org.springframework.stereotype.Component;
+
 import it.cnr.iit.epas.dao.AbsenceDao;
 import it.cnr.iit.epas.models.Contract;
 import it.cnr.iit.epas.models.ContractMonthRecap;
@@ -25,13 +35,6 @@
 import it.cnr.iit.epas.models.absences.JustifiedType.JustifiedTypeName;
 import it.cnr.iit.epas.utils.DateInterval;
 import it.cnr.iit.epas.utils.DateUtility;
-import java.time.LocalDate;
-import java.time.YearMonth;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import javax.inject.Inject;
-import org.springframework.stereotype.Component;
 
 /**
  * Contract con alcune funzionalità aggiuntive.

diff --git a/src/main/java/it/cnr/iit/epas/manager/ConsistencyManagerUtils.java b/src/main/java/it/cnr/iit/epas/manager/ConsistencyManagerUtils.java
@@ -518,7 +518,11 @@ private ContractMonthRecap populateContractMonthFromSource(IWrapperContract cont
         cmr.buoniPastoDaInizializzazione = 0;
         cmr.remainingMealTickets = 0;
       }
-      emp.get().persist(cmr);
+      if (emp.get().contains(cmr)) {
+        emp.get().merge(cmr);
+      } else {
+        emp.get().persist(cmr);
+      }
       //cmr.save();
       contract.getValue().contractMonthRecaps.add(cmr);
       emp.get().merge(contract.getValue());
@@ -529,17 +533,24 @@ private ContractMonthRecap populateContractMonthFromSource(IWrapperContract cont
     // Caso complesso, combinare inizializzazione e database.
 
     ContractMonthRecap cmr = buildContractMonthRecap(contract, yearMonthToCompute);
-
     contract.getValue().contractMonthRecaps.add(cmr);
-    emp.get().merge(cmr);
+    if (emp.get().contains(cmr)) {
+      emp.get().merge(cmr);
+    } else {
+      emp.get().persist(cmr);
+    }
     //cmr.save();
 
     // Informazioni relative ai residui
     List<Absence> otherCompensatoryRest = Lists.newArrayList();
     contractMonthRecapManager.computeResidualModule(cmr, Optional.<ContractMonthRecap>empty(),
         yearMonthToCompute, LocalDate.now().minusDays(1), otherCompensatoryRest, Optional.empty());
 
-    emp.get().merge(cmr);
+    if (emp.get().contains(cmr)) {
+      emp.get().merge(cmr);
+    } else {
+      emp.get().persist(cmr);
+    }
     //cmr.save();
 
     emp.get().merge(contract.getValue());
@@ -556,7 +567,6 @@ private ContractMonthRecap buildContractMonthRecap(IWrapperContract contract,
       YearMonth yearMonth) {
 
     Optional<ContractMonthRecap> cmrOld = contract.getContractMonthRecap(yearMonth);
-
     if (cmrOld.isPresent()) {
       cmrOld.get().clean();
       return cmrOld.get();

diff --git a/src/main/java/it/cnr/iit/epas/manager/ContractManager.java b/src/main/java/it/cnr/iit/epas/manager/ContractManager.java
@@ -272,7 +272,7 @@ public void recomputeContract(final Contract contract, final Optional<LocalDate>
       // TODO: anche quelli sulle ferie quando ci saranno
       for (ContractMonthRecap cmr : contract.contractMonthRecaps) {
         if (!yearMonthFrom.isAfter(YearMonth.of(cmr.year, cmr.month))) {
-          if (cmr.getId() != null) {
+          if (emp.get().contains(cmr)) {
             emp.get().remove(cmr);
           }
         }
@@ -554,13 +554,12 @@ public boolean applyPreviousContractLink(Contract contract, boolean linkedToPrev
       }
     } else {
       Contract temp = contract.getPreviousContract();
-      if (temp == null) {
-        return false;
-      }
-      contract.setPreviousContract(null);
-      if (temp.getEndDate() != null 
-          && contract.getBeginDate().minusDays(1).isEqual(temp.getEndDate())) {
-        splitVacationPeriods(contract);
+      if (temp != null) {
+        contract.setPreviousContract(null);
+        if (temp.getEndDate() != null 
+            && contract.getBeginDate().minusDays(1).isEqual(temp.getEndDate())) {
+          splitVacationPeriods(contract);
+        }
       }
     }
     return true;