feature[TW19451]: Add Change Request ATS Id prefix

Change-Id: I268ccd4f12643396ea8914ab2b83246a169da005

4 files changed, 39 insertions, 16 deletions

diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsIdProviderTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsIdProviderTest.java
index 1207f7236a2..ffbc3f03d75 100644
--- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsIdProviderTest.java
+++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/util/AtsIdProviderTest.java
@@ -26,6 +26,7 @@ import org.eclipse.osee.ats.api.team.IAtsTeamDefinitionService;
 import org.eclipse.osee.ats.api.util.IAtsChangeSet;
 import org.eclipse.osee.ats.api.util.ISequenceProvider;
 import org.eclipse.osee.ats.api.workdef.IAttributeResolver;
+import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
 import org.eclipse.osee.framework.core.data.AttributeTypeToken;
 import org.junit.Assert;
 import org.junit.Before;
@@ -43,7 +44,7 @@ public class AtsIdProviderTest {
    // @formatter:off
    @Mock private ISequenceProvider sequenceProvider;
    @Mock private IAttributeResolver attrResolver;
-   @Mock private IAtsObject newObject;
+   @Mock private IAtsTeamWorkflow newObject;
    @Mock private IAtsTeamDefinition teamDef;
    @Mock private IAtsTeamDefinition parentTeamDef;
    @Mock private IAtsChangeSet changes;
@@ -59,6 +60,7 @@ public class AtsIdProviderTest {
 
       atsIdProvider = new AtsIdProvider(sequenceProvider, attrResolver, newObject, teamDef);
 
+      when(newObject.isOfType(AtsArtifactTypes.TeamWorkflow)).thenReturn(true);
       when(sequenceProvider.getNext("ATS_SEQ")).thenReturn(345L);
       when(teamDef.getAtsApi()).thenReturn(atsApi);
       when(atsApi.getTeamDefinitionService()).thenReturn(teamDefinitionService);
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/util/AtsIdProvider.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/util/AtsIdProvider.java
index 65241ac5af7..127489370db 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/util/AtsIdProvider.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/util/AtsIdProvider.java
@@ -62,30 +62,31 @@ public final class AtsIdProvider {
    }
 
    public String getNextAtsId() {
-      String seqName = getAttrValueFromTeamDef(AtsAttributeTypes.AtsIdSequenceName);
-      if (!Strings.isValid(seqName)) {
-         if (newObject.isOfType(AtsArtifactTypes.TeamWorkflow)) {
+      String seqName = "";
+      if (newObject.isOfType(AtsArtifactTypes.TeamWorkflow)) {
+         seqName = getAttrValueFromTeamDef(AtsAttributeTypes.AtsIdSequenceName);
+         if (Strings.isInValid(seqName)) {
             seqName = DEFAULT_WORKFLOW_SEQ_NAME;
-         } else if (newObject.isTypeEqual(AtsArtifactTypes.Action)) {
-            seqName = DEFAULT_ACTION_SEQ_NAME;
-         } else if (newObject.isOfType(AtsArtifactTypes.AbstractReview)) {
-            seqName = DEFAULT_REVIEW_SEQ_NAME;
-         } else if (newObject.isOfType(AtsArtifactTypes.Task)) {
-            seqName = DEFAULT_TASK_SEQ_NAME;
-         } else {
-            seqName = DEFAULT_SEQ_NAME;
          }
+      } else if (newObject.isTypeEqual(AtsArtifactTypes.Action)) {
+         seqName = DEFAULT_ACTION_SEQ_NAME;
+      } else if (newObject.isOfType(AtsArtifactTypes.AbstractReview)) {
+         seqName = DEFAULT_REVIEW_SEQ_NAME;
+      } else if (newObject.isOfType(AtsArtifactTypes.Task)) {
+         seqName = DEFAULT_TASK_SEQ_NAME;
+      } else {
+         seqName = DEFAULT_SEQ_NAME;
       }
       String prefixName = null;
       if (workItemListener != null) {
          prefixName = workItemListener.getWorkItemAtsIdPrefix(newObject);
       }
       if (Strings.isInValid(prefixName)) {
-         prefixName = getAttrValueFromTeamDef(AtsAttributeTypes.AtsIdPrefix);
-      }
-      if (Strings.isInValid(prefixName)) {
          if (newObject.isOfType(AtsArtifactTypes.TeamWorkflow)) {
-            prefixName = DEFAULT_WORKFLOW_ID_PREFIX;
+            prefixName = getAttrValueFromTeamDef(AtsAttributeTypes.AtsIdPrefix);
+            if (Strings.isInValid(prefixName)) {
+               prefixName = DEFAULT_WORKFLOW_ID_PREFIX;
+            }
          } else if (newObject.isTypeEqual(AtsArtifactTypes.Action)) {
             prefixName = DEFAULT_ACTION_ID_PREFIX;
          } else if (newObject.isOfType(AtsArtifactTypes.AbstractReview)) {
diff --git a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/workflow/cr/CreateNewDemoChangeRequestTest.java b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/workflow/cr/CreateNewDemoChangeRequestTest.java
index b8ba4bee095..90d85d9080c 100644
--- a/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/workflow/cr/CreateNewDemoChangeRequestTest.java
+++ b/plugins/org.eclipse.osee.ats.ide.integration.tests/src/org/eclipse/osee/ats/ide/integration/tests/ats/workflow/cr/CreateNewDemoChangeRequestTest.java
@@ -17,6 +17,7 @@ import java.util.Collection;
 import org.eclipse.osee.ats.api.AtsApi;
 import org.eclipse.osee.ats.api.demo.AtsDemoOseeTypes;
 import org.eclipse.osee.ats.api.workflow.ActionResult;
+import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow;
 import org.eclipse.osee.ats.ide.demo.workflow.cr.CreateNewDemoChangeRequestBlam;
 import org.eclipse.osee.ats.ide.integration.tests.AtsApiService;
 import org.eclipse.osee.framework.core.data.ArtifactToken;
@@ -88,6 +89,10 @@ public class CreateNewDemoChangeRequestTest {
       ArtifactToken artifactByName =
          atsApi.getQueryService().getArtifactByName(AtsDemoOseeTypes.DemoChangeRequestTeamWorkflow, TITLE);
       Assert.assertNotNull(artifactByName);
+
+      IAtsTeamWorkflow teamWf = atsApi.getWorkItemService().getTeamWf(artifactByName);
+      Assert.assertEquals("CR1001", teamWf.getAtsId());
+
    }
 
 }
diff --git a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/demo/AtsDbConfigAIsAndTeamsDemoOp.java b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/demo/AtsDbConfigAIsAndTeamsDemoOp.java
index 5dd87570484..44cee0087c4 100644
--- a/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/demo/AtsDbConfigAIsAndTeamsDemoOp.java
+++ b/plugins/org.eclipse.osee.ats.rest/src/org/eclipse/osee/ats/rest/internal/demo/AtsDbConfigAIsAndTeamsDemoOp.java
@@ -71,6 +71,21 @@ public class AtsDbConfigAIsAndTeamsDemoOp {
       cfgTx.execute();
 
       createSawPlCrTaskEstUserGroups();
+      createSawPlCrSequenceConfig();
+   }
+
+   private void createSawPlCrSequenceConfig() {
+      // Setup Blk3 Issues sequence number
+      IAtsTeamDefinition crTeamDef =
+         atsApi.getTeamDefinitionService().getTeamDefinitionById(DemoArtifactToken.SAW_PL_CR_TeamDef);
+      ArtifactToken teamDefArt = atsApi.getQueryService().getArtifact(crTeamDef);
+      IAtsChangeSet changes = atsApi.createChangeSet("createSawPlCrSequenceConfig");
+      changes.setSoleAttributeValue(teamDefArt, AtsAttributeTypes.AtsIdPrefix, "CR");
+      changes.setSoleAttributeValue(teamDefArt, AtsAttributeTypes.AtsIdSequenceName, "CR_SEQ");
+      changes.execute();
+      atsApi.getQueryService().runUpdate(
+         "INSERT INTO osee_sequence (last_sequence, sequence_name) VALUES (1000, 'CR_SEQ')");
+
    }
 
    private void createSawPlCrTaskEstUserGroups() {