Skip to content
Snippets Groups Projects

fix(FundingsDeserializer): [AOU-646] complete metadata V2 Funding...

Merged Nicolas.Rod requested to merge rodn-646-complete-funding-deserialization into master
1 unresolved thread
Files
6
@@ -26,6 +26,7 @@ import ch.unige.aou.business.PublicationSubtypeService;
import ch.unige.aou.business.PublicationTypeService;
import ch.unige.aou.business.RoleApplicationService;
import ch.unige.aou.business.RoleService;
import ch.unige.aou.business.ScheduledTaskService;
import ch.unige.aou.business.UserService;
import ch.unige.aou.config.AouProperties;
import ch.unige.aou.model.settings.Person;
@@ -55,10 +56,12 @@ public class AdminController extends ModuleController {
private NotificationTypeService notificationTypeService;
private EventTypeService eventTypeService;
private EventService eventService;
private ScheduledTaskService scheduledTaskService;
private List<AouProperties.Security.TrustedUser> trustedUsers;
private List<AouProperties.Security.OAuth2Client> oAuth2Clients;
private List<AouProperties.Test.User> users;
private List<AouProperties.ScheduledTaskConfig> scheduledTaskConfigs;
private boolean isInit;
private boolean isBuilding;
private boolean isGenerateData;
@@ -69,7 +72,7 @@ public class AdminController extends ModuleController {
PublicationService publicationService, PublicationSubtypeService publicationSubtypeService,
RoleService roleService, DocumentFileTypeService documentFileTypeService, ContributorRoleService contributorRoleService,
NotificationTypeService notificationTypeService, EventTypeService eventTypeService, EventService eventService,
PublicationSubSubtypeService publicationSubSubtypeService) {
PublicationSubSubtypeService publicationSubSubtypeService, ScheduledTaskService scheduledTaskService) {
super(ModuleName.ADMIN);
this.languageService = languageService;
@@ -89,10 +92,12 @@ public class AdminController extends ModuleController {
this.notificationTypeService = notificationTypeService;
this.eventTypeService = eventTypeService;
this.eventService = eventService;
this.scheduledTaskService = scheduledTaskService;
this.trustedUsers = aouProperties.getSecurity().getTrustedUsers();
this.oAuth2Clients = aouProperties.getSecurity().getOauth2Clients();
this.users = aouProperties.getTest().getUsers();
this.scheduledTaskConfigs = aouProperties.getScheduledTasks();
this.isInit = aouProperties.getData().isInit();
this.isBuilding = aouProperties.getTest().isBuilding();
this.isGenerateData = aouProperties.getTest().isGenerateData();
@@ -119,6 +124,9 @@ public class AdminController extends ModuleController {
this.licenceService.initDefaultData();
this.institutionService.initDefaultData();
this.contributorRoleService.initDefaultData();
for (AouProperties.ScheduledTaskConfig scheduledTaskConfig : this.scheduledTaskConfigs) {
this.scheduledTaskService.createScheduledTaskFromConfig(scheduledTaskConfig);
}
}
if (!this.isBuilding) {
this.documentFileTypeService.initDefaultData();
Loading