Development

deployment/Single Host/Infrastructure/postgres/README.md

@@ -4,6 +4,12 @@ This postgresql instance is currently used by:
 
  - [Keycloak infra component](../keycloak)
 
+## Helpful commands
+
+ - Check if pg reports itself ready: `pg_isready`
+ - 
+
+
 ## Resources
 
  - https://www.docker.com/blog/how-to-use-the-postgres-docker-official-image/

software/core/oqm-core-api/build.gradle

@@ -1,13 +1,13 @@
 plugins {
 	id 'java'
 	id 'io.quarkus'
-	id "io.freefair.lombok" version "9.1.0"
+	id "io.freefair.lombok" version "9.2.0"
 	id 'org.cyclonedx.bom' version '2.3.1'
 	id("org.spdx.sbom") version "0.9.0"
 }
 
 group 'com.ebp.openQuarterMaster'
-version '4.2.0'
+version '4.3.0-DEV'
 
 repositories {
 	mavenCentral()
@@ -38,7 +38,7 @@ dependencies {
 	implementation 'org.jboss.slf4j:slf4j-jboss-logmanager'
 
 	implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
-	implementation "com.fasterxml.jackson.datatype:jackson-datatype-javax-money:2.20.1"
+	implementation "com.fasterxml.jackson.datatype:jackson-datatype-javax-money:2.21.0"
 	implementation 'com.fasterxml.jackson.module:jackson-module-blackbird'
 
 	// https://mvnrepository.com/artifact/tech.units/indriya
@@ -66,7 +66,7 @@ dependencies {
 	testImplementation 'io.quarkus:quarkus-smallrye-jwt-build'
 	testImplementation 'io.quarkus:quarkus-test-kafka-companion'
 	testImplementation 'net.datafaker:datafaker:2.5.3'
-	testImplementation 'org.assertj:assertj-core:3.27.6'
+	testImplementation 'org.assertj:assertj-core:3.27.7'
 }
 
 java {

software/core/oqm-core-api/lombok.config

@@ -1,4 +1,11 @@
 lombok.accessors.chain=true
 lombok.addLombokGeneratedAnnotation = true
 #lombok.addJavaxGeneratedAnnotation = true
-lombok.builder.className = Builder
+
+# lombok.builder.className = Builder 
+# NOTE: was removed to fix Issue #1033
+# This setting conflicts with @SuperBuilder on generic class hierarchies,
+# causing intermittent "wrong number of type arguments" compilation errors.
+# See:
+# - https://github.com/projectlombok/lombok/issues/2647
+# - https://github.com/projectlombok/lombok/issues/3911 (issure reporting this case)

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/filters/ExceptionObjectNormalizer.java

@@ -28,7 +28,7 @@ public class ExceptionObjectNormalizer implements ContainerResponseFilter {
 	@Context
 	UriInfo uriInfo;
 
-	private ErrorMessage.Builder<?, ?> buildOutputForHibViolation(ViolationReport report) {
+	private ErrorMessage.ErrorMessageBuilder<?, ?> buildOutputForHibViolation(ViolationReport report) {
 		log.debug("Violation Report type. Mapping to standard error object.");
 
 		StringBuilder sb = new StringBuilder("Data validation errors (" + report.getViolations().size() + "): ");
@@ -86,7 +86,7 @@ public void filter(ContainerRequestContext requestContext, ContainerResponseCont
 			return;
 		}
 
-		ErrorMessage.Builder<?, ?> outputBuilder = null;
+		ErrorMessage.ErrorMessageBuilder<?, ?> outputBuilder = null;
 		log.debug("Type of response object: {}", responseContext.getEntityType());
 
 		if (responseContext.getEntity() instanceof ViolationReport) {

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/interfaces/endpoints/MainFileObjectProvider.java

@@ -11,6 +11,7 @@
 import org.bson.types.ObjectId;
 import tech.ebp.oqm.core.api.interfaces.endpoints.media.FileGet;
 import tech.ebp.oqm.core.api.model.object.FileMainObject;
+import tech.ebp.oqm.core.api.model.object.MainObject;
 import tech.ebp.oqm.core.api.model.object.history.ObjectHistoryEvent;
 import tech.ebp.oqm.core.api.model.object.media.FileMetadata;
 import tech.ebp.oqm.core.api.model.rest.media.file.FileUploadBody;
@@ -32,7 +33,7 @@
  */
 @Slf4j
 @NoArgsConstructor
-public abstract class MainFileObjectProvider<T extends FileMainObject, U extends FileUploadBody, S extends FileSearchObject<T>, G extends FileGet> extends ObjectProvider {
+public abstract class MainFileObjectProvider<T extends FileMainObject, U extends FileUploadBody, S extends FileSearchObject<T>, G extends MainObject & FileGet> extends ObjectProvider {
 
 
 	@Getter

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/media/FileHashes.java

@@ -41,7 +41,7 @@ public class FileHashes {
 	 * https://stackoverflow.com/questions/304268/getting-a-files-md5-checksum-in-java
 	 */
 	public static FileHashes fromFile(File file) {
-		FileHashes.Builder<?, ?> builder = FileHashes.builder();
+		FileHashes.FileHashesBuilder<?, ?> builder = FileHashes.builder();
 
 		try (FileInputStream is = new FileInputStream(file)) {
 			builder.md5(DigestUtils.md5Hex(is));

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/checkout/ItemWholeCheckout.java

@@ -1,5 +1,6 @@
 package tech.ebp.oqm.core.api.model.object.storage.checkout;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/checkout/checkinDetails/ReturnFullCheckinDetails.java

@@ -7,9 +7,9 @@
 import lombok.experimental.SuperBuilder;
 import tech.ebp.oqm.core.api.model.object.storage.checkout.CheckInType;
 
+@Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
-@Data
 //@AllArgsConstructor
 @NoArgsConstructor
 @SuperBuilder(toBuilder = true)

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/InventoryItem.java

@@ -14,6 +14,7 @@
 import tech.ebp.oqm.core.api.model.object.ImagedMainObject;
 import tech.ebp.oqm.core.api.model.object.storage.items.identifiers.general.GeneralId;
 import tech.ebp.oqm.core.api.model.object.storage.items.identifiers.unique.UniqueId;
+import tech.ebp.oqm.core.api.model.object.storage.items.info.AssociatedLink;
 import tech.ebp.oqm.core.api.model.object.storage.items.notification.ItemNotificationStatus;
 import tech.ebp.oqm.core.api.model.object.storage.items.pricing.Pricing;
 import tech.ebp.oqm.core.api.model.object.storage.items.pricing.StoredPricing;
@@ -138,6 +139,15 @@ public class InventoryItem extends ImagedMainObject implements FileAttachmentCon
 	@UniqueLabeledCollection
 	private LinkedHashSet<@NotNull StoredPricing> defaultPrices = new LinkedHashSet<>();
 
+	/**
+	 * Links to external resources related to the item
+	 */
+	@NonNull
+	@NotNull
+	@lombok.Builder.Default
+	@UniqueLabeledCollection
+	private LinkedHashSet<@NotNull AssociatedLink> associatedLinks = new LinkedHashSet<>();
+
 	/**
 	 * The default format that should be applied to new stored items if not otherwise specified.
 	 *

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/info/AssociatedLink.java

@@ -0,0 +1,30 @@
+package tech.ebp.oqm.core.api.model.object.storage.items.info;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.experimental.SuperBuilder;
+import tech.ebp.oqm.core.api.model.object.Labeled;
+
+import java.net.URI;
+
+@Data
+@SuperBuilder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class AssociatedLink implements Labeled {
+
+	@NonNull
+	@NotNull
+	private String label;
+
+	@NonNull
+	@NotNull
+	private URI link;
+
+	@Builder.Default
+	private String description = null;
+}

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/pricing/StoredPricing.java

@@ -75,7 +75,7 @@ protected MonetaryAmount calcPriceFromUnit(Stored stored){
 	}
 
 	public CalculatedPricing calculatePrice(Stored stored){
-		CalculatedPricing.Builder<?,?> output = CalculatedPricing.builder()
+		CalculatedPricing.CalculatedPricingBuilder<?,?> output = CalculatedPricing.builder()
 													.label(this.getLabel());
 
 		output.flatPrice(this.getFlatPrice());

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/stored/stats/StatsWithTotalContaining.java

@@ -4,6 +4,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.NonNull;
 import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 import tech.units.indriya.quantity.Quantities;
@@ -23,6 +24,7 @@ public StatsWithTotalContaining(Unit<?> unit){
 		this();
 		this.total = Quantities.getQuantity(0, unit);
 	}
-
+
+//	@NonNull //TODO:: this
 	private Quantity<?> total;
 }

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/stored/stats/StoredInBlockStats.java

@@ -19,7 +19,7 @@ public class StoredInBlockStats extends StatsWithTotalContaining {
 	public StoredInBlockStats(Unit<?> unit){
 		super(unit);
 	}
-
+	
 	@lombok.Builder.Default
 	private boolean hasStored = false;
 }

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/transactions/transactions/checkin/CheckinFullTransaction.java

@@ -1,5 +1,6 @@
 package tech.ebp.oqm.core.api.model.object.storage.items.transactions.transactions.checkin;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -12,11 +13,12 @@
 /**
  * Transaction to checkin the entirety of a checkout.
  */
+@Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-@Data
-@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder(toBuilder = true)
 public class CheckinFullTransaction extends CheckinTransaction<ReturnFullCheckinDetails> {
 
 

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/transactions/transactions/checkin/CheckinPartTransaction.java

@@ -11,11 +11,11 @@
 /**
  * Checkin transaction to only checkin a part of the amount checked out.
  */
+@Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-@Data
-@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
+@SuperBuilder(toBuilder = true)
 public class CheckinPartTransaction extends CheckinTransaction<ReturnPartCheckinDetails> {
 
 	@Override

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/transactions/transactions/checkin/CheckinTransaction.java

@@ -1,6 +1,7 @@
 package tech.ebp.oqm.core.api.model.object.storage.items.transactions.transactions.checkin;
 
 import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -18,8 +19,9 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder(toBuilder = true)
 public abstract class CheckinTransaction <T extends CheckInDetails> extends ItemStoredTransaction {
 
 	/**

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/transactions/transactions/checkout/CheckoutAmountTransaction.java

@@ -1,5 +1,6 @@
 package tech.ebp.oqm.core.api.model.object.storage.items.transactions.transactions.checkout;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -13,25 +14,26 @@
 /**
  * Transaction to checkout an amount of item stored.
  */
+@Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-@Data
-@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder(toBuilder = true)
 public class CheckoutAmountTransaction extends CheckoutTransaction {
-
+	
 	/**
 	 * If applicable, the specific stored object we are checking out from.
 	 */
 	private ObjectId fromStored;
-
+	
 	/**
 	 * If applicable, the specific block we are checking out from. Use when checking out from bulk
 	 * <p>
 	 * Only specify when {@link CheckoutAmountTransaction#all} is `false`.
 	 */
 	private ObjectId fromBlock;
-
+	
 	/**
 	 * The amount we are checking out.
 	 */
@@ -44,13 +46,13 @@ public class CheckoutAmountTransaction extends CheckoutTransaction {
 	 */
 	@lombok.Builder.Default
 	private boolean all = false;
-
-
+	
+	
 	@Override
 	public TransactionType getType() {
 		return TransactionType.CHECKOUT_AMOUNT;
 	}
-
+	
 	@Override
 	public int getSchemaVersion() {
 		return 1;

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/transactions/transactions/checkout/CheckoutTransaction.java

@@ -1,6 +1,7 @@
 package tech.ebp.oqm.core.api.model.object.storage.items.transactions.transactions.checkout;
 
 import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -16,8 +17,9 @@
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder(toBuilder = true)
 public abstract class CheckoutTransaction extends ItemStoredTransaction {
 
 	/**

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/model/object/storage/items/transactions/transactions/checkout/CheckoutWholeTransaction.java

@@ -1,6 +1,7 @@
 package tech.ebp.oqm.core.api.model.object.storage.items.transactions.transactions.checkout;
 
 import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -13,11 +14,12 @@
 /**
  * Transaction to checkout an entire stored item.
  */
+@Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
-@Data
-@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
+@AllArgsConstructor
+@SuperBuilder(toBuilder = true)
 public class CheckoutWholeTransaction extends CheckoutTransaction {
 
 	/**