MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Roadmap: Add logs. Make verified email by default true

This commit is contained in:
Konstantinos Triantafyllou 2022-05-31 20:43:27 +03:00
parent 3892017bdb
commit 6380d3c231
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dmp-backend/roadmap/src/main/java/eu/eudat/migration/entities/User.java
View File

@ -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;
}

17
dmp-backend/roadmap/src/main/java/eu/eudat/migration/services/DMPRoadmapService.java
View File

@ -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);
}