Skip to content

Commit

Permalink
Merge pull request #3888 from NCI-Agency/GH-3864-check-history-when-m…
Browse files Browse the repository at this point in the history 
…erging-position

Check history conflict when merging position
  • Loading branch information
@gjvoosten
gjvoosten authored Oct 28, 2021
2 parents f52d693 + 373a548 commit 1877c9f
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 17 deletions.
1 change: 1 addition & 0 deletions insertBaseData-mssql.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ INSERT INTO positions (uuid, name, type, status, currentPersonUuid, locationUuid
(lower(newid()), 'EF 1.1 Advisor D', 0, 0, NULL, 'cc49bb27-4d8f-47a8-a9ee-af2b68b992ac', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(lower(newid()), 'EF 1.1 Advisor E', 0, 0, NULL, 'cc49bb27-4d8f-47a8-a9ee-af2b68b992ac', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(lower(newid()), 'EF 1.1 Advisor F', 0, 0, NULL, 'cc49bb27-4d8f-47a8-a9ee-af2b68b992ac', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
('888d6c4b-deaa-4218-b8fd-abfb7c81a4c6', 'EF 1.1 Advisor G', 0, 0, NULL, 'cc49bb27-4d8f-47a8-a9ee-af2b68b992ac', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(lower(newid()), 'EF 1.1 Advisor for Agriculture', 0, 0, NULL, 'cc49bb27-4d8f-47a8-a9ee-af2b68b992ac', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(lower(newid()), 'EF 1.1 Old Inactive Advisor', 0, 1, NULL, 'cc49bb27-4d8f-47a8-a9ee-af2b68b992ac', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
(lower(newid()), 'EF 1.1 Advisor for Mining', 0, 0, NULL, 'cc49bb27-4d8f-47a8-a9ee-af2b68b992ac', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP),
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/mil/dds/anet/database/PersonDao.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,11 +475,11 @@ public int updatePersonHistory(Person p) {
}

@InTransaction
public boolean hasHistoryConflict(final String uuid, final List<PersonPositionHistory> history,
final boolean checkPerson) {
final String personPositionClause =
checkPerson ? "\"personUuid\" != :personUuid AND \"positionUuid\" = :positionUuid"
: "\"personUuid\" = :personUuid AND \"positionUuid\" != :positionUuid";
public boolean hasHistoryConflict(final String uuid, final String loserUuid,
final List<PersonPositionHistory> history, final boolean checkPerson) {
final String personPositionClause = checkPerson
? "\"personUuid\" NOT IN ( :personUuid, :loserUuid ) AND \"positionUuid\" = :positionUuid"
: "\"personUuid\" = :personUuid AND \"positionUuid\" NOT IN ( :positionUuid, :loserUuid )";
for (final PersonPositionHistory pph : history) {
final Query q;
final Instant endTime = pph.getEndTime();
Expand All @@ -498,7 +498,8 @@ public boolean hasHistoryConflict(final String uuid, final List<PersonPositionHi
final Number count =
(Number) q.bind("startTime", DaoUtils.asLocalDateTime(pph.getStartTime()))
.bind("personUuid", checkPerson ? uuid : histUuid)
.bind("positionUuid", checkPerson ? histUuid : uuid).map(new MapMapper(false)).one()
.bind("positionUuid", checkPerson ? histUuid : uuid)
.bind("loserUuid", Utils.orIfNull(loserUuid, "")).map(new MapMapper(false)).one()
.get("count");

if (count.longValue() > 0) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/mil/dds/anet/resources/PersonResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public int updatePersonHistory(@GraphQLRootContext Map<String, Object> context,
assertCanUpdatePerson(user, existing);
ResourceUtils.validateHistoryInput(p.getUuid(), p.getPreviousPositions());

if (AnetObjectEngine.getInstance().getPersonDao().hasHistoryConflict(p.getUuid(),
if (AnetObjectEngine.getInstance().getPersonDao().hasHistoryConflict(p.getUuid(), null,
p.getPreviousPositions(), true)) {
throw new WebApplicationException(
"At least one of the positions in the history is occupied for the specified period.",
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/mil/dds/anet/resources/PositionResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public int updatePositionHistory(@GraphQLRootContext Map<String, Object> context
final Position existing = dao.getByUuid(pos.getUuid());
ResourceUtils.validateHistoryInput(pos.getUuid(), pos.getPreviousPeople());
assertCanUpdatePosition(user, existing);
if (AnetObjectEngine.getInstance().getPersonDao().hasHistoryConflict(pos.getUuid(),
if (AnetObjectEngine.getInstance().getPersonDao().hasHistoryConflict(pos.getUuid(), null,
pos.getPreviousPeople(), false)) {
throw new WebApplicationException(
"At least one of the positions in the history is occupied for the specified period.",
Expand Down Expand Up @@ -263,9 +263,17 @@ public Position mergePositions(@GraphQLRootContext Map<String, Object> context,
final Person user = DaoUtils.getUserFromContext(context);
final Position loserPosition = dao.getByUuid(loserUuid);

ResourceUtils.validateHistoryInput(winnerPosition.getUuid(),
winnerPosition.getPreviousPeople());
assertCanUpdatePosition(user, winnerPosition);
// Check that given two position can be merged
arePositionsMergeable(winnerPosition, loserPosition);
if (AnetObjectEngine.getInstance().getPersonDao().hasHistoryConflict(winnerPosition.getUuid(),
loserUuid, winnerPosition.getPreviousPeople(), false)) {
throw new WebApplicationException(
"At least one of the positions in the history is occupied for the specified period.",
Status.CONFLICT);
}
validatePosition(user, winnerPosition);

int numRows = dao.mergePositions(winnerPosition, loserPosition);
Expand Down
37 changes: 28 additions & 9 deletions src/test/java/mil/dds/anet/test/database/PersonDaoTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ public class PersonDaoTest {
private static final String DVISOR_UUID = "39d02d26-49eb-43b5-9cec-344777213a67";
// SOLENOID, Selena
private static final String SELENA_UUID = "00b19ebf-0d4d-4b0f-93c8-9023ccb59c49";
// STEVESON, Steve for loser person
private static final String STEVESON_STEVE = "90fa5784-9e63-4353-8119-357bcd88e287";
// EF 2.2 Advisor Sewing Facilities
private static final String EF22_ASF_UUID = "2b7d86a9-3ed4-4843-ab4e-136c3ab109bf";
// EF 1.2 Advisor
private static final String EF12_A_UUID = "525d6c4b-deaa-4218-b8fd-abfb7c81a4c2";

// EF 1.1 Advisor G for loser position
private static final String EF11_G_UUID = "888d6c4b-deaa-4218-b8fd-abfb7c81a4c6";
// Each test data item has: { hasConflict, start time, end time, … }
// History tests for Dvisor and Dvisor's own position, and Dvisor's own position and Dvisor:
private final Object[][] testData1 = new Object[][] {
Expand Down Expand Up @@ -126,21 +129,37 @@ public static void setUpClass() throws Exception {
@Test
public void hasHistoryConflictForPersonTest() {
// History tests for Dvisor and Dvisor's own position
checkHistoryConflict(DVISOR_UUID, EF22_ASF_UUID, true, testData1);
checkHistoryConflict(DVISOR_UUID, null, EF22_ASF_UUID, true, testData1);
// History tests for Selena and Dvisor's position
checkHistoryConflict(SELENA_UUID, EF22_ASF_UUID, true, testData2);
checkHistoryConflict(SELENA_UUID, null, EF22_ASF_UUID, true, testData2);
}

@Test
public void hasHistoryConflictForPositionTest() {
// History tests for Dvisor's own position and Dvisor
checkHistoryConflict(DVISOR_UUID, EF22_ASF_UUID, false, testData1);
checkHistoryConflict(DVISOR_UUID, null, EF22_ASF_UUID, false, testData1);
// History tests for Selena's position and Dvisor:
checkHistoryConflict(DVISOR_UUID, EF12_A_UUID, false, testData2);
checkHistoryConflict(DVISOR_UUID, null, EF12_A_UUID, false, testData2);
}

@Test
public void hasHistoryConflictForMergingPersonTest() {
// History tests for merging positions if DVISOR_UUID is winner
checkHistoryConflict(DVISOR_UUID, STEVESON_STEVE, EF22_ASF_UUID, true, testData1);
// History tests for merging positions if DVISOR_UUID is winner
checkHistoryConflict(DVISOR_UUID, STEVESON_STEVE, EF12_A_UUID, true, testData2);
}

@Test
public void hasHistoryConflictForMergingPositionTest() {
// History tests for merging positions if EF22_ASF_UUID is winner
checkHistoryConflict(DVISOR_UUID, EF11_G_UUID, EF22_ASF_UUID, false, testData1);
// History tests for merging positions if EF12_A_UUID is winner
checkHistoryConflict(DVISOR_UUID, EF11_G_UUID, EF12_A_UUID, false, testData2);
}

private void checkHistoryConflict(final String personUuid, final String positionUuid,
final boolean checkPerson, final Object[][] testData) {
private void checkHistoryConflict(final String personUuid, final String loserUuid,
final String positionUuid, final boolean checkPerson, final Object[][] testData) {
for (final Object[] testItem : testData) {
int i = 0;
final boolean hasConflict = (boolean) testItem[i++];
Expand All @@ -154,8 +173,8 @@ private void checkHistoryConflict(final String personUuid, final String position
hist.add(pph);
}
logger.debug("checking {}", Arrays.toString(testItem));
final boolean hasHistoryConflict =
personDao.hasHistoryConflict(checkPerson ? personUuid : positionUuid, hist, checkPerson);
final boolean hasHistoryConflict = personDao.hasHistoryConflict(
checkPerson ? personUuid : positionUuid, loserUuid, hist, checkPerson);
assertThat(hasHistoryConflict).isEqualTo(hasConflict);
}
}
Expand Down

0 comments on commit 1877c9f

Please sign in to comment.