Skip to content

Commit

Permalink
Merge pull request #32 from transcom/trdm-debug-timeout
Browse files Browse the repository at this point in the history 
Trdm debug timeout
  • Loading branch information
@TevinAdams
TevinAdams authored Oct 17, 2024
2 parents df4cc5c + 0cd651a commit 170c069
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 76 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</parent>
<groupId>com.milmove.trdmlambda</groupId>
<artifactId>trdm-lambda</artifactId>
<version>1.0.3.20</version>
<version>1.0.3.21</version>
<name>trdm java spring interface</name>
<description>Project for deploying a Java TRDM interfacer for TGET data.</description>
<properties>
Expand Down
82 changes: 23 additions & 59 deletions src/main/java/com/milmove/trdmlambda/milmove/util/Trdm.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,23 +169,6 @@ public void UpdateTGETData(XMLGregorianCalendar ourLastUpdate, String trdmTable,
// We received rows from the getTable request
receivedData = true;

// Get all Tacs
ArrayList<TransportationAccountingCode> currentTacs = databaseService.getCurrentTacInformation();

// Get all loas
ArrayList<LineOfAccounting> currentLoas = databaseService.getCurrentLoaInformation();

// Get all loasSysIds that occur more than once
ArrayList<String> duplicateLoaSysIds = databaseService.getLoaSysIdCountGreaterThan1();

// Identify Loas to delete based on if their loaSysId is not unique, their
// id/primary key is not referenced in TACS loa_id and the loa is the latest
ArrayList<LineOfAccounting> loasToDelete = identifyDuplicateLoasToDelete(currentLoas, currentTacs,
duplicateLoaSysIds);

// Delete duplicate Loas
databaseService.deleteLoas(loasToDelete);

// Insert the codes into RDS
switch (rdsTable) {
case "transportation_accounting_codes":
Expand All @@ -194,22 +177,8 @@ public void UpdateTGETData(XMLGregorianCalendar ourLastUpdate, String trdmTable,
List<TransportationAccountingCode> codes = tacParser.parse(getTableResponse.getAttachment(),
oneWeekLater);

// Generate list of TACs that needs to be updated. If TAC is in currentTacs then
// the
// TAC will be in updateTacs list because the TAC already exist
List<TransportationAccountingCode> updateTacs = identifyTacsToUpdate(codes, currentTacs);

// Generate list of TACs that needs to be created. If the TAC is not in
// updateTacs then it will be in createTacs because it does not exist and needs
// to be created.
List<TransportationAccountingCode> createTacs = identifyTacsToCreate(codes, updateTacs);

logger.info("updating TACs in DB");
databaseService.updateTransportationAccountingCodes(updateTacs);
logger.info("finished updating TACs in DB");

logger.info("inserting TACs into DB");
databaseService.insertTransportationAccountingCodes(createTacs);
databaseService.insertTransportationAccountingCodes(codes);
logger.info("finished inserting TACs into DB");

if (tacParser.getMalformedTacList().size() > 0 || snsForcePublish == "true") {
Expand All @@ -231,19 +200,8 @@ public void UpdateTGETData(XMLGregorianCalendar ourLastUpdate, String trdmTable,
List<LineOfAccounting> loas = loaParser.parse(getTableResponse.getAttachment(),
oneWeekLater);

// Generate list of loas that needs to be updated. If loas are in curentLoas
// then the loa will be in updateLoas list because the loa already exist
List<LineOfAccounting> updateLoas = identifyLoasToUpdate(loas, currentLoas);

// Build Loa codes needed to create. If the code is not in updateLoas then it
// will be in createLoas because it does not exist and needs to be created.
List<LineOfAccounting> createLoas = identifyLoasToCreate(loas, updateLoas);

logger.info("updating LOAs in DB");
databaseService.updateLinesOfAccountingCodes(updateLoas);
logger.info("finished updating LOAs in DB");
logger.info("inserting LOAs into DB");
databaseService.insertLinesOfAccounting(createLoas);
databaseService.insertLinesOfAccounting(loas);
logger.info("finished inserting LOAs into DB");

if (loaParser.getMalformedLoaList().size() > 0 || snsForcePublish == "true") {
Expand Down Expand Up @@ -279,13 +237,6 @@ public void UpdateTGETData(XMLGregorianCalendar ourLastUpdate, String trdmTable,

}

// Identify TACS to update. If their tacSysId already exist then we need to
// update it
public List<TransportationAccountingCode> identifyTacsToUpdate(List<TransportationAccountingCode> newTacs,
ArrayList<TransportationAccountingCode> currentTacs) {
return newTacs.stream().filter(newTac -> currentTacs.stream().map(currentTac -> currentTac.getTacSysID())
.collect(Collectors.toList()).contains(newTac.getTacSysID())).collect(Collectors.toList());
}

// Identify TACS to create. If the tacSysId is not in the update list then it it
// doesn't exist and needs to be created.
Expand All @@ -301,14 +252,27 @@ public List<TransportationAccountingCode> identifyTacsToCreate(List<Transportati
// currentLoas in the database
public List<LineOfAccounting> identifyLoasToUpdate(List<LineOfAccounting> newLoas,
ArrayList<LineOfAccounting> currentLoas) {
logger.info("identifying Loas to update");
return newLoas.stream()
.filter(newLoa -> currentLoas.stream()
.map(currentLoa -> currentLoa.getLoaSysID()) // Map out loa_sys_ids from a list of current loas
// in the database
.collect(Collectors.toList())
.contains(newLoa.getLoaSysID())) // Does the new LOA loaSysId exist in a list of loa_sys_ids
.collect(Collectors.toList());
logger.info("identifying Loas to update. new LOA count: " + newLoas.size() + ". Current LOA count: " + currentLoas.size());

ArrayList<LineOfAccounting> loasToUpdate = new ArrayList<LineOfAccounting>();

ArrayList<String> currentLoaSysIds = new ArrayList<String>();
for (LineOfAccounting loa : currentLoas) {
currentLoaSysIds.add(loa.getLoaSysID());
}

logger.info("built list of current loaSysIds");


for (LineOfAccounting loa : newLoas) {
if (currentLoaSysIds.contains(loa.getLoaSysID())) {
loasToUpdate.add(loa);
}
}

logger.info("built list of loas to update");

return loasToUpdate;
}

// This method identifies loas to create based on filtering the newLoas by which
Expand Down
32 changes: 16 additions & 16 deletions src/test/java/com/milmove/trdmlambda/milmove/util/TrdmTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,23 +190,23 @@ void testUpdateTGETDataSecondWeekHalfWeekParameter() throws Exception {
assertEquals(updatedAtBeforeFilter.toString(), contentUpdatedOnOrBeforeDateTime);
}

@Test // Test that we can identify TACs needing to be updated
void identifyTacsToUpdateTest() throws SQLException {
ArrayList<TransportationAccountingCode> newTacs = createMockTacs(3);
newTacs.get(0).setTacSysID("TAC1");
newTacs.get(1).setTacSysID("TAC2");
newTacs.get(2).setTacSysID("TAC4");

ArrayList<TransportationAccountingCode> currentTacs = createMockTacs(3);
currentTacs.get(0).setTacSysID("TAC1");
currentTacs.get(1).setTacSysID("TAC3");
currentTacs.get(2).setTacSysID("TAC5");

List<TransportationAccountingCode> updateTacs = trdm.identifyTacsToUpdate(newTacs, currentTacs);
// @Test // Test that we can identify TACs needing to be updated
// void identifyTacsToUpdateTest() throws SQLException {
// ArrayList<TransportationAccountingCode> newTacs = createMockTacs(3);
// newTacs.get(0).setTacSysID("TAC1");
// newTacs.get(1).setTacSysID("TAC2");
// newTacs.get(2).setTacSysID("TAC4");

// ArrayList<TransportationAccountingCode> currentTacs = createMockTacs(3);
// currentTacs.get(0).setTacSysID("TAC1");
// currentTacs.get(1).setTacSysID("TAC3");
// currentTacs.get(2).setTacSysID("TAC5");

// List<TransportationAccountingCode> updateTacs = trdm.identifyTacsToUpdate(newTacs, currentTacs);

assertEquals(updateTacs.size(), 1);
assertEquals(updateTacs.get(0).getTacSysID(), newTacs.get(0).getTacSysID());
}
// assertEquals(updateTacs.size(), 1);
// assertEquals(updateTacs.get(0).getTacSysID(), newTacs.get(0).getTacSysID());
// }

@Test // Test that we can identify TACs needing to be created
void identifyTacsToCreateTest() throws SQLException {
Expand Down

0 comments on commit 170c069

Please sign in to comment.