Improvement in the information provided about the creation and modifi…

…cation date during the migration
ec-jrc · Nov 11, 2020 · 575d4d7 · 575d4d7
1 parent 9ec9fa9
commit 575d4d7
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 7 deletions.
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Base-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Base-1.0.jar
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2JavaAPI-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2JavaAPI-1.0.jar
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Migration-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Migration-1.0.jar
diff --git a/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Model-1.0.jar b/dist/app/re3gistry2/WEB-INF/lib/Re3gistry2Model-1.0.jar
diff --git a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Base-1.0.jar b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Base-1.0.jar
diff --git a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDInterface-1.0.jar
diff --git a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2CRUDrdb-1.0.jar
diff --git a/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Model-1.0.jar b/dist/app/re3gistry2restapi/WEB-INF/lib/Re3gistry2Model-1.0.jar
diff --git a/...JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegInstallationHandler.java b/...JavaAPI/src/main/java/eu/europa/ec/re3gistry2/javaapi/handler/RegInstallationHandler.java
@@ -357,9 +357,14 @@ public RegItem createRegItemWithoutCollection(String uriname, RegItemclass regIt
         }
 
         regItem.setCurrentversion(version);
-        regItem.setInsertdate(datecreation);
-        regItem.setEditdate(datelastupdate);
-
+        if (datecreation != null) {
+            regItem.setInsertdate(datecreation);
+        } else {
+            regItem.setInsertdate(new Date());
+        }
+        if (datelastupdate != null) {
+            regItem.setEditdate(datelastupdate);
+        }
         try {
             if (!entityManagerRe3gistry2.getTransaction().isActive()) {
                 entityManagerRe3gistry2.getTransaction().begin();

diff --git a/...ion/src/main/java/eu/europa/ec/re3gistry2/migration/manager/MigrateItemLatestVersion.java b/...ion/src/main/java/eu/europa/ec/re3gistry2/migration/manager/MigrateItemLatestVersion.java
@@ -648,8 +648,14 @@ public RegItem createRegItemWithoutCollection(Item item, RegItemclass regItemcla
             }
             regItem.setRorExport(Boolean.FALSE);
 
-            regItem.setInsertdate(item.getDatecreation());
-            regItem.setEditdate(item.getDatelastupdate());
+            if (item.getDatecreation() != null) {
+                regItem.setInsertdate(item.getDatecreation());
+            } else {
+                regItem.setInsertdate(new Date());
+            }
+            if (item.getDatelastupdate() != null) {
+                regItem.setEditdate(item.getDatelastupdate());
+            }
             regItem.setCurrentversion(version);
 
             if (localid.startsWith(BaseConstants.KEY_PARAMETER_HTTP) || localid.startsWith(BaseConstants.KEY_PARAMETER_HTTPS)) {
@@ -709,8 +715,14 @@ RegItem createRegItemWithCollection(Item item, RegItemclass regItemclass, Item i
             }
             regItem.setRorExport(Boolean.FALSE);
 
-            regItem.setInsertdate(item.getDatecreation());
-            regItem.setEditdate(item.getDatelastupdate());
+            if (item.getDatecreation() != null) {
+                regItem.setInsertdate(item.getDatecreation());
+            } else {
+                regItem.setInsertdate(new Date());
+            }
+            if (item.getDatelastupdate() != null) {
+                regItem.setEditdate(item.getDatelastupdate());
+            }
             regItem.setCurrentversion(version);
 
             if (localid.startsWith(BaseConstants.KEY_PARAMETER_HTTP) || localid.startsWith(BaseConstants.KEY_PARAMETER_HTTPS)) {

diff --git a/...Migration/src/main/java/eu/europa/ec/re3gistry2/migration/utility/ConstantsMigration.java b/...Migration/src/main/java/eu/europa/ec/re3gistry2/migration/utility/ConstantsMigration.java
@@ -83,6 +83,8 @@ public class ConstantsMigration {
             + "i.uriname as uriname, "
             + "i.itemclass as itemclass, "
             + "i.versionnumber as versionnumber, "
+            + "i.datecreation as datecreation, "
+            + "i.datelastupdate as datelastupdate, "
             + "i.status as status\n"
             + "FROM Item i \n"
             + "WHERE i.itemclass = :itemclass AND i.versionnumber = '0'";