From 6380d3c231dcc75816a829978878609bd1618dda Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 31 May 2022 20:43:27 +0300
Subject: [PATCH] Roadmap: Add logs. Make verified email by default true

---
 .../java/eu/eudat/migration/entities/User.java  |  2 +-
 .../migration/services/DMPRoadmapService.java   | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/dmp-backend/roadmap/src/main/java/eu/eudat/migration/entities/User.java b/dmp-backend/roadmap/src/main/java/eu/eudat/migration/entities/User.java
index 7b35b1698..ce765e345 100644
--- a/dmp-backend/roadmap/src/main/java/eu/eudat/migration/entities/User.java
+++ b/dmp-backend/roadmap/src/main/java/eu/eudat/migration/entities/User.java
@@ -138,7 +138,7 @@ public class User {
     userInfo.setUsertype((short) 0);
     userInfo.setUserStatus((short) 0);
     userInfo.setAuthorization_level((short) 1);
-    userInfo.setVerified_email(false);
+    userInfo.setVerified_email(true);
     userInfo.setCreated(getCreatedAt());
     return userInfo;
   }
diff --git a/dmp-backend/roadmap/src/main/java/eu/eudat/migration/services/DMPRoadmapService.java b/dmp-backend/roadmap/src/main/java/eu/eudat/migration/services/DMPRoadmapService.java
index 0e612f61f..a15a1796e 100644
--- a/dmp-backend/roadmap/src/main/java/eu/eudat/migration/services/DMPRoadmapService.java
+++ b/dmp-backend/roadmap/src/main/java/eu/eudat/migration/services/DMPRoadmapService.java
@@ -16,8 +16,9 @@ import eu.eudat.models.data.dmp.DataManagementPlanEditorModel;
 import eu.eudat.models.data.listingmodels.UserInfoListingModel;
 import eu.eudat.models.data.security.Principal;
 import eu.eudat.types.Authorities;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
@@ -26,8 +27,10 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 @Service
-@ConditionalOnProperty(prefix = "roadmap", name = "database.url")
 public class DMPRoadmapService {
+
+    private static final Logger logger = LoggerFactory.getLogger(DMPRoadmapService.class);
+
     /**
      * DMPRoadmap Repositories
      */
@@ -61,6 +64,7 @@ public class DMPRoadmapService {
         this.argosService.createUserInfo(Objects.requireNonNull(defaultUser()));
         List<User> users = this.userRepository.findAll();
         users.forEach(user -> {
+            logger.info("Create user with email: " + user.getEmail());
             this.argosService.createUserInfo(user.buildUserInfo());
         });
     }
@@ -87,6 +91,7 @@ public class DMPRoadmapService {
                                 return model;
                             }).collect(Collectors.toList()));
                         }
+                        logger.info("Create Dataset Profile with label: " + datasetProfile.getLabel());
                         id = this.argosService.createDatasetProfile(datasetProfile, principal);
                     } else {
                         if (users.size() > 0) {
@@ -102,6 +107,7 @@ public class DMPRoadmapService {
                                 return model;
                             }).collect(Collectors.toList()));
                         }
+                        logger.info("Create a new version of Dataset Profiles with label: " + datasetProfile.getLabel());
                         id = this.argosService.createNewVersionDatasetProfile(id, datasetProfile);
                     }
                     this.datasetProfiles.add(id);
@@ -112,6 +118,7 @@ public class DMPRoadmapService {
                         if (collaborators.size() > 0) {
                             principal = this.argosService.login(collaborators.get(0));
                         }
+                        logger.info("Create DMP and its Dataset with label: " + dataManagementPlanEditorModel.getLabel());
                         DataManagementPlan dmp = this.argosService.createDMP(dataManagementPlanEditorModel, principal);
                         this.dmps.add(dmp.getId());
                         if (collaborators.size() > 1) {
@@ -129,15 +136,17 @@ public class DMPRoadmapService {
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            System.out.println("Migration Failed. All data will be deleted.");
+            logger.error("Migration Failed. All data will be deleted.");
             this.clear();
         }
     }
 
     public void clear() {
+        logger.info("Deleting Datasets");
         this.datasets.forEach(id -> this.argosService.deleteDataset(id, this.principal));
+        logger.info("Deleting DMPs");
         this.dmps.forEach(this.argosService::deleteDMP);
+        logger.info("Deleting Dataset Profiles");
         this.datasetProfiles.forEach(this.argosService::deleteDatasetProfile);
     }