mirror of
https://github.com/s-frick/effigenix.git
synced 2026-03-28 12:09:35 +01:00
refactor(masterdata): Restructure masterdata domain package
This commit is contained in:
parent
a214002fab
commit
973c33d78f
174 changed files with 439 additions and 294 deletions
|
|
@ -2,6 +2,7 @@ package de.effigenix.application.inventory;
|
|||
|
||||
import de.effigenix.application.inventory.command.AddStockBatchCommand;
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
@ -42,7 +43,7 @@ class AddStockBatchTest {
|
|||
|
||||
existingStock = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null, List.of(), List.of()
|
||||
);
|
||||
|
|
@ -116,7 +117,7 @@ class AddStockBatchTest {
|
|||
void shouldFailWhenDuplicateBatchReference() {
|
||||
var stockWithBatch = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null,
|
||||
List.of(StockBatch.reconstitute(
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package de.effigenix.application.inventory;
|
|||
import de.effigenix.application.inventory.command.BlockStockBatchCommand;
|
||||
import de.effigenix.application.usermanagement.AuditLogger;
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
@ -58,7 +59,7 @@ class BlockStockBatchTest {
|
|||
|
||||
existingStock = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null,
|
||||
new ArrayList<>(List.of(batch)), List.of()
|
||||
|
|
@ -153,7 +154,7 @@ class BlockStockBatchTest {
|
|||
);
|
||||
var stock = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null,
|
||||
new ArrayList<>(List.of(blockedBatch)), List.of()
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package de.effigenix.application.inventory;
|
||||
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package de.effigenix.application.inventory;
|
|||
|
||||
import de.effigenix.application.inventory.command.ConfirmReservationCommand;
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
@ -104,7 +105,7 @@ class ConfirmReservationTest {
|
|||
);
|
||||
var stock = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null, new ArrayList<>(List.of(batch1, batch2)), List.of()
|
||||
);
|
||||
|
|
@ -234,7 +235,7 @@ class ConfirmReservationTest {
|
|||
);
|
||||
return Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null, new ArrayList<>(List.of(batch)), List.of()
|
||||
);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package de.effigenix.application.inventory;
|
|||
|
||||
import de.effigenix.application.inventory.command.CreateInventoryCountCommand;
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package de.effigenix.application.inventory;
|
||||
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
import de.effigenix.shared.persistence.UnitOfWork;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package de.effigenix.application.inventory;
|
||||
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package de.effigenix.application.inventory;
|
||||
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package de.effigenix.application.inventory;
|
||||
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package de.effigenix.application.inventory;
|
||||
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package de.effigenix.application.inventory;
|
||||
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package de.effigenix.application.inventory;
|
|||
|
||||
import de.effigenix.application.inventory.command.ReleaseReservationCommand;
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
@ -51,7 +52,7 @@ class ReleaseReservationTest {
|
|||
);
|
||||
existingStock = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null, new ArrayList<>(List.of(batch)), List.of()
|
||||
);
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package de.effigenix.application.inventory;
|
|||
|
||||
import de.effigenix.application.inventory.command.RemoveStockBatchCommand;
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
@ -54,7 +55,7 @@ class RemoveStockBatchTest {
|
|||
|
||||
existingStock = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null,
|
||||
new ArrayList<>(List.of(batch)), List.of()
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package de.effigenix.application.inventory;
|
|||
|
||||
import de.effigenix.application.inventory.command.ReserveStockCommand;
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
@ -51,7 +52,7 @@ class ReserveStockTest {
|
|||
);
|
||||
existingStock = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null, new ArrayList<>(List.of(batch)), List.of()
|
||||
);
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package de.effigenix.application.inventory;
|
|||
import de.effigenix.application.inventory.command.UnblockStockBatchCommand;
|
||||
import de.effigenix.application.usermanagement.AuditLogger;
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
@ -58,7 +59,7 @@ class UnblockStockBatchTest {
|
|||
|
||||
existingStock = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null,
|
||||
new ArrayList<>(List.of(batch)), List.of()
|
||||
|
|
@ -153,7 +154,7 @@ class UnblockStockBatchTest {
|
|||
);
|
||||
var stock = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null,
|
||||
new ArrayList<>(List.of(availableBatch)), List.of()
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package de.effigenix.application.inventory;
|
|||
|
||||
import de.effigenix.application.inventory.command.UpdateStockCommand;
|
||||
import de.effigenix.domain.inventory.*;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
import de.effigenix.shared.common.UnitOfMeasure;
|
||||
|
|
@ -38,7 +39,7 @@ class UpdateStockTest {
|
|||
|
||||
existingStock = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
null, null,
|
||||
List.of(), List.of()
|
||||
|
|
@ -105,7 +106,7 @@ class UpdateStockTest {
|
|||
void shouldNotChangeFieldsWhenNull() {
|
||||
var stockWithParams = Stock.reconstitute(
|
||||
StockId.of("stock-1"),
|
||||
de.effigenix.domain.masterdata.ArticleId.of("article-1"),
|
||||
ArticleId.of("article-1"),
|
||||
StorageLocationId.of("location-1"),
|
||||
MinimumLevel.of("25", "KILOGRAM").unsafeGetValue(),
|
||||
MinimumShelfLife.of(7).unsafeGetValue(),
|
||||
|
|
|
|||
|
|
@ -1,7 +1,15 @@
|
|||
package de.effigenix.application.masterdata;
|
||||
|
||||
import de.effigenix.application.masterdata.command.*;
|
||||
import de.effigenix.application.masterdata.article.*;
|
||||
import de.effigenix.application.masterdata.article.command.*;
|
||||
import de.effigenix.application.masterdata.article.AssignSupplier;
|
||||
import de.effigenix.application.masterdata.supplier.RemoveSupplier;
|
||||
import de.effigenix.application.masterdata.article.command.AssignSupplierCommand;
|
||||
import de.effigenix.application.masterdata.supplier.command.RemoveSupplierCommand;
|
||||
import de.effigenix.domain.masterdata.*;
|
||||
import de.effigenix.domain.masterdata.article.*;
|
||||
import de.effigenix.domain.masterdata.productcategory.ProductCategoryId;
|
||||
import de.effigenix.domain.masterdata.supplier.SupplierId;
|
||||
import de.effigenix.shared.common.Money;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
package de.effigenix.application.masterdata;
|
||||
|
||||
import de.effigenix.application.masterdata.command.*;
|
||||
import de.effigenix.application.masterdata.customer.*;
|
||||
import de.effigenix.application.masterdata.customer.command.*;
|
||||
import de.effigenix.domain.masterdata.*;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.domain.masterdata.customer.*;
|
||||
import de.effigenix.shared.common.*;
|
||||
import de.effigenix.shared.persistence.UnitOfWork;
|
||||
import de.effigenix.shared.security.ActorId;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,14 @@
|
|||
package de.effigenix.application.masterdata;
|
||||
|
||||
import de.effigenix.application.masterdata.command.CreateProductCategoryCommand;
|
||||
import de.effigenix.application.masterdata.command.UpdateProductCategoryCommand;
|
||||
import de.effigenix.domain.masterdata.*;
|
||||
import de.effigenix.application.masterdata.productcategory.command.CreateProductCategoryCommand;
|
||||
import de.effigenix.application.masterdata.productcategory.command.UpdateProductCategoryCommand;
|
||||
import de.effigenix.application.masterdata.productcategory.CreateProductCategory;
|
||||
import de.effigenix.application.masterdata.productcategory.DeleteProductCategory;
|
||||
import de.effigenix.application.masterdata.productcategory.ListProductCategories;
|
||||
import de.effigenix.application.masterdata.productcategory.UpdateProductCategory;
|
||||
import de.effigenix.domain.masterdata.article.Article;
|
||||
import de.effigenix.domain.masterdata.article.ArticleRepository;
|
||||
import de.effigenix.domain.masterdata.productcategory.*;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
import de.effigenix.shared.persistence.UnitOfWork;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
package de.effigenix.application.masterdata;
|
||||
|
||||
import de.effigenix.application.masterdata.command.*;
|
||||
import de.effigenix.domain.masterdata.*;
|
||||
import de.effigenix.application.masterdata.supplier.*;
|
||||
import de.effigenix.application.masterdata.supplier.command.*;
|
||||
import de.effigenix.domain.masterdata.supplier.*;
|
||||
import de.effigenix.shared.common.ContactInfo;
|
||||
import de.effigenix.shared.common.RepositoryError;
|
||||
import de.effigenix.shared.common.Result;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package de.effigenix.domain.inventory;
|
||||
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.UnitOfMeasure;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package de.effigenix.domain.inventory;
|
||||
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.UnitOfMeasure;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package de.effigenix.domain.inventory;
|
||||
|
||||
import de.effigenix.domain.masterdata.ArticleId;
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.shared.common.Quantity;
|
||||
import de.effigenix.shared.common.UnitOfMeasure;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
package de.effigenix.domain.masterdata;
|
||||
|
||||
import de.effigenix.domain.masterdata.article.*;
|
||||
import de.effigenix.domain.masterdata.productcategory.ProductCategoryId;
|
||||
import de.effigenix.domain.masterdata.supplier.SupplierId;
|
||||
import de.effigenix.shared.common.Money;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Nested;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
package de.effigenix.domain.masterdata;
|
||||
|
||||
import de.effigenix.domain.masterdata.article.ArticleId;
|
||||
import de.effigenix.domain.masterdata.customer.*;
|
||||
import de.effigenix.shared.common.Address;
|
||||
import de.effigenix.shared.common.Money;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package de.effigenix.domain.masterdata;
|
||||
|
||||
import de.effigenix.domain.masterdata.productcategory.*;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Nested;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
package de.effigenix.domain.masterdata;
|
||||
|
||||
import de.effigenix.domain.masterdata.supplier.*;
|
||||
import org.junit.jupiter.api.DisplayName;
|
||||
import org.junit.jupiter.api.Nested;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package de.effigenix.infrastructure.masterdata.web;
|
||||
|
||||
import de.effigenix.domain.masterdata.PriceModel;
|
||||
import de.effigenix.domain.masterdata.article.PriceModel;
|
||||
import de.effigenix.domain.masterdata.Unit;
|
||||
import de.effigenix.domain.usermanagement.RoleName;
|
||||
import de.effigenix.infrastructure.AbstractIntegrationTest;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
package de.effigenix.infrastructure.masterdata.web;
|
||||
|
||||
import de.effigenix.domain.masterdata.*;
|
||||
import de.effigenix.domain.masterdata.article.PriceModel;
|
||||
import de.effigenix.domain.masterdata.customer.CustomerPreference;
|
||||
import de.effigenix.domain.masterdata.customer.CustomerType;
|
||||
import de.effigenix.domain.masterdata.customer.DeliveryRhythm;
|
||||
import de.effigenix.domain.usermanagement.RoleName;
|
||||
import de.effigenix.infrastructure.AbstractIntegrationTest;
|
||||
import de.effigenix.infrastructure.masterdata.web.dto.*;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue