Skip to content
Snippets Groups Projects
Commit d113ed83 authored by sveseli's avatar sveseli
Browse files

refactored utilities; use classes from common area wherever possible; added...

refactored utilities; use classes from common area wherever possible; added web service notification when experiment users get notified
parent 8c3882dd
No related branches found
No related tags found
No related merge requests found
package gov.anl.aps.dm.portal.controllers; package gov.anl.aps.dm.portal.controllers;
import gov.anl.aps.dm.api.ExperimentDsApi;
import gov.anl.aps.dm.common.exceptions.DmException;
import gov.anl.aps.dm.portal.constants.RoleTypeName; import gov.anl.aps.dm.portal.constants.RoleTypeName;
import gov.anl.aps.dm.portal.exceptions.DmPortalException; import gov.anl.aps.dm.portal.exceptions.DmPortalException;
import gov.anl.aps.dm.portal.exceptions.ObjectAlreadyExists; import gov.anl.aps.dm.portal.exceptions.ObjectAlreadyExists;
...@@ -22,7 +24,8 @@ import gov.anl.aps.dm.portal.model.entities.PolicyType; ...@@ -22,7 +24,8 @@ import gov.anl.aps.dm.portal.model.entities.PolicyType;
import gov.anl.aps.dm.portal.model.entities.RoleType; import gov.anl.aps.dm.portal.model.entities.RoleType;
import gov.anl.aps.dm.portal.model.entities.UserExperimentRole; import gov.anl.aps.dm.portal.model.entities.UserExperimentRole;
import gov.anl.aps.dm.portal.model.entities.UserInfo; import gov.anl.aps.dm.portal.model.entities.UserInfo;
import gov.anl.aps.dm.portal.utilities.CollectionUtility; import gov.anl.aps.dm.common.utilities.CollectionUtility;
import gov.anl.aps.dm.portal.utilities.DmApiFactory;
import gov.anl.aps.dm.portal.utilities.SessionUtility; import gov.anl.aps.dm.portal.utilities.SessionUtility;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
...@@ -356,7 +359,7 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper ...@@ -356,7 +359,7 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
boolean initialized = false; boolean initialized = false;
private List<MissingPolicyType> missingPolicyTypes = new ArrayList<>(); private List<MissingPolicyType> missingPolicyTypes = new ArrayList<>();
private final Map<Integer, String> experimentPropertiesMap = new HashMap<>(); private final Map<Integer, String> experimentPropertiesMap = new HashMap<>();
private List<String> notEditableTypes = new ArrayList<>(); private final List<String> notEditableTypes = new ArrayList<>();
{ notEditableTypes.add("ESAF"); } { notEditableTypes.add("ESAF"); }
public ExperimentController() { public ExperimentController() {
...@@ -579,6 +582,16 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper ...@@ -579,6 +582,16 @@ public class ExperimentController extends CrudEntityController<Experiment, Exper
} }
} }
} }
// Notify DS Web Service
try {
ExperimentDsApi api = DmApiFactory.getExperimentDsApi();
api.updateExperiment(getCurrent().getName());
}
catch (DmException ex) {
logger.error("Could not notify Data Storage Service: " + ex);
SessionUtility.addErrorMessage("Error", "Unable to notify Data Storage Service: " + ex.getErrorMessage());
}
clear(); clear();
return super.update(); return super.update();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment