small improvements

app-monolith/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastEntity.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 @Entity(name = "DeliveryForecast")
 @Getter
 @NoArgsConstructor
-@EqualsAndHashCode(of = "id")
+@EqualsAndHashCode(of = {"refNo", "date"})
 public class DeliveryForecastEntity implements Serializable {
 
     @Id

app-monolith/src/main/java/pl/com/bottega/factory/delivery/planning/projection/DeliveryForecastProjection.java

@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
 import pl.com.bottega.factory.delivery.planning.DeliveryAutoPlanner;
 import pl.com.bottega.factory.delivery.planning.DeliveryAutoPlannerORMRepository;
 import pl.com.bottega.factory.demand.forecasting.Demand;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged;
+import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged;
 import pl.com.bottega.factory.demand.forecasting.projection.CurrentDemandDao;
 import pl.com.bottega.factory.demand.forecasting.projection.CurrentDemandEntity;
 

app-monolith/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandService.java

@@ -2,7 +2,7 @@ package pl.com.bottega.factory.demand.forecasting;
 
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.ReviewRequested.ReviewNeeded;
+import pl.com.bottega.factory.demand.forecasting.ReviewRequested.ReviewNeeded;
 
 import javax.transaction.Transactional;
 

app-monolith/src/main/java/pl/com/bottega/factory/demand/forecasting/command/DemandReviewEntity.java

@@ -4,7 +4,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.ReviewRequested.ReviewNeeded;
+import pl.com.bottega.factory.demand.forecasting.ReviewRequested.ReviewNeeded;
 import pl.com.bottega.factory.demand.forecasting.ReviewDecision;
 import pl.com.bottega.tools.JsonConverter;
 

app-monolith/src/main/java/pl/com/bottega/factory/demand/forecasting/projection/CurrentDemandProjection.java

@@ -2,7 +2,7 @@ package pl.com.bottega.factory.demand.forecasting.projection;
 
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged;
+import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged;
 
 @Component
 @AllArgsConstructor

app-monolith/src/main/java/pl/com/bottega/factory/shortages/prediction/ShortagePredictionEventsMapping.java

@@ -3,7 +3,7 @@ package pl.com.bottega.factory.shortages.prediction;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged;
+import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged;
 import pl.com.bottega.factory.shortages.prediction.monitoring.ShortagePredictionProcess;
 import pl.com.bottega.factory.shortages.prediction.monitoring.ShortagePredictionProcessRepository;
 

demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DailyDemand.java

@@ -1,8 +1,8 @@
 package pl.com.bottega.factory.demand.forecasting;
 
 import lombok.Value;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged.Change;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.ReviewRequested.ReviewNeeded;
+import pl.com.bottega.factory.demand.forecasting.DemandedLevelsChanged.Change;
+import pl.com.bottega.factory.demand.forecasting.ReviewRequested.ReviewNeeded;
 
 import java.util.Objects;
 import java.util.Optional;

demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ProductDemand.java

@@ -1,9 +1,7 @@
 package pl.com.bottega.factory.demand.forecasting;
 
 import lombok.AllArgsConstructor;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.ReviewRequested;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.ReviewRequested.ReviewNeeded;
+import pl.com.bottega.factory.demand.forecasting.ReviewRequested.ReviewNeeded;
 import pl.com.bottega.factory.product.management.RefNoId;
 
 import java.time.Clock;

demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewDecision.java

@@ -1,7 +1,7 @@
 package pl.com.bottega.factory.demand.forecasting;
 
 import lombok.AllArgsConstructor;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.ReviewRequested.ReviewNeeded;
+import pl.com.bottega.factory.demand.forecasting.ReviewRequested.ReviewNeeded;
 
 import java.util.Collections;
 import java.util.function.Function;

demand-forecasting-model/src/main/java/pl/com/bottega/factory/demand/forecasting/UnitOfWork.java

@@ -1,7 +1,6 @@
 package pl.com.bottega.factory.demand.forecasting;
 
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged;
-import pl.com.bottega.factory.demand.forecasting.DemandEvents.ReviewRequested.ReviewNeeded;
+import pl.com.bottega.factory.demand.forecasting.ReviewRequested.ReviewNeeded;
 
 import java.util.*;
 

demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DailyDemandBuilder.groovy

@@ -5,8 +5,8 @@ import java.time.Instant
 import java.time.LocalDate
 import java.time.ZoneId
 
-import static pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged.Change
-import static pl.com.bottega.factory.demand.forecasting.DemandEvents.ReviewRequested.ReviewNeeded
+import static DemandedLevelsChanged.Change
+import static ReviewRequested.ReviewNeeded
 
 class DailyDemandBuilder {
 

demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DemandAdjustmentSpec.groovy

@@ -4,8 +4,6 @@ import spock.lang.Specification
 
 import java.time.LocalDate
 
-import static pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged
-
 class DemandAdjustmentSpec extends Specification implements ProductDemandTrait {
 
     def events = Mock(DemandEvents)

demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/DocumentProcessingSpec.groovy

@@ -4,8 +4,6 @@ import spock.lang.Specification
 
 import java.time.LocalDate
 
-import static pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged
-
 class DocumentProcessingSpec extends Specification implements ProductDemandTrait {
 
     def events = Mock(DemandEvents)

demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandBuilder.groovy

@@ -6,8 +6,6 @@ import java.time.*
 
 import static DemandedLevelsChanged.Change
 import static ReviewRequested.ReviewNeeded
-import static pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged
-import static pl.com.bottega.factory.demand.forecasting.DemandEvents.ReviewRequested
 
 class ProductDemandBuilder {
 

demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ProductDemandTrait.groovy

@@ -3,8 +3,6 @@ package pl.com.bottega.factory.demand.forecasting
 import java.time.LocalDate
 
 import static ReviewRequested.ReviewNeeded
-import static pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged
-import static pl.com.bottega.factory.demand.forecasting.DemandEvents.ReviewRequested
 
 trait ProductDemandTrait {
 

demand-forecasting-model/src/test/groovy/pl/com/bottega/factory/demand/forecasting/ReviewProcessingSpec.groovy

@@ -4,7 +4,6 @@ import spock.lang.Specification
 
 import java.time.LocalDate
 
-import static pl.com.bottega.factory.demand.forecasting.DemandEvents.DemandedLevelsChanged
 import static pl.com.bottega.factory.demand.forecasting.ReviewDecision.*
 
 class ReviewProcessingSpec extends Specification implements ProductDemandTrait {

shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/Demand.java

@@ -23,9 +23,4 @@ public class Demand {
         return of(0);
     }
 
-    public static Demand ofNullable(Long level, Schema schema) {
-        return level == null || schema == null
-                ? nothingDemanded()
-                : of(level, schema);
-    }
 }

shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandEvents.java

@@ -1,59 +1,8 @@
 package pl.com.bottega.factory.demand.forecasting;
 
-import lombok.Value;
-import pl.com.bottega.factory.product.management.RefNoId;
-
-import java.time.LocalDate;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 public interface DemandEvents {
     void emit(DemandedLevelsChanged event);
 
     void emit(ReviewRequested event);
 
-    @Value
-    class DemandedLevelsChanged {
-        RefNoId refNo;
-        Map<DailyId, Change> results;
-
-        public DemandedLevelsChanged(RefNoId refNo, Map<DailyId, Change> results) {
-            this.refNo = refNo;
-            this.results = Collections.unmodifiableMap(results);
-        }
-
-        @Value
-        public static class Change {
-            Demand previous;
-            Demand current;
-        }
-    }
-
-    @Value
-    class ReviewRequested {
-        RefNoId refNo;
-        List<ReviewNeeded> reviews;
-
-        public ReviewRequested(RefNoId refNo, List<ReviewNeeded> reviews) {
-            this.refNo = refNo;
-            this.reviews = Collections.unmodifiableList(reviews);
-        }
-
-        @Value
-        public static class ReviewNeeded {
-            DailyId id;
-            Demand previousDocumented;
-            Demand adjustment;
-            Demand newDocumented;
-
-            public String getRefNo() {
-                return id.getRefNo();
-            }
-
-            public LocalDate getDate() {
-                return id.getDate();
-            }
-        }
-    }
 }

shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/DemandedLevelsChanged.java

@@ -0,0 +1,24 @@
+package pl.com.bottega.factory.demand.forecasting;
+
+import lombok.Value;
+import pl.com.bottega.factory.product.management.RefNoId;
+
+import java.util.Collections;
+import java.util.Map;
+
+@Value
+public class DemandedLevelsChanged {
+    RefNoId refNo;
+    Map<DailyId, Change> results;
+
+    public DemandedLevelsChanged(RefNoId refNo, Map<DailyId, Change> results) {
+        this.refNo = refNo;
+        this.results = Collections.unmodifiableMap(results);
+    }
+
+    @Value
+    public static class Change {
+        Demand previous;
+        Demand current;
+    }
+}

shared-kernel-model/src/main/java/pl/com/bottega/factory/demand/forecasting/ReviewRequested.java

@@ -0,0 +1,35 @@
+package pl.com.bottega.factory.demand.forecasting;
+
+import lombok.Value;
+import pl.com.bottega.factory.product.management.RefNoId;
+
+import java.time.LocalDate;
+import java.util.Collections;
+import java.util.List;
+
+@Value
+public class ReviewRequested {
+    RefNoId refNo;
+    List<ReviewNeeded> reviews;
+
+    public ReviewRequested(RefNoId refNo, List<ReviewNeeded> reviews) {
+        this.refNo = refNo;
+        this.reviews = Collections.unmodifiableList(reviews);
+    }
+
+    @Value
+    public static class ReviewNeeded {
+        DailyId id;
+        Demand previousDocumented;
+        Demand adjustment;
+        Demand newDocumented;
+
+        public String getRefNo() {
+            return id.getRefNo();
+        }
+
+        public LocalDate getDate() {
+            return id.getDate();
+        }
+    }
+}