bug[ats_ATS305531]: Consolidate ActionableItemManagers

Change-Id: Ia7a427dd0384990194e71fa27a38af6bc8a41003

8 files changed, 40 insertions, 23 deletions

diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/WorkflowPortingBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/WorkflowPortingBlam.java
index c5a763aa3a2..2217faa6d7f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/WorkflowPortingBlam.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/WorkflowPortingBlam.java
@@ -93,8 +93,9 @@ public class WorkflowPortingBlam extends AbstractBlam {
    private List<IAtsActionableItem> getActionableItems(IAtsActionableItem actionableItem) throws OseeCoreException {
       List<IAtsActionableItem> actionableItems;
       if (actionableItem == null) {
-         actionableItems =
-            new ArrayList<IAtsActionableItem>(sourceWorkflows.get(0).getActionableItemsDam().getActionableItems());
+         actionableItems = new ArrayList<IAtsActionableItem>(
+            AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItems(
+               sourceWorkflows.get(0)));
       } else {
          actionableItems = java.util.Collections.singletonList(actionableItem);
       }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java
index 3385b5a9419..49ba8a66a5c 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/access/AtsBranchAccessManager.java
@@ -29,8 +29,8 @@ import org.eclipse.osee.ats.core.util.AtsUtilCore;
 import org.eclipse.osee.ats.internal.Activator;
 import org.eclipse.osee.ats.internal.AtsClientService;
 import org.eclipse.osee.framework.access.AccessControlManager;
-import org.eclipse.osee.framework.core.data.IAccessContextId;
 import org.eclipse.osee.framework.core.data.BranchId;
+import org.eclipse.osee.framework.core.data.IAccessContextId;
 import org.eclipse.osee.framework.core.data.TokenFactory;
 import org.eclipse.osee.framework.core.dsl.integration.RoleContextProvider;
 import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
@@ -142,7 +142,8 @@ public class AtsBranchAccessManager implements IArtifactEventListener, EventHand
       try {
          contextIds.addAll(getFromArtifact(teamArt));
          if (contextIds.isEmpty()) {
-            for (IAtsActionableItem aia : teamArt.getActionableItemsDam().getActionableItems()) {
+            for (IAtsActionableItem aia : AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItems(
+               teamArt)) {
                Artifact artifact = AtsClientService.get().getConfigArtifact(aia);
                if (artifact != null) {
                   contextIds.addAll(getFromArtifact(artifact));
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java
index 8dd3f1ff31b..dbf7d37e630 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ActionableItemOwner.java
@@ -13,8 +13,8 @@ package org.eclipse.osee.ats.column;
 import java.util.HashSet;
 import java.util.Set;
 import org.eclipse.nebula.widgets.xviewer.IXViewerValueColumn;
-import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
 import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
+import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
 import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
 import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
 import org.eclipse.osee.ats.api.data.AtsRelationTypes;
@@ -77,7 +77,8 @@ public class ActionableItemOwner extends XViewerAtsColumn implements IXViewerVal
       if (element instanceof AbstractWorkflowArtifact) {
          TeamWorkFlowArtifact teamArt = ((AbstractWorkflowArtifact) element).getParentTeamWorkflow();
          if (teamArt != null) {
-            for (IAtsActionableItem aia : teamArt.getActionableItemsDam().getActionableItems()) {
+            for (IAtsActionableItem aia : AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItems(
+               teamArt)) {
                users.addAll(AtsClientService.get().getConfigArtifact(aia).getRelatedArtifacts(
                   AtsRelationTypes.ActionableItem_User, User.class));
             }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeActionableItemHeader.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeActionableItemHeader.java
index 23aee56eb7a..b359b694eef 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeActionableItemHeader.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeActionableItemHeader.java
@@ -16,6 +16,7 @@ import org.eclipse.osee.ats.core.client.action.ActionManager;
 import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.internal.Activator;
+import org.eclipse.osee.ats.internal.AtsClientService;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.framework.jdk.core.type.OseeCoreException;
 import org.eclipse.osee.framework.logging.OseeLevel;
@@ -99,12 +100,15 @@ public class WfeActionableItemHeader extends Composite {
          label.setText(" " + "Error: No Actionable Items identified.");
          label.setForeground(Displays.getSystemColor(SWT.COLOR_RED));
       } else {
-         StringBuffer sb = new StringBuffer(teamWf.getActionableItemsDam().getActionableItemsStr());
+         StringBuffer sb = new StringBuffer(
+            AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItemsStr(teamWf));
          if (ActionManager.getTeams(parentAction).size() > 1) {
             sb.append("         Other: ");
             for (TeamWorkFlowArtifact workflow : ActionManager.getTeams(parentAction)) {
                if (!workflow.equals(teamWf)) {
-                  sb.append(workflow.getActionableItemsDam().getActionableItemsStr());
+                  sb.append(
+                     AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItemsStr(
+                        workflow));
                   sb.append(", ");
                }
             }
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeRelationsHyperlinkComposite.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeRelationsHyperlinkComposite.java
index 409996318bd..8dccf764b05 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeRelationsHyperlinkComposite.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/WfeRelationsHyperlinkComposite.java
@@ -16,11 +16,13 @@ import java.util.logging.Level;
 import org.eclipse.osee.ats.AtsOpenOption;
 import org.eclipse.osee.ats.api.ai.IAtsActionableItem;
 import org.eclipse.osee.ats.api.data.AtsRelationTypes;
+import org.eclipse.osee.ats.api.util.IAtsChangeSet;
 import org.eclipse.osee.ats.core.client.review.AbstractReviewArtifact;
 import org.eclipse.osee.ats.core.client.util.AtsUtilClient;
 import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.config.ActionableItems;
 import org.eclipse.osee.ats.internal.Activator;
+import org.eclipse.osee.ats.internal.AtsClientService;
 import org.eclipse.osee.ats.util.AtsUtil;
 import org.eclipse.osee.ats.util.widgets.dialog.AICheckTreeDialog;
 import org.eclipse.osee.framework.core.data.IRelationTypeSide;
@@ -97,7 +99,8 @@ public class WfeRelationsHyperlinkComposite extends Composite {
             return true;
          }
       }
-      if (smaArt instanceof AbstractReviewArtifact && ((AbstractReviewArtifact) smaArt).getActionableItemsDam().hasActionableItems()) {
+      if (smaArt instanceof AbstractReviewArtifact && AtsClientService.get().getWorkItemService().getActionableItemService().hasActionableItems(
+         smaArt)) {
          return true;
       }
       return false;
@@ -158,7 +161,7 @@ public class WfeRelationsHyperlinkComposite extends Composite {
    }
 
    private void processReviewArtifact(final AbstractReviewArtifact reviewArt) throws OseeCoreException {
-      if (!reviewArt.getActionableItemsDam().hasActionableItems()) {
+      if (!AtsClientService.get().getWorkItemService().getActionableItemService().hasActionableItems(reviewArt)) {
          return;
       }
       actionableItemsLabel = editor.getToolkit().createLabel(this, "");
@@ -189,7 +192,7 @@ public class WfeRelationsHyperlinkComposite extends Composite {
          //
             "\" is review of Actionable Items  \"" +
             //
-            ((AbstractReviewArtifact) awa).getActionableItemsDam().getActionableItemsStr() + "\" ");
+            AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItemsStr(awa) + "\" ");
       }
    }
 
@@ -201,15 +204,18 @@ public class WfeRelationsHyperlinkComposite extends Composite {
       final AICheckTreeDialog diag =
          new AICheckTreeDialog("Edit Actionable Items", "Select Actionable Items for this review", Active.Active);
       try {
-         Collection<IAtsActionableItem> actionableItems =
-            ActionableItems.getUserEditableActionableItems(reviewArt.getActionableItemsDam().getActionableItems());
-         reviewArt.getActionableItemsDam().getActionableItems();
+         Collection<IAtsActionableItem> actionableItems = ActionableItems.getUserEditableActionableItems(
+            AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItems(reviewArt));
 
          diag.setInitialSelections(actionableItems);
          if (diag.open() != 0) {
             return;
          }
-         reviewArt.getActionableItemsDam().setActionableItems(diag.getChecked());
+         IAtsChangeSet changes = AtsClientService.get().getStoreService().createAtsChangeSet("Edit Actionable Items",
+            AtsClientService.get().getUserService().getCurrentUser());
+         AtsClientService.get().getWorkItemService().getActionableItemService().setActionableItems(reviewArt,
+            actionableItems, changes);
+         changes.execute();
          editor.onDirtied();
          refreshActionableItemsLabel();
       } catch (Exception ex) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
index 8996c76c7ea..8e5a580928f 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/health/ValidateAtsDatabase.java
@@ -691,7 +691,8 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction {
          if (artifact.isOfType(AtsArtifactTypes.TeamWorkflow)) {
             TeamWorkFlowArtifact teamArt = (TeamWorkFlowArtifact) artifact;
             try {
-               if (teamArt.getActionableItemsDam().getActionableItems().isEmpty()) {
+               if (!AtsClientService.get().getWorkItemService().getActionableItemService().hasActionableItems(
+                  teamArt)) {
                   results.log(artifact, "testTeamWorkflows",
                      "Error: TeamWorkflow " + XResultDataUI.getHyperlink(teamArt) + " has 0 ActionableItems");
                }
@@ -699,8 +700,8 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction {
                   results.log(artifact, "testTeamWorkflows",
                      "Error: TeamWorkflow " + XResultDataUI.getHyperlink(teamArt) + " has no TeamDefinition");
                }
-               List<Long> badUuids =
-                  getInvalidUuids(AtsObjects.toUuids(teamArt.getActionableItemsDam().getActionableItems()));
+               List<Long> badUuids = getInvalidUuids(AtsObjects.toUuids(
+                  AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItems(teamArt)));
                if (!badUuids.isEmpty()) {
                   results.log(artifact, "testTeamWorkflows", "Error: TeamWorkflow " + XResultDataUI.getHyperlink(
                      teamArt) + " has AI uuids that don't exisit " + badUuids);
@@ -1025,7 +1026,8 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction {
             if (artifact instanceof AbstractReviewArtifact) {
                AbstractReviewArtifact reviewArtifact = (AbstractReviewArtifact) artifact;
                if (reviewArtifact.getRelatedArtifactsCount(
-                  AtsRelationTypes.TeamWorkflowToReview_Team) == 0 && !reviewArtifact.getActionableItemsDam().hasActionableItems()) {
+                  AtsRelationTypes.TeamWorkflowToReview_Team) == 0 && !AtsClientService.get().getWorkItemService().getActionableItemService().hasActionableItems(
+                     reviewArtifact)) {
                   results.log(artifact, "testReviewsHaveParentWorkflowOrActionableItems",
                      "Error: Review " + XResultDataUI.getHyperlink(
                         reviewArtifact) + " has 0 related parents and 0 actionable items.");
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java
index a4f28aff08c..1a71f7ce5c8 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/operation/ModifyActionableItemsBlam.java
@@ -362,12 +362,13 @@ public class ModifyActionableItemsBlam extends AbstractBlam {
 
          for (IAtsActionableItem checkedAi : job.getAddAis()) {
             results.logf("Actionable Item [%s] will be added to this workflow\n", checkedAi);
-            teamWf.getActionableItemsDam().addActionableItem(checkedAi);
-            changes.add(teamWf);
+            AtsClientService.get().getWorkItemService().getActionableItemService().addActionableItem(teamWf, checkedAi,
+               changes);
          }
          for (IAtsActionableItem currAi : job.getRemoveAis()) {
             results.logf("Actionable Item [%s] will be removed from this workflow\n", currAi);
-            teamWf.getActionableItemsDam().removeActionableItem(currAi);
+            AtsClientService.get().getWorkItemService().getActionableItemService().removeActionableItem(teamWf, currAi,
+               changes);
             changes.add(teamWf);
          }
          if (!changes.isEmpty()) {
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java
index 44b80578369..bf61997f98e 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/PrivilegedUserManager.java
@@ -36,7 +36,8 @@ public class PrivilegedUserManager {
       if (workflow.getParentTeamWorkflow() != null) {
          users.addAll(getPrivilegedUsers(workflow.getParentTeamWorkflow()));
       } else {
-         for (IAtsActionableItem aia : workflow.getParentTeamWorkflow().getActionableItemsDam().getActionableItems()) {
+         for (IAtsActionableItem aia : AtsClientService.get().getWorkItemService().getActionableItemService().getActionableItems(
+            workflow)) {
             addPrivilegedUsersUpTeamDefinitionTree(aia.getTeamDefinitionInherited(), users);
          }
       }