IVYPORTAL-17183 Adapt process deprecate on LE

Remove GetGroupId process
axonivy-market · Sep 4, 2024 · 9d5ff6d · 9d5ff6d
1 parent 7332d9b
commit 9d5ff6d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 121 deletions.
diff --git a/...ortal-components/src/com/axonivy/portal/components/constant/PortalComponentConstants.java b/...ortal-components/src/com/axonivy/portal/components/constant/PortalComponentConstants.java
@@ -4,7 +4,6 @@ public final class PortalComponentConstants {
 
   public static final String PORTAL_APPLICATION_NAME = "Portal";
   public static final String SECURITY_SERVICE_CALLABLE = "Ivy Data Processes/PortalComponentSecurityService";
-  public static final String GET_GROUP_ID_CALLABLE = "Functional Processes/GetGroupId";
 
   private PortalComponentConstants() {}
 }
diff --git a/AxonIvyPortal/portal/dataclasses/ch/ivy/add/portalkit/GetGroupIdData.d.json b/AxonIvyPortal/portal/dataclasses/ch/ivy/add/portalkit/GetGroupIdData.d.json
diff --git a/AxonIvyPortal/portal/processes/Functional Processes/GetGroupId.p.json b/AxonIvyPortal/portal/processes/Functional Processes/GetGroupId.p.json
diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ProjectVersionBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/bean/ProjectVersionBean.java
@@ -1,13 +1,14 @@
 package ch.ivy.addon.portalkit.bean;
 
+import static ch.ivy.addon.portalkit.constant.PortalConstants.PORTAL_LIBRARY_ID;
+
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.ViewScoped;
 
-import ch.ivy.addon.portalkit.enums.PortalLibrary;
 import ch.ivy.addon.portalkit.ivydata.service.impl.LibraryService;
 import ch.ivyteam.ivy.application.IApplication;
 import ch.ivyteam.ivy.application.ILibrary;
@@ -42,7 +43,7 @@ public Map<String, List<ILibrary>> getProjectLibraries() {
 
   public void loadProjectVesion() {
     engineVersion = ch.ivyteam.ivy.Advisor.getAdvisor().getVersion().toString();
-    ILibrary portalLibrary = IApplication.current().findReleasedLibrary(PortalLibrary.PORTAL.getValue());
+    ILibrary portalLibrary = IApplication.current().findReleasedLibrary(PORTAL_LIBRARY_ID);
     portalVersion = portalLibrary.getQualifiedVersion().toString();
     projectLibraries = retrieveProjectLibraries();
   }

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/PortalConstants.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/constant/PortalConstants.java
@@ -5,8 +5,8 @@ public final class PortalConstants {
   public static final String BUILD_CASE_QUERY_CALLABLE = "Functional Processes/BuildCaseQuery";
   public static final String BUILD_TASK_QUERY_CALLABLE = "Functional Processes/BuildTaskQuery";
   public static final String ANALYZE_STATISTIC_CALLABLE = "Functional Processes/AnalyzeStatistic";
-  public static final String GET_GROUP_ID_CALLABLE = "Functional Processes/GetGroupId";
   public static final String RESET_TASK_CONFIRMATION_DIALOG = "reset-task-confirmation-dialog";
+  public static final String PORTAL_LIBRARY_ID = "com.axonivy.portal:portal";
   public static final int CUSTOM_STRING_FIELD_MAX_LENGTH = 2000;
   public static final Integer[] EXPRESS_INVALID_VERSION = {0};
   public static final int EXPRESS_VERSION = 1;

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalLibrary.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalLibrary.java
diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/LibraryService.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/ivydata/service/impl/LibraryService.java
@@ -9,16 +9,15 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import ch.ivy.addon.portalkit.enums.PortalLibrary;
+import ch.ivy.addon.portalkit.constant.PortalConstants;
 import ch.ivyteam.ivy.application.IApplication;
 import ch.ivyteam.ivy.application.ILibrary;
 import ch.ivyteam.ivy.application.ReleaseState;
 import ch.ivyteam.ivy.application.app.IApplicationRepository;
 import ch.ivyteam.ivy.security.ISecurityContext;
 
 public class LibraryService{
-  final List<String> portalLibraryStrings = Stream.of(PortalLibrary.values()).map(PortalLibrary::getValue)
-      .collect(Collectors.toList());
+  final List<String> portalLibraryStrings = Stream.of(PortalConstants.PORTAL_LIBRARY_ID).collect(Collectors.toList());
 
   public Map<String, List<ILibrary>> collectLibraries() {
     Map<String, List<ILibrary>> libraries = new HashMap<>();

diff --git a/...IvyPortal/portal/src/ch/ivy/addon/portalkit/service/DeleteFinishedHiddenCasesService.java b/...IvyPortal/portal/src/ch/ivy/addon/portalkit/service/DeleteFinishedHiddenCasesService.java
@@ -1,13 +1,14 @@
 package ch.ivy.addon.portalkit.service;
 
+import static ch.ivy.addon.portalkit.constant.PortalConstants.PORTAL_LIBRARY_ID;
+
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 
 import ch.ivy.addon.portalkit.enums.AdditionalProperty;
-import ch.ivy.addon.portalkit.enums.PortalLibrary;
 import ch.ivyteam.ivy.application.IApplication;
 import ch.ivyteam.ivy.application.ILibrary;
 import ch.ivyteam.ivy.application.IProcessModel;
@@ -28,7 +29,7 @@ public void deleteFinishedHiddenCases() {
     Ivy.log().info("***Job for deleting finished hidden system cases started at: " + currentDate + " by user: " + Ivy.session().getSessionUserName());
 
     boolean shouldDeleteAllCases = Boolean.parseBoolean(Ivy.var().get(DELETE_ALL_FINISHED_HIDDEN_CASES));
-    IProcessModelVersion portalPMV = findPortalPMVByLibraryId(IApplication.current(), PortalLibrary.PORTAL.getValue());
+    IProcessModelVersion portalPMV = findPortalPMVByLibraryId(IApplication.current(), PORTAL_LIBRARY_ID);
     if (portalPMV == null) {
       Ivy.log().warn("Can not retrieve portal PMV");
       return ;