Roadmap: Add logs. Make verified email by default true
This commit is contained in:
parent
3892017bdb
commit
6380d3c231
|
@ -138,7 +138,7 @@ public class User {
|
||||||
userInfo.setUsertype((short) 0);
|
userInfo.setUsertype((short) 0);
|
||||||
userInfo.setUserStatus((short) 0);
|
userInfo.setUserStatus((short) 0);
|
||||||
userInfo.setAuthorization_level((short) 1);
|
userInfo.setAuthorization_level((short) 1);
|
||||||
userInfo.setVerified_email(false);
|
userInfo.setVerified_email(true);
|
||||||
userInfo.setCreated(getCreatedAt());
|
userInfo.setCreated(getCreatedAt());
|
||||||
return userInfo;
|
return userInfo;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,8 +16,9 @@ import eu.eudat.models.data.dmp.DataManagementPlanEditorModel;
|
||||||
import eu.eudat.models.data.listingmodels.UserInfoListingModel;
|
import eu.eudat.models.data.listingmodels.UserInfoListingModel;
|
||||||
import eu.eudat.models.data.security.Principal;
|
import eu.eudat.models.data.security.Principal;
|
||||||
import eu.eudat.types.Authorities;
|
import eu.eudat.types.Authorities;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
|
||||||
import org.springframework.data.domain.Sort;
|
import org.springframework.data.domain.Sort;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
@ -26,8 +27,10 @@ import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
@ConditionalOnProperty(prefix = "roadmap", name = "database.url")
|
|
||||||
public class DMPRoadmapService {
|
public class DMPRoadmapService {
|
||||||
|
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(DMPRoadmapService.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* DMPRoadmap Repositories
|
* DMPRoadmap Repositories
|
||||||
*/
|
*/
|
||||||
|
@ -61,6 +64,7 @@ public class DMPRoadmapService {
|
||||||
this.argosService.createUserInfo(Objects.requireNonNull(defaultUser()));
|
this.argosService.createUserInfo(Objects.requireNonNull(defaultUser()));
|
||||||
List<User> users = this.userRepository.findAll();
|
List<User> users = this.userRepository.findAll();
|
||||||
users.forEach(user -> {
|
users.forEach(user -> {
|
||||||
|
logger.info("Create user with email: " + user.getEmail());
|
||||||
this.argosService.createUserInfo(user.buildUserInfo());
|
this.argosService.createUserInfo(user.buildUserInfo());
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -87,6 +91,7 @@ public class DMPRoadmapService {
|
||||||
return model;
|
return model;
|
||||||
}).collect(Collectors.toList()));
|
}).collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
|
logger.info("Create Dataset Profile with label: " + datasetProfile.getLabel());
|
||||||
id = this.argosService.createDatasetProfile(datasetProfile, principal);
|
id = this.argosService.createDatasetProfile(datasetProfile, principal);
|
||||||
} else {
|
} else {
|
||||||
if (users.size() > 0) {
|
if (users.size() > 0) {
|
||||||
|
@ -102,6 +107,7 @@ public class DMPRoadmapService {
|
||||||
return model;
|
return model;
|
||||||
}).collect(Collectors.toList()));
|
}).collect(Collectors.toList()));
|
||||||
}
|
}
|
||||||
|
logger.info("Create a new version of Dataset Profiles with label: " + datasetProfile.getLabel());
|
||||||
id = this.argosService.createNewVersionDatasetProfile(id, datasetProfile);
|
id = this.argosService.createNewVersionDatasetProfile(id, datasetProfile);
|
||||||
}
|
}
|
||||||
this.datasetProfiles.add(id);
|
this.datasetProfiles.add(id);
|
||||||
|
@ -112,6 +118,7 @@ public class DMPRoadmapService {
|
||||||
if (collaborators.size() > 0) {
|
if (collaborators.size() > 0) {
|
||||||
principal = this.argosService.login(collaborators.get(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);
|
DataManagementPlan dmp = this.argosService.createDMP(dataManagementPlanEditorModel, principal);
|
||||||
this.dmps.add(dmp.getId());
|
this.dmps.add(dmp.getId());
|
||||||
if (collaborators.size() > 1) {
|
if (collaborators.size() > 1) {
|
||||||
|
@ -129,15 +136,17 @@ public class DMPRoadmapService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
logger.error("Migration Failed. All data will be deleted.");
|
||||||
System.out.println("Migration Failed. All data will be deleted.");
|
|
||||||
this.clear();
|
this.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clear() {
|
public void clear() {
|
||||||
|
logger.info("Deleting Datasets");
|
||||||
this.datasets.forEach(id -> this.argosService.deleteDataset(id, this.principal));
|
this.datasets.forEach(id -> this.argosService.deleteDataset(id, this.principal));
|
||||||
|
logger.info("Deleting DMPs");
|
||||||
this.dmps.forEach(this.argosService::deleteDMP);
|
this.dmps.forEach(this.argosService::deleteDMP);
|
||||||
|
logger.info("Deleting Dataset Profiles");
|
||||||
this.datasetProfiles.forEach(this.argosService::deleteDatasetProfile);
|
this.datasetProfiles.forEach(this.argosService::deleteDatasetProfile);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue