feature: Reset rerun flag on reimport of item

Change-Id: Ic68c65a24770ca6737bce0280f7c0ce8925b8bfd

3 files changed, 15 insertions, 9 deletions

diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoApiImpl.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoApiImpl.java
index 4bdce8d2104..b61e28911f5 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoApiImpl.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoApiImpl.java
@@ -188,7 +188,7 @@ public class DispoApiImpl implements DispoApi {
       return wasUpdated;
    }
 
-   private boolean editDispoItems(DispoProgram program, List<DispoItem> dispoItems) {
+   private boolean editDispoItems(DispoProgram program, List<DispoItem> dispoItems, boolean resetRerunFlag) {
       boolean wasUpdated = false;
 
       for (DispoItem dispoItem : dispoItems) {
@@ -200,7 +200,7 @@ public class DispoApiImpl implements DispoApi {
       }
 
       ArtifactReadable author = getQuery().findUser();
-      getWriter().updateDispoItems(author, program, dispoItems);
+      getWriter().updateDispoItems(author, program, dispoItems, resetRerunFlag);
       wasUpdated = true;
       return wasUpdated;
    }
@@ -390,7 +390,7 @@ public class DispoApiImpl implements DispoApi {
                createDispoItems(program, setToEdit.getGuid(), itemsToCreate);
             }
             if (itemsToEdit.size() > 0) {
-               editDispoItems(program, itemsToEdit);
+               editDispoItems(program, itemsToEdit, true);
             }
 
          } catch (Exception ex) {
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoWriter.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoWriter.java
index a5044487565..2d1fcb49a1f 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoWriter.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/DispoWriter.java
@@ -34,5 +34,5 @@ public interface DispoWriter {
 
    void updateDispoItem(ArtifactReadable author, DispoProgram program, String dispoItemId, DispoItem data);
 
-   void updateDispoItems(ArtifactReadable author, DispoProgram program, List<DispoItem> data);
+   void updateDispoItems(ArtifactReadable author, DispoProgram program, List<DispoItem> data, boolean resetRerunFlag);
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
index d0434fce7b2..882c744290d 100644
--- a/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
+++ b/plugins/org.eclipse.osee.disposition.rest/src/org/eclipse/osee/disposition/rest/internal/OrcsStorageImpl.java
@@ -289,9 +289,8 @@ public class OrcsStorageImpl implements Storage {
       tx.commit();
    }
 
-   public void updateSingleItem(ArtifactReadable author, DispoProgram program, ArtifactId currentItemArt, DispoItem newItemData, TransactionBuilder tx) {
+   private void updateSingleItem(ArtifactReadable author, DispoProgram program, ArtifactId currentItemArt, DispoItem newItemData, TransactionBuilder tx, boolean resetRerunFlag) {
       Date lastUpdate = newItemData.getLastUpdate();
-      Boolean needsRerun = newItemData.getNeedsRerun();
       String name = newItemData.getName();
       JSONObject discrepanciesList = newItemData.getDiscrepanciesList();
       JSONArray annotationsList = newItemData.getAnnotationsList();
@@ -299,6 +298,13 @@ public class OrcsStorageImpl implements Storage {
       String assignee = newItemData.getAssignee();
       String totalPoints = newItemData.getTotalPoints();
 
+      Boolean needsRerun;
+      if (resetRerunFlag) {
+         needsRerun = false;
+      } else {
+         needsRerun = newItemData.getNeedsRerun();
+      }
+
       if (name != null) {
          tx.setName(currentItemArt, name);
       }
@@ -331,17 +337,17 @@ public class OrcsStorageImpl implements Storage {
       IOseeBranch branch = TokenFactory.createBranch(program.getUuid(), "");
       TransactionBuilder tx = getTxFactory().createTransaction(branch, author, "Edit Dispo Item");
       ArtifactId dispoItemArt = findDispoArtifact(program, dispoItemId, DispoConstants.DispoItem);
-      updateSingleItem(author, program, dispoItemArt, data, tx);
+      updateSingleItem(author, program, dispoItemArt, data, tx, false);
       tx.commit();
    }
 
    @Override
-   public void updateDispoItems(ArtifactReadable author, DispoProgram program, List<DispoItem> data) {
+   public void updateDispoItems(ArtifactReadable author, DispoProgram program, List<DispoItem> data, boolean resetRerunFlag) {
       TransactionBuilder tx = getTxFactory().createTransaction(program.getUuid(), author, "Edit Multiple Dispo Items");
 
       for (DispoItem newItem : data) {
          ArtifactId dispoItemArt = findDispoArtifact(program, newItem.getGuid(), DispoConstants.DispoItem);
-         updateSingleItem(author, program, dispoItemArt, newItem, tx);
+         updateSingleItem(author, program, dispoItemArt, newItem, tx, resetRerunFlag);
       }
 
       tx.commit();