Merge pull request #4310 from NCI-Agency/AB-813-fix-duplicate-positio…

…n-code-error-handling Correct error handling of duplicate position code
NCI-Agency · Mar 27, 2023 · 7935dc2 · 7935dc2
2 parents 9792107 + b179a21
commit 7935dc2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/src/main/java/mil/dds/anet/database/PositionDao.java b/src/main/java/mil/dds/anet/database/PositionDao.java
@@ -1,6 +1,5 @@
 package mil.dds.anet.database;
 
-import java.sql.SQLException;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,8 +10,6 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Response.Status;
 import mil.dds.anet.AnetObjectEngine;
 import mil.dds.anet.beans.Organization;
 import mil.dds.anet.beans.PersonPositionHistory;
@@ -24,6 +21,7 @@
 import mil.dds.anet.database.mappers.PositionMapper;
 import mil.dds.anet.utils.DaoUtils;
 import mil.dds.anet.utils.FkDataLoaderKey;
+import mil.dds.anet.utils.ResponseUtils;
 import mil.dds.anet.utils.SqDataLoaderKey;
 import mil.dds.anet.utils.Utils;
 import mil.dds.anet.views.ForeignKeyFetcher;
@@ -39,6 +37,9 @@ public class PositionDao extends AnetSubscribableObjectDao<Position, PositionSea
       "organizationUuid", "currentPersonUuid", "type", "status", "locationUuid", "customFields"};
   public static final String TABLE_NAME = "positions";
   public static final String POSITION_FIELDS = DaoUtils.buildFieldAliases(TABLE_NAME, fields, true);
+  public static final String DUPLICATE_POSITION_CODE =
+      "Another position is already using this code and each position must have its own code. "
+          + "Please double check that you entered the right code.";
 
   @Override
   public Position insertInternal(Position p) {
@@ -60,25 +61,11 @@ public Position insertInternal(Position p) {
       // Specifically don't set currentPersonUuid here because we'll handle that later in
       // setPersonInPosition();
     } catch (UnableToExecuteStatementException e) {
-      checkForUniqueCodeViolation(e);
-      throw e;
+      throw ResponseUtils.handleSqlException(e, DUPLICATE_POSITION_CODE);
     }
     return p;
   }
 
-  public void checkForUniqueCodeViolation(UnableToExecuteStatementException e) {
-    if (e.getCause() != null && e.getCause() instanceof SQLException) {
-      SQLException cause = (SQLException) e.getCause();
-      if (cause.getErrorCode() == 2601) { // Unique Key Violation constant for SQL Server
-        if (cause.getMessage().contains("UQ_PositionCodes")) {
-          throw new WebApplicationException("Another position is already using this "
-              + "code and each position must have its own code. "
-              + "Please double check that you entered the right code. ", Status.CONFLICT);
-        }
-      }
-    }
-  }
-
   @Override
   public Position getByUuid(String uuid) {
     return getByIds(Arrays.asList(uuid)).get(0);
@@ -176,8 +163,7 @@ public int updateInternal(Position p) {
           .evictFromCacheByPositionUuid(DaoUtils.getUuid(p));
       return nr;
     } catch (UnableToExecuteStatementException e) {
-      checkForUniqueCodeViolation(e);
-      throw e;
+      throw ResponseUtils.handleSqlException(e, DUPLICATE_POSITION_CODE);
     }
   }
 

diff --git a/src/test/java/mil/dds/anet/test/resources/PositionResourceTest.java b/src/test/java/mil/dds/anet/test/resources/PositionResourceTest.java
@@ -12,8 +12,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 import javax.ws.rs.BadRequestException;
+import javax.ws.rs.ClientErrorException;
 import javax.ws.rs.ForbiddenException;
 import javax.ws.rs.NotFoundException;
 import mil.dds.anet.test.TestData;
@@ -469,10 +471,11 @@ public void createPositionTest()
         adminQueryExecutor.organizationList(getListFields(ORGANIZATION_FIELDS), queryOrgs);
     assertThat(orgs.getList().size()).isGreaterThan(0);
 
+    final String positionCode = UUID.randomUUID().toString();
     final PositionInput newbPositionInput = PositionInput.builder()
         .withName("PositionTest Position for Newb").withType(PositionType.PRINCIPAL)
         .withOrganization(getOrganizationInput(orgs.getList().get(0))).withStatus(Status.ACTIVE)
-        .withPerson(getPersonInput(newb)).build();
+        .withPerson(getPersonInput(newb)).withCode(positionCode).build();
 
     final Position newbPosition = adminMutationExecutor.createPosition(FIELDS, newbPositionInput);
     assertThat(newbPosition).isNotNull();
@@ -546,6 +549,17 @@ public void createPositionTest()
     assertThat(history.size()).isEqualTo(2);
     assertThat(history.get(0).getPerson().getUuid()).isEqualTo(newb.getUuid());
     assertThat(history.get(1).getPerson().getUuid()).isEqualTo(prin2.getUuid());
+
+    // Try to create another position with the same code
+    final PositionInput dupCodePositionInput = PositionInput.builder()
+        .withName("PositionTest Position for duplicate code").withType(PositionType.PRINCIPAL)
+        .withOrganization(getOrganizationInput(orgs.getList().get(0))).withStatus(Status.ACTIVE)
+        .withCode(positionCode).build();
+    try {
+      adminMutationExecutor.createPosition(FIELDS, dupCodePositionInput);
+      fail("Expected ClientErrorException");
+    } catch (ClientErrorException expectedException) {
+    }
   }
 
   @Test