feature/NPD-692-gum-renovation-step-1 to release/3.1.0

MessageContentAnalyzer-ejb/src/main/java/net/ihe/gazelle/mca/contentanalyzer/adapters/analysis/gui/AnalysisBeanGui.java

@@ -30,7 +30,6 @@ import net.ihe.gazelle.evsclient.application.CallerMetadataFactory;
 import net.ihe.gazelle.evsclient.application.interfaces.ForbiddenAccessException;
 import net.ihe.gazelle.evsclient.application.interfaces.NotFoundException;
 import net.ihe.gazelle.evsclient.application.interfaces.UnauthorizedException;
-import net.ihe.gazelle.evsclient.application.interfaces.adapters.EvsIdentity;
 import net.ihe.gazelle.evsclient.application.interfaces.adapters.NotLoadedException;
 import net.ihe.gazelle.evsclient.application.interfaces.adapters.ProcessingNotSavedException;
 import net.ihe.gazelle.evsclient.connector.api.EVSClientResults;
@@ -65,6 +64,7 @@ import net.ihe.gazelle.mca.contentanalyzer.application.utils.DocTypeUtils;
 import net.ihe.gazelle.mca.contentanalyzer.application.utils.FileContentUtils;
 import net.ihe.gazelle.mca.contentanalyzer.business.exceptions.UnexpectedAnalysisException;
 import net.ihe.gazelle.mca.contentanalyzer.business.model.*;
+import net.ihe.gazelle.ssov7.authn.domain.GazelleIdentity;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
@@ -138,8 +138,8 @@ public class AnalysisBeanGui extends AbstractProcessingBeanGui<Analysis, Analysi
                           McaApi mcaApi, AnalyzerManager analyzerManager, CallerMetadataFactory callerMetadataFactory,
                           Base64Converter base64Converter, FilesDownloaderManager filesDownloaderManager,
                           ApplicationPreferenceManager applicationPreferenceManager,
-                          EvsIdentity evsIdentity) {
-      super(AnalysisBeanGui.class, analysisManager, callerMetadataFactory, evsIdentity, applicationPreferenceManager,
+                          GazelleIdentity gazelleIdentity) {
+      super(AnalysisBeanGui.class, analysisManager, callerMetadataFactory, gazelleIdentity, applicationPreferenceManager,
             new AbstractGuiPermanentLink(applicationPreferenceManager) {
                @Override
                public String getResultPageUrl() {
@@ -409,7 +409,7 @@ public class AnalysisBeanGui extends AbstractProcessingBeanGui<Analysis, Analysi
                analysisPartManager.save(analysisPart);
             }
             analysis = processingManager.getObjectByOID(
-                  analysisPart.getRootParent().getOid(), privacyKey, evsIdentity);
+                  analysisPart.getRootParent().getOid(), privacyKey, identity);
          } else {
             throw nfe;
          }
@@ -901,10 +901,10 @@ public class AnalysisBeanGui extends AbstractProcessingBeanGui<Analysis, Analysi
 
    public FilterDataModel<Analysis> getDataModel() {
       if (this.dataModel == null) {
-         boolean isLoggedIn = super.evsIdentity.isLoggedIn();
-         boolean isMonitor = super.evsIdentity.isMonitorOrAdmin();
-         String login = super.evsIdentity.getCredentialsUsername();
-         String organization = super.evsIdentity.getInstitutionKeyword();
+         boolean isLoggedIn = super.identity.isLoggedIn();
+         boolean isMonitor = super.identity.hasRole("monitor_role") || super.identity.hasRole("admin_role");
+         String login = super.identity.getUsername();
+         String organization = super.identity.getOrganisationKeyword();
          this.dataModel = new FilterDataModel<Analysis>(
                new Filter<>(processingManager.getCriterionForFilter(login, organization, isMonitor, isLoggedIn))) {
             private static final long serialVersionUID = -6565448932848176287L;