From cd0ea3b2a3c52f6392827dc53edc8262f70ac8ef Mon Sep 17 00:00:00 2001 From: Brian Bolt Date: Tue, 24 Oct 2023 13:22:07 -0700 Subject: [PATCH 1/2] ACAS-696: Fix vendorID updates --- src/main/java/com/labsynch/labseer/domain/Lot.java | 12 ++++++------ src/main/java/com/labsynch/labseer/dto/LotDTO.java | 11 ++++++----- .../labseer/service/BulkLoadServiceImpl.java | 6 +++--- .../labsynch/labseer/service/ExportServiceImpl.java | 4 ++-- .../labsynch/labseer/service/MetalotServiceImpl.java | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/labsynch/labseer/domain/Lot.java b/src/main/java/com/labsynch/labseer/domain/Lot.java index 06195642b..bc2aca088 100755 --- a/src/main/java/com/labsynch/labseer/domain/Lot.java +++ b/src/main/java/com/labsynch/labseer/domain/Lot.java @@ -148,7 +148,7 @@ public class Lot { @Size(max = 255) @Column(name = "vendorid") - private String vendorId; + private String vendorID; @ManyToOne @JoinColumn(name = "salt_form") @@ -898,12 +898,12 @@ public void setVendor(Vendor vendor) { this.vendor = vendor; } - public String getVendorId() { - return this.vendorId; + public String getVendorID() { + return this.vendorID; } - public void setVendorId(String vendorId) { - this.vendorId = vendorId; + public void setVendorID(String vendorID) { + this.vendorID = vendorID; } public Set getFileLists() { @@ -1074,7 +1074,7 @@ public void setLotAliases(Set lotAliases) { "registeredBy", "modifiedDate", "modifiedBy", "barcode", "color", "notebookPage", "amount", "amountUnits", "solutionAmount", "solutionAmountUnits", "supplier", "supplierID", "purity", "purityOperator", "purityMeasuredBy", "chemist", "percentEE", "comments", "isVirtual", "ignore", "physicalState", "vendor", - "vendorId", "saltForm", "fileLists", "retain", "retainUnits", "retainLocation", "meltingPoint", + "vendorID", "saltForm", "fileLists", "retain", "retainUnits", "retainLocation", "meltingPoint", "boilingPoint", "supplierLot", "project", "parent", "bulkLoadFile", "lambda", "absorbance", "stockSolvent", "stockLocation", "observedMassOne", "observedMassTwo", "tareWeight", "tareWeightUnits", "totalAmountStored", "totalAmountStoredUnits", "lotAliases", "storageLocation"); diff --git a/src/main/java/com/labsynch/labseer/dto/LotDTO.java b/src/main/java/com/labsynch/labseer/dto/LotDTO.java index 48d617547..f7653bd7d 100755 --- a/src/main/java/com/labsynch/labseer/dto/LotDTO.java +++ b/src/main/java/com/labsynch/labseer/dto/LotDTO.java @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; +import com.fasterxml.jackson.annotation.JsonAlias; import com.labsynch.labseer.domain.IsoSalt; import com.labsynch.labseer.domain.Lot; import com.labsynch.labseer.domain.LotAlias; @@ -67,7 +68,7 @@ public class LotDTO { private Double totalAmountStored; private String totalAmountStoredUnitsCode; private String vendorCode; - private String vendorId; + private String vendorID; private String saltFormCorpName; private String casNumber; private String saltAbbrevs; @@ -598,12 +599,12 @@ public void setVendorCode(String vendorCode) { this.vendorCode = vendorCode; } - public String getVendorId() { - return this.vendorId; + public String getVendorID() { + return this.vendorID; } - public void setVendorId(String vendorId) { - this.vendorId = vendorId; + public void setVendorID(String vendorID) { + this.vendorID = vendorID; } public String getSaltFormCorpName() { diff --git a/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java b/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java index 1b1e2702e..7c099febc 100644 --- a/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java +++ b/src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java @@ -725,8 +725,8 @@ public void writeRegisteredMol(int numRecordsRead, CmpdRegMolecule mol, MetalotR ((metalotReturn.getMetalot().getLot().getSupplierID() == null) ? "" : metalotReturn.getMetalot().getLot().getSupplierID())); mol.setProperty("Registered Lot Vendor ID", - ((metalotReturn.getMetalot().getLot().getVendorId() == null) ? "" - : metalotReturn.getMetalot().getLot().getVendorId())); + ((metalotReturn.getMetalot().getLot().getVendorID() == null) ? "" + : metalotReturn.getMetalot().getLot().getVendorID())); if (!parentAliasList.isEmpty()) { for (String alias : parentAliasList) { if (allParentAliases.length() == 0) @@ -1384,7 +1384,7 @@ public Lot createLot(CmpdRegMolecule mol, int recordNumber, Collection lotDTOs) mol.setProperty("Supplier", lotDTO.getSupplier()); if (lotDTO.getSupplierID() != null) mol.setProperty("Supplier ID", lotDTO.getSupplierID()); - if (lotDTO.getVendorId() != null) - mol.setProperty("Vendor ID", lotDTO.getVendorId()); + if (lotDTO.getVendorID() != null) + mol.setProperty("Vendor ID", lotDTO.getVendorID()); if (lotDTO.getSupplierLot() != null) mol.setProperty("Supplier Lot", lotDTO.getSupplierLot()); if (lotDTO.getSynthesisDate() != null) diff --git a/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java b/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java index e04e33a58..7885ab6b6 100755 --- a/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java +++ b/src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java @@ -618,7 +618,7 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList // oldLot.setObservedMassOne(lot.getObservedMassOne()); oldLot.setObservedMassTwo(lot.getObservedMassTwo()); - oldLot.setVendorId(lot.getVendorId()); + oldLot.setVendorID(lot.getVendorID()); oldLot.setTareWeight(lot.getTareWeight()); oldLot.setTareWeightUnits(lot.getTareWeightUnits()); oldLot.setTotalAmountStored(lot.getTotalAmountStored()); From 1a3f544c47f89417821cea8612fa6670a0d1e9f9 Mon Sep 17 00:00:00 2001 From: Brian Frost Date: Tue, 24 Oct 2023 08:20:08 -0700 Subject: [PATCH 2/2] ACAS-716 fix dev tagging logic (cherry picked from commit 295fe1d6e89c93ce4e62e7fc579ce5ba5a3462ab) --- .github/workflows/trigger-tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/trigger-tag.yml b/.github/workflows/trigger-tag.yml index 84bb9e937..8205b96a2 100644 --- a/.github/workflows/trigger-tag.yml +++ b/.github/workflows/trigger-tag.yml @@ -24,7 +24,7 @@ jobs: # and 2022.1.1-dev9 will become 2022.1.1-dev10 - name: Get next dev tag name run: | - LAST_TAG=$(git tag --sort=v:refname --merged ${{ env.BRANCH_NAME }} | grep -e '-dev' | tail -1) + LAST_TAG=$(git tag --sort=v:refname --merged ${{ env.BRANCH_NAME }} | grep -E '^[0-9]{4}\.[0-9]+\.[0-9]+-dev[0-9]+$' | tail -1) echo "NEXT_TAG=$(echo $LAST_TAG | awk -F-dev -v OFS=-dev '{$NF += 1 ; print}')" >> $GITHUB_ENV # Trigger the build - name: Trigger the tagger workflow with branch ${{env.BRANCH_NAME}} and tag ${{ env.NEXT_TAG }}