bug[ats_ZXNWK]: Tasks are In_Work yet showing as Completed

3 files changed, 29 insertions, 8 deletions

diff --git a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java
index d712bc324af..831461124bc 100644
--- a/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java
+++ b/plugins/org.eclipse.osee.ats.core.client/src/org/eclipse/osee/ats/core/client/workflow/transition/TransitionManager.java
@@ -430,7 +430,7 @@ public class TransitionManager {
       }
    }
 
-   private void logWorkflowUnCancelledEvent(AbstractWorkflowArtifact awa) throws OseeCoreException {
+   public static void logWorkflowUnCancelledEvent(AbstractWorkflowArtifact awa) throws OseeCoreException {
       if (awa.isAttributeTypeValid(AtsAttributeTypes.CreatedBy)) {
          awa.deleteSoleAttribute(AtsAttributeTypes.CancelledBy);
          awa.deleteSoleAttribute(AtsAttributeTypes.CancelledDate);
@@ -449,7 +449,7 @@ public class TransitionManager {
       }
    }
 
-   private void logWorkflowUnCompletedEvent(AbstractWorkflowArtifact awa) throws OseeCoreException {
+   public static void logWorkflowUnCompletedEvent(AbstractWorkflowArtifact awa) throws OseeCoreException {
       if (awa.isAttributeTypeValid(AtsAttributeTypes.CreatedBy)) {
          awa.deleteSoleAttribute(AtsAttributeTypes.CompletedBy);
          awa.deleteSoleAttribute(AtsAttributeTypes.CompletedDate);
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 9ad81c516a1..bdc5dca8ee3 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
@@ -53,6 +53,7 @@ import org.eclipse.osee.ats.core.client.workflow.AbstractWorkflowArtifact;
 import org.eclipse.osee.ats.core.client.workflow.log.AtsLog;
 import org.eclipse.osee.ats.core.client.workflow.log.LogItem;
 import org.eclipse.osee.ats.core.client.workflow.log.LogType;
+import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager;
 import org.eclipse.osee.ats.core.config.AtsConfigCache;
 import org.eclipse.osee.ats.core.config.AtsVersionService;
 import org.eclipse.osee.ats.core.config.TeamDefinitions;
@@ -198,6 +199,8 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction {
             Collection<Artifact> allArtifacts = ArtifactQuery.getArtifactListFromIds(artIdList, AtsUtil.getAtsBranch());
             //            elapsedTime.end();
 
+            // NOTE: Use DoesNotWorkItemAts to process list of HRIDs
+
             // remove all deleted/purged artifacts first
             List<Artifact> artifacts = new ArrayList<Artifact>(allArtifacts.size());
             for (Artifact artifact : allArtifacts) {
@@ -272,6 +275,15 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction {
                      testNameToResultsMap.put("testCompletedCancelledStateAttributesSet", String.format(
                         "Error: awa.isCompleted()==true but State [%s] not Completed state for [%s]",
                         stateDef.getName(), XResultDataUI.getHyperlink(artifact)));
+                     if (stateDef.getStateType() == StateType.Working) {
+                        awa.setSoleAttributeFromString(AtsAttributeTypes.CurrentStateType, StateType.Working.name());
+                        TransitionManager.logWorkflowUnCompletedEvent(awa);
+                        TransitionManager.logWorkflowUnCancelledEvent(awa);
+                        awa.persist(transaction);
+                        testNameToResultsMap.put("testCompletedCancelledStateAttributesSet", "FIXED");
+                     } else {
+                        testNameToResultsMap.put("testCompletedCancelledStateAttributesSet", "MANUAL FIX REQUIRED");
+                     }
                   } else if (awa.getCompletedBy() == null || awa.getCompletedDate() == null || !Strings.isValid(awa.getCompletedFromState())) {
                      testNameToResultsMap.put(
                         "testCompletedCancelledStateAttributesSet",
@@ -286,6 +298,7 @@ public class ValidateAtsDatabase extends WorldXNavigateItemAction {
                      testNameToResultsMap.put("testCompletedCancelledStateAttributesSet", String.format(
                         "Error: awa.isCancelled()==true but State [%s] not Cancelled state for [%s]",
                         stateDef.getName(), XResultDataUI.getHyperlink(artifact)));
+                     testNameToResultsMap.put("testCompletedCancelledStateAttributesSet", "MANUAL FIX REQUIRED");
                   } else if (awa.getCancelledBy() == null || awa.getCancelledDate() == null || !Strings.isValid(awa.getCancelledFromState())) {
                      testNameToResultsMap.put(
                         "testCompletedCancelledStateAttributesSet",
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java
index 2b452ed582a..089e7490104 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/DoesNotWorkItemAts.java
@@ -38,7 +38,7 @@ import org.eclipse.osee.framework.ui.swt.Displays;
 public class DoesNotWorkItemAts extends XNavigateItemAction {
 
    public DoesNotWorkItemAts(XNavigateItem parent) {
-      super(parent, "Does Not Work - ATS - Fix Completed Cancelled attributes", PluginUiImage.ADMIN);
+      super(parent, "Does Not Work - ATS - Fix Working attributes", PluginUiImage.ADMIN);
    }
 
    @Override
@@ -49,10 +49,18 @@ public class DoesNotWorkItemAts extends XNavigateItemAction {
 
       List<String> hrids =
          Arrays.asList("ZW43T", "LQ4GH", "F090B", "1BN39", "FF7LC", "JXJ7G", "SP4TF", "37SWW", "Y3TRT", "UF9Z8",
-            "E9QPQ", "FP0ML", "K0QXZ", "RNPLG", "W9ZML", "N0QSC", "A496H", "SMS0Q", "4KNWK", "UNNPV", "4BSXM", "HDWS9",
-            "ALPTS", "W9S49", "L0WRL", "AHZHZ", "R3V4K", "VTC09", "1NN86", "SQ7WN", "R3JJA", "UKQ09", "R0GRX", "V1KNA",
-            "7JP0L", "VN31S", "EHMF7", "Q6QJM", "0SFYF", "NZKL6", "FB4J0", "FN9XF", "80W10", "6XPT8", "MPM7R", "T2WJ2",
-            "T6P5V", "LH29W", "S2J26", "HNV7D");
+            "XQ0GL", "H9MKB", "SML1L", "J27TH", "S192U", "UZSGK", "RMLXB", "KPY74", "2BQZM", "2LXD8", "SH9P9", "D25LM",
+            "KS57V", "R4Z07", "VHKFM", "7SK10", "AKF8Y", "W37FQ", "AR47S", "8S42M", "V588M", "59TJZ", "NPFH7", "DVT59",
+            "8RBCN", "X3YX0", "0NVB8", "37T1Q", "LJ43A", "KCM0M", "QB69W", "R9WH4", "U3DM2", "XK7XZ", "H6KK9", "SLHHC",
+            "2J78V", "AMGR8", "ABZ4Y", "EYGZ1", "94NJT", "CWTFT", "9J4F9", "XDT9J", "75L5S", "YPYFZ", "MYC7Z", "H1MLN",
+            "B1Y4G", "ZLDGF", "03G1A", "62VXP", "FZNF5", "82KPQ", "F1DHN", "X0RME", "GWB6V", "DTN1W", "DBBGL", "W258D",
+            "KXMB8", "M26QT", "66QZY", "LB74L", "NDGMB", "XCHJ9", "72PTX", "SV3L9", "TN0RA", "XK66N", "7PPB2", "Q540H",
+            "9C084", "5ZWF1", "U7Q7S", "KD07Q", "WYDFX", "AGS5Y", "4XDN4", "HLR25", "3ZC5D", "DR6HC", "2TGJE", "5DNQN",
+            "AZ0SL", "YWV4E", "DPYL1", "44TSE", "H9DQU", "TP6NH", "64DGV", "JRF5C", "LQGN1", "LB7LM", "PFK3K", "2J4BV",
+            "N4JK9", "M39JC", "5H7Y1", "YY6FM", "9ND31", "RLGD3", "ZLNVL", "2FTZN", "U1PB8", "DGK7V", "SWWR4", "H9ZGD",
+            "18JBF", "T6PXC", "NVGXG", "2910L", "Q7X5S", "T2MB4", "WV9RH", "AGY4Z", "HFQ33", "N1Y2K", "CYSGQ", "9W3D4",
+            "5GRJF", "CTVRS", "PYJRJ", "612WQ", "GYTZ6", "YPFGW", "PHQGK", "ULB5K", "16KTW", "QHTKB", "QRNTJ", "HS1CR",
+            "UTN8A", "QP3RQ", "8QPCY", "BZ0LK", "5RT4C", "LYFPD", "88KQV", "ACGJV", "U0M9B");
 
       try {
          List<Artifact> artifacts = ArtifactQuery.getArtifactListFromIds(hrids, AtsUtil.getAtsBranchToken());
@@ -65,7 +73,7 @@ public class DoesNotWorkItemAts extends XNavigateItemAction {
          testNameToResultsMap = new HashCollection<String, String>();
 
          SkynetTransaction transaction =
-            TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Fix Cancelled/Completed attributes.");
+            TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Fix Working attributes.");
          ValidateAtsDatabase.testCompletedCancelledStateAttributesSet(artifacts, transaction, testNameToResultsMap);
 
          XResultData xResultData = new XResultData();