Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Upmerge release/2023.2.x to release/2023.3.x #454

Merged
merged 3 commits into from
Oct 24, 2023
Merged

⬆️ Upmerge release/2023.2.x to release/2023.3.x #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd0ea3b
ACAS-696: Fix vendorID updates
brianbolt Oct 24, 2023
f516d96
Merge pull request #453 from mcneilco/ACAS-696
brianbolt Oct 24, 2023
1a3f544
ACAS-716 fix dev tagging logic
bffrost Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/trigger-tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/labsynch/labseer/domain/Lot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public class Lot {

@Size(max = 255)
@Column(name = "vendorid")
private String vendorId;
private String vendorID;

@ManyToOne
@JoinColumn(name = "salt_form")
Expand Down Expand Up @@ -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<FileList> getFileLists() {
Expand Down Expand Up @@ -1074,7 +1074,7 @@ public void setLotAliases(Set<LotAlias> 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");
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/com/labsynch/labseer/dto/LotDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/labsynch/labseer/service/BulkLoadServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -1384,7 +1384,7 @@ public Lot createLot(CmpdRegMolecule mol, int recordNumber, Collection<BulkLoadP
lot.setColor(getStringValueFromMappings(mol, "Lot Color", mappings, results, recordNumber));
lot.setSupplier(getStringValueFromMappings(mol, "Lot Supplier", mappings, results, recordNumber));
lot.setSupplierID(getStringValueFromMappings(mol, "Lot Supplier ID", mappings, results, recordNumber));
lot.setVendorId(getStringValueFromMappings(mol, "Lot Vendor ID", mappings, results, recordNumber));
lot.setVendorID(getStringValueFromMappings(mol, "Lot Vendor ID", mappings, results, recordNumber));
lot.setComments(getStringValueFromMappings(mol, "Lot Comments", mappings, results, recordNumber));
lot.setSupplierLot(getStringValueFromMappings(mol, "Lot Supplier Lot", mappings, results, recordNumber));
lot.setMeltingPoint(getNumericValueFromMappings(mol, "Lot Melting Point", mappings, results, recordNumber));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/labsynch/labseer/service/ExportServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ private int writeLotsToSDF(String exportSDFFileName, Collection<LotDTO> 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)
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/labsynch/labseer/service/MetalotServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Loading