diff --git a/backend/src/main/java/de/effigenix/application/inventory/ListStockMovements.java b/backend/src/main/java/de/effigenix/application/inventory/ListStockMovements.java index 5efc8bb..8ac9788 100644 --- a/backend/src/main/java/de/effigenix/application/inventory/ListStockMovements.java +++ b/backend/src/main/java/de/effigenix/application/inventory/ListStockMovements.java @@ -6,7 +6,7 @@ import de.effigenix.domain.inventory.StockId; import de.effigenix.domain.inventory.StockMovement; import de.effigenix.domain.inventory.StockMovementError; import de.effigenix.domain.inventory.StockMovementRepository; -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.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/inventory/ListStocks.java b/backend/src/main/java/de/effigenix/application/inventory/ListStocks.java index 324d8c1..b3787fe 100644 --- a/backend/src/main/java/de/effigenix/application/inventory/ListStocks.java +++ b/backend/src/main/java/de/effigenix/application/inventory/ListStocks.java @@ -4,7 +4,7 @@ import de.effigenix.domain.inventory.Stock; import de.effigenix.domain.inventory.StockError; import de.effigenix.domain.inventory.StockRepository; import de.effigenix.domain.inventory.StorageLocationId; -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; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/ActivateArticle.java b/backend/src/main/java/de/effigenix/application/masterdata/article/ActivateArticle.java similarity index 83% rename from backend/src/main/java/de/effigenix/application/masterdata/ActivateArticle.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/ActivateArticle.java index 43d3eb7..033c060 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/ActivateArticle.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/ActivateArticle.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.article; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.article.Article; +import de.effigenix.domain.masterdata.article.ArticleError; +import de.effigenix.domain.masterdata.article.ArticleId; +import de.effigenix.domain.masterdata.article.ArticleRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/AddSalesUnit.java b/backend/src/main/java/de/effigenix/application/masterdata/article/AddSalesUnit.java similarity index 92% rename from backend/src/main/java/de/effigenix/application/masterdata/AddSalesUnit.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/AddSalesUnit.java index b0184ea..e0fe53a 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/AddSalesUnit.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/AddSalesUnit.java @@ -1,7 +1,7 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.article; -import de.effigenix.application.masterdata.command.AddSalesUnitCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.article.command.AddSalesUnitCommand; +import de.effigenix.domain.masterdata.article.*; import de.effigenix.shared.common.Money; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/AssignSupplier.java b/backend/src/main/java/de/effigenix/application/masterdata/article/AssignSupplier.java similarity index 78% rename from backend/src/main/java/de/effigenix/application/masterdata/AssignSupplier.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/AssignSupplier.java index e85e785..6d5201e 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/AssignSupplier.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/AssignSupplier.java @@ -1,7 +1,11 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.article; -import de.effigenix.application.masterdata.command.AssignSupplierCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.article.command.AssignSupplierCommand; +import de.effigenix.domain.masterdata.article.Article; +import de.effigenix.domain.masterdata.article.ArticleError; +import de.effigenix.domain.masterdata.article.ArticleId; +import de.effigenix.domain.masterdata.article.ArticleRepository; +import de.effigenix.domain.masterdata.supplier.SupplierId; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/CreateArticle.java b/backend/src/main/java/de/effigenix/application/masterdata/article/CreateArticle.java similarity index 82% rename from backend/src/main/java/de/effigenix/application/masterdata/CreateArticle.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/CreateArticle.java index 8fc9f49..8b1d368 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/CreateArticle.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/CreateArticle.java @@ -1,7 +1,10 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.article; -import de.effigenix.application.masterdata.command.CreateArticleCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.article.command.CreateArticleCommand; +import de.effigenix.domain.masterdata.article.Article; +import de.effigenix.domain.masterdata.article.ArticleDraft; +import de.effigenix.domain.masterdata.article.ArticleError; +import de.effigenix.domain.masterdata.article.ArticleRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/DeactivateArticle.java b/backend/src/main/java/de/effigenix/application/masterdata/article/DeactivateArticle.java similarity index 83% rename from backend/src/main/java/de/effigenix/application/masterdata/DeactivateArticle.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/DeactivateArticle.java index 227ff10..5075686 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/DeactivateArticle.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/DeactivateArticle.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.article; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.article.Article; +import de.effigenix.domain.masterdata.article.ArticleError; +import de.effigenix.domain.masterdata.article.ArticleId; +import de.effigenix.domain.masterdata.article.ArticleRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/GetArticle.java b/backend/src/main/java/de/effigenix/application/masterdata/article/GetArticle.java similarity index 72% rename from backend/src/main/java/de/effigenix/application/masterdata/GetArticle.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/GetArticle.java index b350c03..513811d 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/GetArticle.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/GetArticle.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.article; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.article.Article; +import de.effigenix.domain.masterdata.article.ArticleError; +import de.effigenix.domain.masterdata.article.ArticleId; +import de.effigenix.domain.masterdata.article.ArticleRepository; import de.effigenix.shared.common.Result; import static de.effigenix.shared.common.Result.*; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/ListArticles.java b/backend/src/main/java/de/effigenix/application/masterdata/article/ListArticles.java similarity index 79% rename from backend/src/main/java/de/effigenix/application/masterdata/ListArticles.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/ListArticles.java index 29b3aac..26da2a6 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/ListArticles.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/ListArticles.java @@ -1,6 +1,10 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.article; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.article.Article; +import de.effigenix.domain.masterdata.article.ArticleError; +import de.effigenix.domain.masterdata.article.ArticleRepository; +import de.effigenix.domain.masterdata.article.ArticleStatus; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryId; import de.effigenix.shared.common.Result; import java.util.List; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/RemoveSalesUnit.java b/backend/src/main/java/de/effigenix/application/masterdata/article/RemoveSalesUnit.java similarity index 90% rename from backend/src/main/java/de/effigenix/application/masterdata/RemoveSalesUnit.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/RemoveSalesUnit.java index d81d88c..fbc2cae 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/RemoveSalesUnit.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/RemoveSalesUnit.java @@ -1,7 +1,7 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.article; -import de.effigenix.application.masterdata.command.RemoveSalesUnitCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.article.command.RemoveSalesUnitCommand; +import de.effigenix.domain.masterdata.article.*; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/UpdateArticle.java b/backend/src/main/java/de/effigenix/application/masterdata/article/UpdateArticle.java similarity index 90% rename from backend/src/main/java/de/effigenix/application/masterdata/UpdateArticle.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/UpdateArticle.java index 9bf6581..2c12dbf 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/UpdateArticle.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/UpdateArticle.java @@ -1,7 +1,7 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.article; -import de.effigenix.application.masterdata.command.UpdateArticleCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.article.command.UpdateArticleCommand; +import de.effigenix.domain.masterdata.article.*; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/UpdateSalesUnitPrice.java b/backend/src/main/java/de/effigenix/application/masterdata/article/UpdateSalesUnitPrice.java similarity index 91% rename from backend/src/main/java/de/effigenix/application/masterdata/UpdateSalesUnitPrice.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/UpdateSalesUnitPrice.java index 2c31368..2ac441e 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/UpdateSalesUnitPrice.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/UpdateSalesUnitPrice.java @@ -1,7 +1,7 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.article; -import de.effigenix.application.masterdata.command.UpdateSalesUnitPriceCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.article.command.UpdateSalesUnitPriceCommand; +import de.effigenix.domain.masterdata.article.*; import de.effigenix.shared.common.Money; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/AddSalesUnitCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/article/command/AddSalesUnitCommand.java similarity index 64% rename from backend/src/main/java/de/effigenix/application/masterdata/command/AddSalesUnitCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/command/AddSalesUnitCommand.java index cf60d11..5de146a 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/AddSalesUnitCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/command/AddSalesUnitCommand.java @@ -1,6 +1,6 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.article.command; -import de.effigenix.domain.masterdata.PriceModel; +import de.effigenix.domain.masterdata.article.PriceModel; import de.effigenix.domain.masterdata.Unit; import java.math.BigDecimal; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/AssignSupplierCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/article/command/AssignSupplierCommand.java similarity index 60% rename from backend/src/main/java/de/effigenix/application/masterdata/command/AssignSupplierCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/command/AssignSupplierCommand.java index edc4946..52e7c14 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/AssignSupplierCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/command/AssignSupplierCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.article.command; public record AssignSupplierCommand( String articleId, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/CreateArticleCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/article/command/CreateArticleCommand.java similarity index 69% rename from backend/src/main/java/de/effigenix/application/masterdata/command/CreateArticleCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/command/CreateArticleCommand.java index cc33c2e..a903f37 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/CreateArticleCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/command/CreateArticleCommand.java @@ -1,6 +1,6 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.article.command; -import de.effigenix.domain.masterdata.PriceModel; +import de.effigenix.domain.masterdata.article.PriceModel; import de.effigenix.domain.masterdata.Unit; import java.math.BigDecimal; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/RemoveSalesUnitCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/article/command/RemoveSalesUnitCommand.java similarity index 61% rename from backend/src/main/java/de/effigenix/application/masterdata/command/RemoveSalesUnitCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/command/RemoveSalesUnitCommand.java index 858503d..78609b5 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/RemoveSalesUnitCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/command/RemoveSalesUnitCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.article.command; public record RemoveSalesUnitCommand( String articleId, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/UpdateArticleCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/article/command/UpdateArticleCommand.java similarity index 65% rename from backend/src/main/java/de/effigenix/application/masterdata/command/UpdateArticleCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/command/UpdateArticleCommand.java index 4f80dc8..55715d7 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/UpdateArticleCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/command/UpdateArticleCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.article.command; public record UpdateArticleCommand( String articleId, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/UpdateSalesUnitPriceCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/article/command/UpdateSalesUnitPriceCommand.java similarity index 72% rename from backend/src/main/java/de/effigenix/application/masterdata/command/UpdateSalesUnitPriceCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/article/command/UpdateSalesUnitPriceCommand.java index 93f7ebd..5c9b6c0 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/UpdateSalesUnitPriceCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/article/command/UpdateSalesUnitPriceCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.article.command; import java.math.BigDecimal; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/ActivateCustomer.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/ActivateCustomer.java similarity index 83% rename from backend/src/main/java/de/effigenix/application/masterdata/ActivateCustomer.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/ActivateCustomer.java index ed207a7..87178fe 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/ActivateCustomer.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/ActivateCustomer.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.customer.Customer; +import de.effigenix.domain.masterdata.customer.CustomerError; +import de.effigenix.domain.masterdata.customer.CustomerId; +import de.effigenix.domain.masterdata.customer.CustomerRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/AddDeliveryAddress.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/AddDeliveryAddress.java similarity index 92% rename from backend/src/main/java/de/effigenix/application/masterdata/AddDeliveryAddress.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/AddDeliveryAddress.java index 138716b..8977718 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/AddDeliveryAddress.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/AddDeliveryAddress.java @@ -1,7 +1,7 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.application.masterdata.command.AddDeliveryAddressCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.customer.command.AddDeliveryAddressCommand; +import de.effigenix.domain.masterdata.customer.*; import de.effigenix.shared.common.Address; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/CreateCustomer.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/CreateCustomer.java similarity index 83% rename from backend/src/main/java/de/effigenix/application/masterdata/CreateCustomer.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/CreateCustomer.java index 2758772..be32e96 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/CreateCustomer.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/CreateCustomer.java @@ -1,7 +1,10 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.application.masterdata.command.CreateCustomerCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.customer.command.CreateCustomerCommand; +import de.effigenix.domain.masterdata.customer.Customer; +import de.effigenix.domain.masterdata.customer.CustomerDraft; +import de.effigenix.domain.masterdata.customer.CustomerError; +import de.effigenix.domain.masterdata.customer.CustomerRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/DeactivateCustomer.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/DeactivateCustomer.java similarity index 83% rename from backend/src/main/java/de/effigenix/application/masterdata/DeactivateCustomer.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/DeactivateCustomer.java index acd5641..5d53d29 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/DeactivateCustomer.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/DeactivateCustomer.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.customer.Customer; +import de.effigenix.domain.masterdata.customer.CustomerError; +import de.effigenix.domain.masterdata.customer.CustomerId; +import de.effigenix.domain.masterdata.customer.CustomerRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/GetCustomer.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/GetCustomer.java similarity index 72% rename from backend/src/main/java/de/effigenix/application/masterdata/GetCustomer.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/GetCustomer.java index afe2e04..754423a 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/GetCustomer.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/GetCustomer.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.customer.Customer; +import de.effigenix.domain.masterdata.customer.CustomerError; +import de.effigenix.domain.masterdata.customer.CustomerId; +import de.effigenix.domain.masterdata.customer.CustomerRepository; import de.effigenix.shared.common.Result; import static de.effigenix.shared.common.Result.*; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/ListCustomers.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/ListCustomers.java similarity index 93% rename from backend/src/main/java/de/effigenix/application/masterdata/ListCustomers.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/ListCustomers.java index 8ad18b3..082b52d 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/ListCustomers.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/ListCustomers.java @@ -1,6 +1,6 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.customer.*; import de.effigenix.shared.common.Result; import java.util.List; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/RemoveDeliveryAddress.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/RemoveDeliveryAddress.java similarity index 80% rename from backend/src/main/java/de/effigenix/application/masterdata/RemoveDeliveryAddress.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/RemoveDeliveryAddress.java index 3ebe800..ba276c3 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/RemoveDeliveryAddress.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/RemoveDeliveryAddress.java @@ -1,7 +1,10 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.application.masterdata.command.RemoveDeliveryAddressCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.customer.command.RemoveDeliveryAddressCommand; +import de.effigenix.domain.masterdata.customer.Customer; +import de.effigenix.domain.masterdata.customer.CustomerError; +import de.effigenix.domain.masterdata.customer.CustomerId; +import de.effigenix.domain.masterdata.customer.CustomerRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/RemoveFrameContract.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/RemoveFrameContract.java similarity index 83% rename from backend/src/main/java/de/effigenix/application/masterdata/RemoveFrameContract.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/RemoveFrameContract.java index ba1f314..2e1114f 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/RemoveFrameContract.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/RemoveFrameContract.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.customer.Customer; +import de.effigenix.domain.masterdata.customer.CustomerError; +import de.effigenix.domain.masterdata.customer.CustomerId; +import de.effigenix.domain.masterdata.customer.CustomerRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/SetFrameContract.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/SetFrameContract.java similarity index 91% rename from backend/src/main/java/de/effigenix/application/masterdata/SetFrameContract.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/SetFrameContract.java index f4021f0..1a3c3ae 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/SetFrameContract.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/SetFrameContract.java @@ -1,7 +1,8 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.application.masterdata.command.SetFrameContractCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.customer.command.SetFrameContractCommand; +import de.effigenix.domain.masterdata.article.ArticleId; +import de.effigenix.domain.masterdata.customer.*; import de.effigenix.shared.common.Money; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/SetPreferences.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/SetPreferences.java similarity index 80% rename from backend/src/main/java/de/effigenix/application/masterdata/SetPreferences.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/SetPreferences.java index 126895c..29d23cb 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/SetPreferences.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/SetPreferences.java @@ -1,7 +1,10 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.application.masterdata.command.SetPreferencesCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.customer.command.SetPreferencesCommand; +import de.effigenix.domain.masterdata.customer.Customer; +import de.effigenix.domain.masterdata.customer.CustomerError; +import de.effigenix.domain.masterdata.customer.CustomerId; +import de.effigenix.domain.masterdata.customer.CustomerRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/UpdateCustomer.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/UpdateCustomer.java similarity index 91% rename from backend/src/main/java/de/effigenix/application/masterdata/UpdateCustomer.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/UpdateCustomer.java index 61edca0..f33addc 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/UpdateCustomer.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/UpdateCustomer.java @@ -1,7 +1,7 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.customer; -import de.effigenix.application.masterdata.command.UpdateCustomerCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.customer.command.UpdateCustomerCommand; +import de.effigenix.domain.masterdata.customer.*; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/AddDeliveryAddressCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/AddDeliveryAddressCommand.java similarity index 81% rename from backend/src/main/java/de/effigenix/application/masterdata/command/AddDeliveryAddressCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/command/AddDeliveryAddressCommand.java index 5073c55..fcdb168 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/AddDeliveryAddressCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/AddDeliveryAddressCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.customer.command; public record AddDeliveryAddressCommand( String customerId, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/CreateCustomerCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/CreateCustomerCommand.java similarity index 74% rename from backend/src/main/java/de/effigenix/application/masterdata/command/CreateCustomerCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/command/CreateCustomerCommand.java index 069a02a..b8e4a3e 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/CreateCustomerCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/CreateCustomerCommand.java @@ -1,6 +1,6 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.customer.command; -import de.effigenix.domain.masterdata.CustomerType; +import de.effigenix.domain.masterdata.customer.CustomerType; public record CreateCustomerCommand( String name, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/RemoveDeliveryAddressCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/RemoveDeliveryAddressCommand.java similarity index 61% rename from backend/src/main/java/de/effigenix/application/masterdata/command/RemoveDeliveryAddressCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/command/RemoveDeliveryAddressCommand.java index bad8af6..8ad5a15 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/RemoveDeliveryAddressCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/RemoveDeliveryAddressCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.customer.command; public record RemoveDeliveryAddressCommand( String customerId, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/SetFrameContractCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/SetFrameContractCommand.java similarity index 79% rename from backend/src/main/java/de/effigenix/application/masterdata/command/SetFrameContractCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/command/SetFrameContractCommand.java index d8c0ccd..8999314 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/SetFrameContractCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/SetFrameContractCommand.java @@ -1,6 +1,6 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.customer.command; -import de.effigenix.domain.masterdata.DeliveryRhythm; +import de.effigenix.domain.masterdata.customer.DeliveryRhythm; import de.effigenix.domain.masterdata.Unit; import java.math.BigDecimal; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/SetPreferencesCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/SetPreferencesCommand.java similarity index 51% rename from backend/src/main/java/de/effigenix/application/masterdata/command/SetPreferencesCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/command/SetPreferencesCommand.java index 004c0a6..ef08c14 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/SetPreferencesCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/SetPreferencesCommand.java @@ -1,6 +1,6 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.customer.command; -import de.effigenix.domain.masterdata.CustomerPreference; +import de.effigenix.domain.masterdata.customer.CustomerPreference; import java.util.Set; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/UpdateCustomerCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/UpdateCustomerCommand.java similarity index 85% rename from backend/src/main/java/de/effigenix/application/masterdata/command/UpdateCustomerCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/customer/command/UpdateCustomerCommand.java index 0266855..5618fe5 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/UpdateCustomerCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/customer/command/UpdateCustomerCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.customer.command; public record UpdateCustomerCommand( String customerId, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/CreateProductCategory.java b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/CreateProductCategory.java similarity index 79% rename from backend/src/main/java/de/effigenix/application/masterdata/CreateProductCategory.java rename to backend/src/main/java/de/effigenix/application/masterdata/productcategory/CreateProductCategory.java index 3736448..c2cad25 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/CreateProductCategory.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/CreateProductCategory.java @@ -1,7 +1,10 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.productcategory; -import de.effigenix.application.masterdata.command.CreateProductCategoryCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.productcategory.command.CreateProductCategoryCommand; +import de.effigenix.domain.masterdata.productcategory.ProductCategory; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryDraft; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryError; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/DeleteProductCategory.java b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/DeleteProductCategory.java similarity index 83% rename from backend/src/main/java/de/effigenix/application/masterdata/DeleteProductCategory.java rename to backend/src/main/java/de/effigenix/application/masterdata/productcategory/DeleteProductCategory.java index 8a4afc6..a803512 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/DeleteProductCategory.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/DeleteProductCategory.java @@ -1,6 +1,10 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.productcategory; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.article.ArticleRepository; +import de.effigenix.domain.masterdata.productcategory.ProductCategory; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryError; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryId; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/ListProductCategories.java b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/ListProductCategories.java similarity index 71% rename from backend/src/main/java/de/effigenix/application/masterdata/ListProductCategories.java rename to backend/src/main/java/de/effigenix/application/masterdata/productcategory/ListProductCategories.java index f717935..3b20a25 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/ListProductCategories.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/ListProductCategories.java @@ -1,6 +1,8 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.productcategory; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.productcategory.ProductCategory; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryError; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryRepository; import de.effigenix.shared.common.Result; import java.util.List; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/UpdateProductCategory.java b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/UpdateProductCategory.java similarity index 89% rename from backend/src/main/java/de/effigenix/application/masterdata/UpdateProductCategory.java rename to backend/src/main/java/de/effigenix/application/masterdata/productcategory/UpdateProductCategory.java index 5b0ea39..5589830 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/UpdateProductCategory.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/UpdateProductCategory.java @@ -1,7 +1,7 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.productcategory; -import de.effigenix.application.masterdata.command.UpdateProductCategoryCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.productcategory.command.UpdateProductCategoryCommand; +import de.effigenix.domain.masterdata.productcategory.*; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/CreateProductCategoryCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/command/CreateProductCategoryCommand.java similarity index 58% rename from backend/src/main/java/de/effigenix/application/masterdata/command/CreateProductCategoryCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/productcategory/command/CreateProductCategoryCommand.java index 2541f89..92e5f21 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/CreateProductCategoryCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/command/CreateProductCategoryCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.productcategory.command; public record CreateProductCategoryCommand( String name, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/UpdateProductCategoryCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/command/UpdateProductCategoryCommand.java similarity index 64% rename from backend/src/main/java/de/effigenix/application/masterdata/command/UpdateProductCategoryCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/productcategory/command/UpdateProductCategoryCommand.java index 3914a00..243b510 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/UpdateProductCategoryCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/productcategory/command/UpdateProductCategoryCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.productcategory.command; public record UpdateProductCategoryCommand( String categoryId, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/ActivateSupplier.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/ActivateSupplier.java similarity index 83% rename from backend/src/main/java/de/effigenix/application/masterdata/ActivateSupplier.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/ActivateSupplier.java index 7bc92ff..07958fb 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/ActivateSupplier.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/ActivateSupplier.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.supplier; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.supplier.Supplier; +import de.effigenix.domain.masterdata.supplier.SupplierError; +import de.effigenix.domain.masterdata.supplier.SupplierId; +import de.effigenix.domain.masterdata.supplier.SupplierRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/AddCertificate.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/AddCertificate.java similarity index 90% rename from backend/src/main/java/de/effigenix/application/masterdata/AddCertificate.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/AddCertificate.java index 3d56898..6890694 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/AddCertificate.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/AddCertificate.java @@ -1,7 +1,7 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.supplier; -import de.effigenix.application.masterdata.command.AddCertificateCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.supplier.command.AddCertificateCommand; +import de.effigenix.domain.masterdata.supplier.*; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/CreateSupplier.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/CreateSupplier.java similarity index 84% rename from backend/src/main/java/de/effigenix/application/masterdata/CreateSupplier.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/CreateSupplier.java index 5b80f01..93083e2 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/CreateSupplier.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/CreateSupplier.java @@ -1,7 +1,10 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.supplier; -import de.effigenix.application.masterdata.command.CreateSupplierCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.supplier.command.CreateSupplierCommand; +import de.effigenix.domain.masterdata.supplier.Supplier; +import de.effigenix.domain.masterdata.supplier.SupplierDraft; +import de.effigenix.domain.masterdata.supplier.SupplierError; +import de.effigenix.domain.masterdata.supplier.SupplierRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/DeactivateSupplier.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/DeactivateSupplier.java similarity index 83% rename from backend/src/main/java/de/effigenix/application/masterdata/DeactivateSupplier.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/DeactivateSupplier.java index e2939d1..9e1d400 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/DeactivateSupplier.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/DeactivateSupplier.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.supplier; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.supplier.Supplier; +import de.effigenix.domain.masterdata.supplier.SupplierError; +import de.effigenix.domain.masterdata.supplier.SupplierId; +import de.effigenix.domain.masterdata.supplier.SupplierRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/GetSupplier.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/GetSupplier.java similarity index 72% rename from backend/src/main/java/de/effigenix/application/masterdata/GetSupplier.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/GetSupplier.java index 97162f6..fe8e741 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/GetSupplier.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/GetSupplier.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.supplier; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.supplier.Supplier; +import de.effigenix.domain.masterdata.supplier.SupplierError; +import de.effigenix.domain.masterdata.supplier.SupplierId; +import de.effigenix.domain.masterdata.supplier.SupplierRepository; import de.effigenix.shared.common.Result; import static de.effigenix.shared.common.Result.*; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/ListSuppliers.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/ListSuppliers.java similarity index 77% rename from backend/src/main/java/de/effigenix/application/masterdata/ListSuppliers.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/ListSuppliers.java index 23db283..bd39bc1 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/ListSuppliers.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/ListSuppliers.java @@ -1,6 +1,9 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.supplier; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.supplier.Supplier; +import de.effigenix.domain.masterdata.supplier.SupplierError; +import de.effigenix.domain.masterdata.supplier.SupplierRepository; +import de.effigenix.domain.masterdata.supplier.SupplierStatus; import de.effigenix.shared.common.Result; import java.util.List; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/RateSupplier.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/RateSupplier.java similarity index 90% rename from backend/src/main/java/de/effigenix/application/masterdata/RateSupplier.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/RateSupplier.java index ede2742..35d5722 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/RateSupplier.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/RateSupplier.java @@ -1,7 +1,7 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.supplier; -import de.effigenix.application.masterdata.command.RateSupplierCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.supplier.command.RateSupplierCommand; +import de.effigenix.domain.masterdata.supplier.*; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/RemoveCertificate.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/RemoveCertificate.java similarity index 84% rename from backend/src/main/java/de/effigenix/application/masterdata/RemoveCertificate.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/RemoveCertificate.java index e5d30fe..4d0a2c0 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/RemoveCertificate.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/RemoveCertificate.java @@ -1,7 +1,10 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.supplier; -import de.effigenix.application.masterdata.command.RemoveCertificateCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.supplier.command.RemoveCertificateCommand; +import de.effigenix.domain.masterdata.supplier.Supplier; +import de.effigenix.domain.masterdata.supplier.SupplierError; +import de.effigenix.domain.masterdata.supplier.SupplierId; +import de.effigenix.domain.masterdata.supplier.SupplierRepository; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/RemoveSupplier.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/RemoveSupplier.java similarity index 78% rename from backend/src/main/java/de/effigenix/application/masterdata/RemoveSupplier.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/RemoveSupplier.java index ce9ab20..d980b8c 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/RemoveSupplier.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/RemoveSupplier.java @@ -1,7 +1,11 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.supplier; -import de.effigenix.application.masterdata.command.RemoveSupplierCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.supplier.command.RemoveSupplierCommand; +import de.effigenix.domain.masterdata.article.Article; +import de.effigenix.domain.masterdata.article.ArticleError; +import de.effigenix.domain.masterdata.article.ArticleId; +import de.effigenix.domain.masterdata.article.ArticleRepository; +import de.effigenix.domain.masterdata.supplier.SupplierId; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/UpdateSupplier.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/UpdateSupplier.java similarity index 91% rename from backend/src/main/java/de/effigenix/application/masterdata/UpdateSupplier.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/UpdateSupplier.java index 6c24d54..c33bfa3 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/UpdateSupplier.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/UpdateSupplier.java @@ -1,7 +1,7 @@ -package de.effigenix.application.masterdata; +package de.effigenix.application.masterdata.supplier; -import de.effigenix.application.masterdata.command.UpdateSupplierCommand; -import de.effigenix.domain.masterdata.*; +import de.effigenix.application.masterdata.supplier.command.UpdateSupplierCommand; +import de.effigenix.domain.masterdata.supplier.*; import de.effigenix.shared.common.Result; import de.effigenix.shared.persistence.UnitOfWork; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/AddCertificateCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/AddCertificateCommand.java similarity index 77% rename from backend/src/main/java/de/effigenix/application/masterdata/command/AddCertificateCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/command/AddCertificateCommand.java index c360f5e..8edd528 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/AddCertificateCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/AddCertificateCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.supplier.command; import java.time.LocalDate; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/CreateSupplierCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/CreateSupplierCommand.java similarity index 89% rename from backend/src/main/java/de/effigenix/application/masterdata/command/CreateSupplierCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/command/CreateSupplierCommand.java index 90f85a6..253a272 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/CreateSupplierCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/CreateSupplierCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.supplier.command; public record CreateSupplierCommand( String name, // required diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/RateSupplierCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/RateSupplierCommand.java similarity index 69% rename from backend/src/main/java/de/effigenix/application/masterdata/command/RateSupplierCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/command/RateSupplierCommand.java index 3e574a4..e53b676 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/RateSupplierCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/RateSupplierCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.supplier.command; public record RateSupplierCommand( String supplierId, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/RemoveCertificateCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/RemoveCertificateCommand.java similarity index 74% rename from backend/src/main/java/de/effigenix/application/masterdata/command/RemoveCertificateCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/command/RemoveCertificateCommand.java index d51c4de..bbec75f 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/RemoveCertificateCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/RemoveCertificateCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.supplier.command; import java.time.LocalDate; diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/RemoveSupplierCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/RemoveSupplierCommand.java similarity index 60% rename from backend/src/main/java/de/effigenix/application/masterdata/command/RemoveSupplierCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/command/RemoveSupplierCommand.java index 0bb5da6..1c053ed 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/RemoveSupplierCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/RemoveSupplierCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.supplier.command; public record RemoveSupplierCommand( String articleId, diff --git a/backend/src/main/java/de/effigenix/application/masterdata/command/UpdateSupplierCommand.java b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/UpdateSupplierCommand.java similarity index 92% rename from backend/src/main/java/de/effigenix/application/masterdata/command/UpdateSupplierCommand.java rename to backend/src/main/java/de/effigenix/application/masterdata/supplier/command/UpdateSupplierCommand.java index 5694d78..cb0c0d4 100644 --- a/backend/src/main/java/de/effigenix/application/masterdata/command/UpdateSupplierCommand.java +++ b/backend/src/main/java/de/effigenix/application/masterdata/supplier/command/UpdateSupplierCommand.java @@ -1,4 +1,4 @@ -package de.effigenix.application.masterdata.command; +package de.effigenix.application.masterdata.supplier.command; public record UpdateSupplierCommand( String supplierId, diff --git a/backend/src/main/java/de/effigenix/domain/inventory/CountItem.java b/backend/src/main/java/de/effigenix/domain/inventory/CountItem.java index 5080013..286885c 100644 --- a/backend/src/main/java/de/effigenix/domain/inventory/CountItem.java +++ b/backend/src/main/java/de/effigenix/domain/inventory/CountItem.java @@ -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.Result; import de.effigenix.shared.common.UnitOfMeasure; diff --git a/backend/src/main/java/de/effigenix/domain/inventory/InventoryCount.java b/backend/src/main/java/de/effigenix/domain/inventory/InventoryCount.java index 47f3fb5..05a4d5e 100644 --- a/backend/src/main/java/de/effigenix/domain/inventory/InventoryCount.java +++ b/backend/src/main/java/de/effigenix/domain/inventory/InventoryCount.java @@ -1,5 +1,6 @@ package de.effigenix.domain.inventory; +import de.effigenix.domain.masterdata.article.ArticleId; import de.effigenix.shared.common.Result; import java.time.Instant; @@ -144,7 +145,7 @@ public class InventoryCount { // ==================== Helpers ==================== - private boolean hasArticle(de.effigenix.domain.masterdata.ArticleId articleId) { + private boolean hasArticle(ArticleId articleId) { return countItems.stream().anyMatch(item -> item.articleId().equals(articleId)); } diff --git a/backend/src/main/java/de/effigenix/domain/inventory/Stock.java b/backend/src/main/java/de/effigenix/domain/inventory/Stock.java index b1bc94c..e92ec06 100644 --- a/backend/src/main/java/de/effigenix/domain/inventory/Stock.java +++ b/backend/src/main/java/de/effigenix/domain/inventory/Stock.java @@ -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.Result; import de.effigenix.shared.common.UnitOfMeasure; diff --git a/backend/src/main/java/de/effigenix/domain/inventory/StockMovement.java b/backend/src/main/java/de/effigenix/domain/inventory/StockMovement.java index 38d70ff..7c8cffd 100644 --- a/backend/src/main/java/de/effigenix/domain/inventory/StockMovement.java +++ b/backend/src/main/java/de/effigenix/domain/inventory/StockMovement.java @@ -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.Result; import de.effigenix.shared.common.UnitOfMeasure; diff --git a/backend/src/main/java/de/effigenix/domain/inventory/StockMovementRepository.java b/backend/src/main/java/de/effigenix/domain/inventory/StockMovementRepository.java index df67b70..1188064 100644 --- a/backend/src/main/java/de/effigenix/domain/inventory/StockMovementRepository.java +++ b/backend/src/main/java/de/effigenix/domain/inventory/StockMovementRepository.java @@ -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.RepositoryError; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/inventory/StockRepository.java b/backend/src/main/java/de/effigenix/domain/inventory/StockRepository.java index c5a8318..e225962 100644 --- a/backend/src/main/java/de/effigenix/domain/inventory/StockRepository.java +++ b/backend/src/main/java/de/effigenix/domain/inventory/StockRepository.java @@ -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.RepositoryError; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerType.java b/backend/src/main/java/de/effigenix/domain/masterdata/CustomerType.java deleted file mode 100644 index 3d44b49..0000000 --- a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerType.java +++ /dev/null @@ -1,6 +0,0 @@ -package de.effigenix.domain.masterdata; - -public enum CustomerType { - B2C, - B2B -} diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/Article.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/Article.java similarity index 97% rename from backend/src/main/java/de/effigenix/domain/masterdata/Article.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/Article.java index 1995018..94996dc 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/Article.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/Article.java @@ -1,5 +1,8 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryId; +import de.effigenix.domain.masterdata.supplier.SupplierId; +import de.effigenix.domain.masterdata.Unit; import de.effigenix.shared.common.Money; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleDraft.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleDraft.java similarity index 88% rename from backend/src/main/java/de/effigenix/domain/masterdata/ArticleDraft.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleDraft.java index 09151ac..ec2aca1 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleDraft.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleDraft.java @@ -1,4 +1,6 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; + +import de.effigenix.domain.masterdata.Unit; import java.math.BigDecimal; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleError.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleError.java similarity index 96% rename from backend/src/main/java/de/effigenix/domain/masterdata/ArticleError.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleError.java index 1eabe7d..828c168 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleError.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleError.java @@ -1,4 +1,6 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; + +import de.effigenix.domain.masterdata.Unit; public sealed interface ArticleError { diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleId.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleId.java similarity index 90% rename from backend/src/main/java/de/effigenix/domain/masterdata/ArticleId.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleId.java index 17d155b..3e5f9ea 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleId.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleId.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; import java.util.UUID; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleName.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleName.java similarity index 93% rename from backend/src/main/java/de/effigenix/domain/masterdata/ArticleName.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleName.java index 316ee2b..aa51cea 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleName.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleName.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleNumber.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleNumber.java similarity index 93% rename from backend/src/main/java/de/effigenix/domain/masterdata/ArticleNumber.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleNumber.java index 9b9d7ad..564babd 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleNumber.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleNumber.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleRepository.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleRepository.java similarity index 85% rename from backend/src/main/java/de/effigenix/domain/masterdata/ArticleRepository.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleRepository.java index 20c58f2..c843669 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleRepository.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleRepository.java @@ -1,5 +1,6 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryId; import de.effigenix.shared.common.RepositoryError; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleStatus.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleStatus.java similarity index 53% rename from backend/src/main/java/de/effigenix/domain/masterdata/ArticleStatus.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleStatus.java index 4361fe5..0bdca08 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleStatus.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleStatus.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; public enum ArticleStatus { ACTIVE, diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleUpdateDraft.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleUpdateDraft.java similarity index 88% rename from backend/src/main/java/de/effigenix/domain/masterdata/ArticleUpdateDraft.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleUpdateDraft.java index dbaf1b5..2df84a2 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ArticleUpdateDraft.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/ArticleUpdateDraft.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; /** * Rohe Eingabe für partielle Article-Updates. diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/PriceModel.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/PriceModel.java similarity index 53% rename from backend/src/main/java/de/effigenix/domain/masterdata/PriceModel.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/PriceModel.java index ea776d7..2a464f0 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/PriceModel.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/PriceModel.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; public enum PriceModel { FIXED, diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/SalesUnit.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/SalesUnit.java similarity index 96% rename from backend/src/main/java/de/effigenix/domain/masterdata/SalesUnit.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/SalesUnit.java index 374977f..b76bdbe 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/SalesUnit.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/SalesUnit.java @@ -1,5 +1,6 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; +import de.effigenix.domain.masterdata.Unit; import de.effigenix.shared.common.Money; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/SalesUnitId.java b/backend/src/main/java/de/effigenix/domain/masterdata/article/SalesUnitId.java similarity index 90% rename from backend/src/main/java/de/effigenix/domain/masterdata/SalesUnitId.java rename to backend/src/main/java/de/effigenix/domain/masterdata/article/SalesUnitId.java index c165340..ac313b9 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/SalesUnitId.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/article/SalesUnitId.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.article; import java.util.UUID; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ContractLineItem.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/ContractLineItem.java similarity index 88% rename from backend/src/main/java/de/effigenix/domain/masterdata/ContractLineItem.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/ContractLineItem.java index f82f5fb..f2704a6 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ContractLineItem.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/ContractLineItem.java @@ -1,5 +1,7 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; +import de.effigenix.domain.masterdata.Unit; +import de.effigenix.domain.masterdata.article.ArticleId; import de.effigenix.shared.common.Money; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/Customer.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/Customer.java similarity index 98% rename from backend/src/main/java/de/effigenix/domain/masterdata/Customer.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/Customer.java index a17ced9..46c24aa 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/Customer.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/Customer.java @@ -1,5 +1,6 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; +import de.effigenix.domain.masterdata.article.ArticleId; import de.effigenix.shared.common.Address; import de.effigenix.shared.common.ContactInfo; import de.effigenix.shared.common.Money; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerDraft.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerDraft.java similarity index 95% rename from backend/src/main/java/de/effigenix/domain/masterdata/CustomerDraft.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerDraft.java index 192c8b7..645be2c 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerDraft.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerDraft.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; /** * Rohe Eingabe zum Erzeugen eines Customer. diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerError.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerError.java similarity index 94% rename from backend/src/main/java/de/effigenix/domain/masterdata/CustomerError.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerError.java index e957c0a..f390566 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerError.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerError.java @@ -1,4 +1,6 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; + +import de.effigenix.domain.masterdata.article.ArticleId; public sealed interface CustomerError { diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerId.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerId.java similarity index 89% rename from backend/src/main/java/de/effigenix/domain/masterdata/CustomerId.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerId.java index 3d15aa1..c08a391 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerId.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerId.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; import java.util.UUID; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerName.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerName.java similarity index 93% rename from backend/src/main/java/de/effigenix/domain/masterdata/CustomerName.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerName.java index 61de244..bb585e1 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerName.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerName.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerPreference.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerPreference.java similarity index 72% rename from backend/src/main/java/de/effigenix/domain/masterdata/CustomerPreference.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerPreference.java index 61cba9b..8259e49 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerPreference.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerPreference.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; public enum CustomerPreference { BIO, diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerRepository.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerRepository.java similarity index 93% rename from backend/src/main/java/de/effigenix/domain/masterdata/CustomerRepository.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerRepository.java index 9f1f6bf..d8afb3f 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerRepository.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerRepository.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; import de.effigenix.shared.common.RepositoryError; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerStatus.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerStatus.java similarity index 53% rename from backend/src/main/java/de/effigenix/domain/masterdata/CustomerStatus.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerStatus.java index f0197f8..e922391 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerStatus.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerStatus.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; public enum CustomerStatus { ACTIVE, diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerType.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerType.java new file mode 100644 index 0000000..e222860 --- /dev/null +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerType.java @@ -0,0 +1,6 @@ +package de.effigenix.domain.masterdata.customer; + +public enum CustomerType { + B2C, + B2B +} diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerUpdateDraft.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerUpdateDraft.java similarity index 96% rename from backend/src/main/java/de/effigenix/domain/masterdata/CustomerUpdateDraft.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerUpdateDraft.java index 1e9a638..eec24f8 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/CustomerUpdateDraft.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/CustomerUpdateDraft.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; /** * Rohe Eingabe für partielle Customer-Updates. diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/DeliveryAddress.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/DeliveryAddress.java similarity index 94% rename from backend/src/main/java/de/effigenix/domain/masterdata/DeliveryAddress.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/DeliveryAddress.java index e508c5a..b0e1fc0 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/DeliveryAddress.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/DeliveryAddress.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; import de.effigenix.shared.common.Address; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/DeliveryRhythm.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/DeliveryRhythm.java similarity index 66% rename from backend/src/main/java/de/effigenix/domain/masterdata/DeliveryRhythm.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/DeliveryRhythm.java index b1fe296..ddae887 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/DeliveryRhythm.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/DeliveryRhythm.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; public enum DeliveryRhythm { DAILY, diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/FrameContract.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/FrameContract.java similarity index 97% rename from backend/src/main/java/de/effigenix/domain/masterdata/FrameContract.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/FrameContract.java index c73dd3e..2a39744 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/FrameContract.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/FrameContract.java @@ -1,5 +1,6 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; +import de.effigenix.domain.masterdata.article.ArticleId; import de.effigenix.shared.common.Money; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/FrameContractId.java b/backend/src/main/java/de/effigenix/domain/masterdata/customer/FrameContractId.java similarity index 90% rename from backend/src/main/java/de/effigenix/domain/masterdata/FrameContractId.java rename to backend/src/main/java/de/effigenix/domain/masterdata/customer/FrameContractId.java index dfafd9d..7970222 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/FrameContractId.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/customer/FrameContractId.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.customer; import java.util.UUID; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/CategoryName.java b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/CategoryName.java similarity index 92% rename from backend/src/main/java/de/effigenix/domain/masterdata/CategoryName.java rename to backend/src/main/java/de/effigenix/domain/masterdata/productcategory/CategoryName.java index 1b67170..3ecd61f 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/CategoryName.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/CategoryName.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.productcategory; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategory.java b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategory.java similarity index 97% rename from backend/src/main/java/de/effigenix/domain/masterdata/ProductCategory.java rename to backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategory.java index b8ebba5..4d1a88a 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategory.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategory.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.productcategory; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryDraft.java b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryDraft.java similarity index 87% rename from backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryDraft.java rename to backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryDraft.java index 3ecd401..5ab22f7 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryDraft.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryDraft.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.productcategory; /** * Rohe Eingabe zum Erzeugen einer ProductCategory. diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryError.java b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryError.java similarity index 96% rename from backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryError.java rename to backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryError.java index 8251668..19f2967 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryError.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryError.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.productcategory; public sealed interface ProductCategoryError { diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryId.java b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryId.java similarity index 89% rename from backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryId.java rename to backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryId.java index 22c121c..db87038 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryId.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryId.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.productcategory; import java.util.UUID; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryRepository.java b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryRepository.java similarity index 90% rename from backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryRepository.java rename to backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryRepository.java index 830d7e2..3703232 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryRepository.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryRepository.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.productcategory; import de.effigenix.shared.common.RepositoryError; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryUpdateDraft.java b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryUpdateDraft.java similarity index 87% rename from backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryUpdateDraft.java rename to backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryUpdateDraft.java index 1b3e506..841faaf 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/ProductCategoryUpdateDraft.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/productcategory/ProductCategoryUpdateDraft.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.productcategory; /** * Rohe Eingabe für partielle ProductCategory-Updates. diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/QualityCertificate.java b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/QualityCertificate.java similarity index 96% rename from backend/src/main/java/de/effigenix/domain/masterdata/QualityCertificate.java rename to backend/src/main/java/de/effigenix/domain/masterdata/supplier/QualityCertificate.java index 84b0c00..c220f47 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/QualityCertificate.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/QualityCertificate.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.supplier; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/Supplier.java b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/Supplier.java similarity index 99% rename from backend/src/main/java/de/effigenix/domain/masterdata/Supplier.java rename to backend/src/main/java/de/effigenix/domain/masterdata/supplier/Supplier.java index dbcc856..a31d3c1 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/Supplier.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/Supplier.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.supplier; import de.effigenix.shared.common.Result; import de.effigenix.shared.common.Address; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierDraft.java b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierDraft.java similarity index 95% rename from backend/src/main/java/de/effigenix/domain/masterdata/SupplierDraft.java rename to backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierDraft.java index 73dc854..7b2cb25 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierDraft.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierDraft.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.supplier; /** * Rohe Eingabe zum Erzeugen eines Supplier. diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierError.java b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierError.java similarity index 96% rename from backend/src/main/java/de/effigenix/domain/masterdata/SupplierError.java rename to backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierError.java index e47da61..4b1ff33 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierError.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierError.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.supplier; public sealed interface SupplierError { diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierId.java b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierId.java similarity index 89% rename from backend/src/main/java/de/effigenix/domain/masterdata/SupplierId.java rename to backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierId.java index 23dddf2..31d36b5 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierId.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierId.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.supplier; import java.util.UUID; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierName.java b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierName.java similarity index 93% rename from backend/src/main/java/de/effigenix/domain/masterdata/SupplierName.java rename to backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierName.java index 444e20a..f0bc402 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierName.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierName.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.supplier; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierRating.java b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierRating.java similarity index 95% rename from backend/src/main/java/de/effigenix/domain/masterdata/SupplierRating.java rename to backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierRating.java index 78f6556..11be630 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierRating.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierRating.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.supplier; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierRepository.java b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierRepository.java similarity index 92% rename from backend/src/main/java/de/effigenix/domain/masterdata/SupplierRepository.java rename to backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierRepository.java index 8c6f658..bc59204 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierRepository.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierRepository.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.supplier; import de.effigenix.shared.common.RepositoryError; import de.effigenix.shared.common.Result; diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierStatus.java b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierStatus.java similarity index 53% rename from backend/src/main/java/de/effigenix/domain/masterdata/SupplierStatus.java rename to backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierStatus.java index fe67c22..41adc93 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierStatus.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierStatus.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.supplier; public enum SupplierStatus { ACTIVE, diff --git a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierUpdateDraft.java b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierUpdateDraft.java similarity index 95% rename from backend/src/main/java/de/effigenix/domain/masterdata/SupplierUpdateDraft.java rename to backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierUpdateDraft.java index 9f775e2..db926ee 100644 --- a/backend/src/main/java/de/effigenix/domain/masterdata/SupplierUpdateDraft.java +++ b/backend/src/main/java/de/effigenix/domain/masterdata/supplier/SupplierUpdateDraft.java @@ -1,4 +1,4 @@ -package de.effigenix.domain.masterdata; +package de.effigenix.domain.masterdata.supplier; /** * Rohe Eingabe für partielle Supplier-Updates. diff --git a/backend/src/main/java/de/effigenix/domain/production/Consumption.java b/backend/src/main/java/de/effigenix/domain/production/Consumption.java index 3144bb6..bc51565 100644 --- a/backend/src/main/java/de/effigenix/domain/production/Consumption.java +++ b/backend/src/main/java/de/effigenix/domain/production/Consumption.java @@ -1,6 +1,6 @@ package de.effigenix.domain.production; -import de.effigenix.domain.masterdata.ArticleId; +import de.effigenix.domain.masterdata.article.ArticleId; import de.effigenix.shared.common.Quantity; import de.effigenix.shared.common.Result; import de.effigenix.shared.common.UnitOfMeasure; diff --git a/backend/src/main/java/de/effigenix/infrastructure/config/MasterDataUseCaseConfiguration.java b/backend/src/main/java/de/effigenix/infrastructure/config/MasterDataUseCaseConfiguration.java index 5f4d425..68de093 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/config/MasterDataUseCaseConfiguration.java +++ b/backend/src/main/java/de/effigenix/infrastructure/config/MasterDataUseCaseConfiguration.java @@ -1,10 +1,16 @@ package de.effigenix.infrastructure.config; -import de.effigenix.application.masterdata.*; -import de.effigenix.domain.masterdata.ArticleRepository; -import de.effigenix.domain.masterdata.CustomerRepository; -import de.effigenix.domain.masterdata.ProductCategoryRepository; -import de.effigenix.domain.masterdata.SupplierRepository; +import de.effigenix.application.masterdata.article.*; +import de.effigenix.application.masterdata.customer.*; +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.application.masterdata.supplier.*; +import de.effigenix.domain.masterdata.article.ArticleRepository; +import de.effigenix.domain.masterdata.customer.CustomerRepository; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryRepository; +import de.effigenix.domain.masterdata.supplier.SupplierRepository; import de.effigenix.shared.persistence.UnitOfWork; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcInventoryCountRepository.java b/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcInventoryCountRepository.java index c941c70..123dc71 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcInventoryCountRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcInventoryCountRepository.java @@ -1,7 +1,7 @@ package de.effigenix.infrastructure.inventory.persistence.repository; 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; diff --git a/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcStockMovementRepository.java b/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcStockMovementRepository.java index 5a40c04..dbb46ee 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcStockMovementRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcStockMovementRepository.java @@ -1,7 +1,7 @@ package de.effigenix.infrastructure.inventory.persistence.repository; 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; diff --git a/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcStockRepository.java b/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcStockRepository.java index ab3af78..13f8cf0 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcStockRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/inventory/persistence/repository/JdbcStockRepository.java @@ -1,7 +1,7 @@ package de.effigenix.infrastructure.inventory.persistence.repository; 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; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcArticleRepository.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcArticleRepository.java index 362904b..3dd23fe 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcArticleRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcArticleRepository.java @@ -1,6 +1,9 @@ package de.effigenix.infrastructure.masterdata.persistence; 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; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcCustomerRepository.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcCustomerRepository.java index 2ad63ce..4655ffe 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcCustomerRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcCustomerRepository.java @@ -1,6 +1,8 @@ package de.effigenix.infrastructure.masterdata.persistence; import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.article.ArticleId; +import de.effigenix.domain.masterdata.customer.*; import de.effigenix.shared.common.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcProductCategoryRepository.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcProductCategoryRepository.java index 860b97e..0d6ea42 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcProductCategoryRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcProductCategoryRepository.java @@ -1,6 +1,9 @@ package de.effigenix.infrastructure.masterdata.persistence; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.productcategory.CategoryName; +import de.effigenix.domain.masterdata.productcategory.ProductCategory; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryId; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryRepository; import de.effigenix.shared.common.RepositoryError; import de.effigenix.shared.common.Result; import org.slf4j.Logger; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcSupplierRepository.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcSupplierRepository.java index de7f722..1d755ea 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcSupplierRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/persistence/JdbcSupplierRepository.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.persistence; -import de.effigenix.domain.masterdata.*; +import de.effigenix.domain.masterdata.supplier.*; import de.effigenix.shared.common.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/ArticleController.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/ArticleController.java index 16c05ad..76c4daf 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/ArticleController.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/ArticleController.java @@ -1,12 +1,16 @@ package de.effigenix.infrastructure.masterdata.web.controller; -import de.effigenix.application.masterdata.*; -import de.effigenix.application.masterdata.command.*; -import de.effigenix.domain.masterdata.Article; -import de.effigenix.domain.masterdata.ArticleError; -import de.effigenix.domain.masterdata.ArticleId; -import de.effigenix.domain.masterdata.ArticleStatus; -import de.effigenix.domain.masterdata.ProductCategoryId; +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.article.Article; +import de.effigenix.domain.masterdata.article.ArticleError; +import de.effigenix.domain.masterdata.article.ArticleId; +import de.effigenix.domain.masterdata.article.ArticleStatus; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryId; import de.effigenix.infrastructure.masterdata.web.dto.*; import de.effigenix.shared.common.Result; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/CustomerController.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/CustomerController.java index 945fd18..2344375 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/CustomerController.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/CustomerController.java @@ -1,12 +1,12 @@ package de.effigenix.infrastructure.masterdata.web.controller; -import de.effigenix.application.masterdata.*; -import de.effigenix.application.masterdata.command.*; -import de.effigenix.domain.masterdata.Customer; -import de.effigenix.domain.masterdata.CustomerError; -import de.effigenix.domain.masterdata.CustomerId; -import de.effigenix.domain.masterdata.CustomerStatus; -import de.effigenix.domain.masterdata.CustomerType; +import de.effigenix.application.masterdata.customer.*; +import de.effigenix.application.masterdata.customer.command.*; +import de.effigenix.domain.masterdata.customer.Customer; +import de.effigenix.domain.masterdata.customer.CustomerError; +import de.effigenix.domain.masterdata.customer.CustomerId; +import de.effigenix.domain.masterdata.customer.CustomerStatus; +import de.effigenix.domain.masterdata.customer.CustomerType; import de.effigenix.infrastructure.masterdata.web.dto.*; import de.effigenix.shared.common.Result; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/ProductCategoryController.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/ProductCategoryController.java index f8ca360..7d344dc 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/ProductCategoryController.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/ProductCategoryController.java @@ -1,12 +1,13 @@ package de.effigenix.infrastructure.masterdata.web.controller; -import de.effigenix.application.masterdata.CreateProductCategory; -import de.effigenix.application.masterdata.DeleteProductCategory; -import de.effigenix.application.masterdata.ListProductCategories; -import de.effigenix.application.masterdata.UpdateProductCategory; -import de.effigenix.application.masterdata.command.CreateProductCategoryCommand; -import de.effigenix.application.masterdata.command.UpdateProductCategoryCommand; -import de.effigenix.domain.masterdata.ProductCategoryId; +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.application.masterdata.productcategory.command.CreateProductCategoryCommand; +import de.effigenix.application.masterdata.productcategory.command.UpdateProductCategoryCommand; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryError; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryId; import de.effigenix.infrastructure.masterdata.web.dto.CreateProductCategoryRequest; import de.effigenix.infrastructure.masterdata.web.dto.ProductCategoryResponse; import de.effigenix.infrastructure.masterdata.web.dto.UpdateProductCategoryRequest; @@ -132,14 +133,14 @@ public class ProductCategoryController { } public static class ProductCategoryDomainErrorException extends RuntimeException { - private final de.effigenix.domain.masterdata.ProductCategoryError error; + private final ProductCategoryError error; - public ProductCategoryDomainErrorException(de.effigenix.domain.masterdata.ProductCategoryError error) { + public ProductCategoryDomainErrorException(ProductCategoryError error) { super(error.message()); this.error = error; } - public de.effigenix.domain.masterdata.ProductCategoryError getError() { + public ProductCategoryError getError() { return error; } } diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/SupplierController.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/SupplierController.java index e93305a..36d710b 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/SupplierController.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/controller/SupplierController.java @@ -1,11 +1,11 @@ package de.effigenix.infrastructure.masterdata.web.controller; -import de.effigenix.application.masterdata.*; -import de.effigenix.application.masterdata.command.*; -import de.effigenix.domain.masterdata.Supplier; -import de.effigenix.domain.masterdata.SupplierError; -import de.effigenix.domain.masterdata.SupplierId; -import de.effigenix.domain.masterdata.SupplierStatus; +import de.effigenix.application.masterdata.supplier.*; +import de.effigenix.application.masterdata.supplier.command.*; +import de.effigenix.domain.masterdata.supplier.Supplier; +import de.effigenix.domain.masterdata.supplier.SupplierError; +import de.effigenix.domain.masterdata.supplier.SupplierId; +import de.effigenix.domain.masterdata.supplier.SupplierStatus; import de.effigenix.infrastructure.masterdata.web.dto.*; import de.effigenix.shared.common.Result; import de.effigenix.shared.security.ActorId; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/AddSalesUnitRequest.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/AddSalesUnitRequest.java index 4c6e610..4775a5d 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/AddSalesUnitRequest.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/AddSalesUnitRequest.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.PriceModel; +import de.effigenix.domain.masterdata.article.PriceModel; import de.effigenix.domain.masterdata.Unit; import jakarta.validation.constraints.NotNull; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ArticleResponse.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ArticleResponse.java index 57898b5..dce6d3b 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ArticleResponse.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ArticleResponse.java @@ -1,7 +1,7 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.Article; -import de.effigenix.domain.masterdata.SupplierId; +import de.effigenix.domain.masterdata.article.Article; +import de.effigenix.domain.masterdata.supplier.SupplierId; import io.swagger.v3.oas.annotations.media.Schema; import java.time.OffsetDateTime; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ContractLineItemResponse.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ContractLineItemResponse.java index baf0b67..7cf6736 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ContractLineItemResponse.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ContractLineItemResponse.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.ContractLineItem; +import de.effigenix.domain.masterdata.customer.ContractLineItem; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CreateArticleRequest.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CreateArticleRequest.java index 66d7518..a08a9d1 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CreateArticleRequest.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CreateArticleRequest.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.PriceModel; +import de.effigenix.domain.masterdata.article.PriceModel; import de.effigenix.domain.masterdata.Unit; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CreateCustomerRequest.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CreateCustomerRequest.java index 6fa9dc1..57eacb2 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CreateCustomerRequest.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CreateCustomerRequest.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.CustomerType; +import de.effigenix.domain.masterdata.customer.CustomerType; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CustomerResponse.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CustomerResponse.java index a7a69cb..7475160 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CustomerResponse.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/CustomerResponse.java @@ -1,7 +1,7 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.Customer; -import de.effigenix.domain.masterdata.CustomerPreference; +import de.effigenix.domain.masterdata.customer.Customer; +import de.effigenix.domain.masterdata.customer.CustomerPreference; import io.swagger.v3.oas.annotations.media.Schema; import java.time.OffsetDateTime; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/DeliveryAddressResponse.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/DeliveryAddressResponse.java index b702a1e..5f8d2bf 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/DeliveryAddressResponse.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/DeliveryAddressResponse.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.DeliveryAddress; +import de.effigenix.domain.masterdata.customer.DeliveryAddress; import io.swagger.v3.oas.annotations.media.Schema; @Schema(requiredProperties = {"label", "address", "contactPerson", "deliveryNotes"}) diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/FrameContractResponse.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/FrameContractResponse.java index d17d039..abce37b 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/FrameContractResponse.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/FrameContractResponse.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.FrameContract; +import de.effigenix.domain.masterdata.customer.FrameContract; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ProductCategoryResponse.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ProductCategoryResponse.java index 1f77245..3f862c8 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ProductCategoryResponse.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/ProductCategoryResponse.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.ProductCategory; +import de.effigenix.domain.masterdata.productcategory.ProductCategory; import io.swagger.v3.oas.annotations.media.Schema; @Schema(requiredProperties = {"id", "name", "description"}) diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/QualityCertificateResponse.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/QualityCertificateResponse.java index 2addf10..cab9fef 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/QualityCertificateResponse.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/QualityCertificateResponse.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.QualityCertificate; +import de.effigenix.domain.masterdata.supplier.QualityCertificate; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SalesUnitResponse.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SalesUnitResponse.java index 594d684..8b03047 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SalesUnitResponse.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SalesUnitResponse.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.SalesUnit; +import de.effigenix.domain.masterdata.article.SalesUnit; import io.swagger.v3.oas.annotations.media.Schema; import java.math.BigDecimal; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SetFrameContractRequest.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SetFrameContractRequest.java index a6770e0..c10bddf 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SetFrameContractRequest.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SetFrameContractRequest.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.DeliveryRhythm; +import de.effigenix.domain.masterdata.customer.DeliveryRhythm; import de.effigenix.domain.masterdata.Unit; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SetPreferencesRequest.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SetPreferencesRequest.java index 8d16cd6..242cced 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SetPreferencesRequest.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SetPreferencesRequest.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.CustomerPreference; +import de.effigenix.domain.masterdata.customer.CustomerPreference; import jakarta.validation.constraints.NotNull; import java.util.Set; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SupplierRatingResponse.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SupplierRatingResponse.java index cec941f..6e8c8e1 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SupplierRatingResponse.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SupplierRatingResponse.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.SupplierRating; +import de.effigenix.domain.masterdata.supplier.SupplierRating; import io.swagger.v3.oas.annotations.media.Schema; @Schema(requiredProperties = {"qualityScore", "deliveryScore", "priceScore"}) diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SupplierResponse.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SupplierResponse.java index a05665d..36c69d1 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SupplierResponse.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/dto/SupplierResponse.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.masterdata.web.dto; -import de.effigenix.domain.masterdata.Supplier; +import de.effigenix.domain.masterdata.supplier.Supplier; import io.swagger.v3.oas.annotations.media.Schema; import java.time.OffsetDateTime; diff --git a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/exception/MasterDataErrorHttpStatusMapper.java b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/exception/MasterDataErrorHttpStatusMapper.java index 862d6b0..5def24b 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/exception/MasterDataErrorHttpStatusMapper.java +++ b/backend/src/main/java/de/effigenix/infrastructure/masterdata/web/exception/MasterDataErrorHttpStatusMapper.java @@ -1,9 +1,9 @@ package de.effigenix.infrastructure.masterdata.web.exception; -import de.effigenix.domain.masterdata.ArticleError; -import de.effigenix.domain.masterdata.CustomerError; -import de.effigenix.domain.masterdata.ProductCategoryError; -import de.effigenix.domain.masterdata.SupplierError; +import de.effigenix.domain.masterdata.article.ArticleError; +import de.effigenix.domain.masterdata.customer.CustomerError; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryError; +import de.effigenix.domain.masterdata.supplier.SupplierError; public final class MasterDataErrorHttpStatusMapper { diff --git a/backend/src/main/java/de/effigenix/infrastructure/production/persistence/JdbcBatchRepository.java b/backend/src/main/java/de/effigenix/infrastructure/production/persistence/JdbcBatchRepository.java index c91a546..cf6530f 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/production/persistence/JdbcBatchRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/production/persistence/JdbcBatchRepository.java @@ -1,6 +1,6 @@ package de.effigenix.infrastructure.production.persistence; -import de.effigenix.domain.masterdata.ArticleId; +import de.effigenix.domain.masterdata.article.ArticleId; import de.effigenix.domain.production.*; import de.effigenix.shared.common.Quantity; import de.effigenix.shared.common.RepositoryError; diff --git a/backend/src/main/java/de/effigenix/infrastructure/shared/web/exception/GlobalExceptionHandler.java b/backend/src/main/java/de/effigenix/infrastructure/shared/web/exception/GlobalExceptionHandler.java index 56cbfde..1aa817c 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/shared/web/exception/GlobalExceptionHandler.java +++ b/backend/src/main/java/de/effigenix/infrastructure/shared/web/exception/GlobalExceptionHandler.java @@ -4,10 +4,10 @@ import de.effigenix.domain.inventory.InventoryCountError; import de.effigenix.domain.inventory.StockMovementError; import de.effigenix.domain.inventory.StorageLocationError; import de.effigenix.domain.inventory.StockError; -import de.effigenix.domain.masterdata.ArticleError; -import de.effigenix.domain.masterdata.ProductCategoryError; -import de.effigenix.domain.masterdata.CustomerError; -import de.effigenix.domain.masterdata.SupplierError; +import de.effigenix.domain.masterdata.article.ArticleError; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryError; +import de.effigenix.domain.masterdata.customer.CustomerError; +import de.effigenix.domain.masterdata.supplier.SupplierError; import de.effigenix.domain.production.BatchError; import de.effigenix.domain.production.ProductionOrderError; import de.effigenix.domain.production.RecipeError; diff --git a/backend/src/main/java/de/effigenix/infrastructure/stub/StubArticleRepository.java b/backend/src/main/java/de/effigenix/infrastructure/stub/StubArticleRepository.java index 03f5a83..31f1cf3 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/stub/StubArticleRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/stub/StubArticleRepository.java @@ -1,11 +1,11 @@ package de.effigenix.infrastructure.stub; -import de.effigenix.domain.masterdata.Article; -import de.effigenix.domain.masterdata.ArticleId; -import de.effigenix.domain.masterdata.ArticleNumber; -import de.effigenix.domain.masterdata.ArticleRepository; -import de.effigenix.domain.masterdata.ArticleStatus; -import de.effigenix.domain.masterdata.ProductCategoryId; +import de.effigenix.domain.masterdata.article.Article; +import de.effigenix.domain.masterdata.article.ArticleId; +import de.effigenix.domain.masterdata.article.ArticleNumber; +import de.effigenix.domain.masterdata.article.ArticleRepository; +import de.effigenix.domain.masterdata.article.ArticleStatus; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryId; import de.effigenix.shared.common.RepositoryError; import de.effigenix.shared.common.Result; import org.springframework.context.annotation.Profile; diff --git a/backend/src/main/java/de/effigenix/infrastructure/stub/StubCustomerRepository.java b/backend/src/main/java/de/effigenix/infrastructure/stub/StubCustomerRepository.java index 31a14af..91f07ee 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/stub/StubCustomerRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/stub/StubCustomerRepository.java @@ -1,11 +1,11 @@ package de.effigenix.infrastructure.stub; -import de.effigenix.domain.masterdata.Customer; -import de.effigenix.domain.masterdata.CustomerId; -import de.effigenix.domain.masterdata.CustomerName; -import de.effigenix.domain.masterdata.CustomerRepository; -import de.effigenix.domain.masterdata.CustomerStatus; -import de.effigenix.domain.masterdata.CustomerType; +import de.effigenix.domain.masterdata.customer.Customer; +import de.effigenix.domain.masterdata.customer.CustomerId; +import de.effigenix.domain.masterdata.customer.CustomerName; +import de.effigenix.domain.masterdata.customer.CustomerRepository; +import de.effigenix.domain.masterdata.customer.CustomerStatus; +import de.effigenix.domain.masterdata.customer.CustomerType; import de.effigenix.shared.common.RepositoryError; import de.effigenix.shared.common.Result; import org.springframework.context.annotation.Profile; diff --git a/backend/src/main/java/de/effigenix/infrastructure/stub/StubProductCategoryRepository.java b/backend/src/main/java/de/effigenix/infrastructure/stub/StubProductCategoryRepository.java index 04d482f..cf7e5f0 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/stub/StubProductCategoryRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/stub/StubProductCategoryRepository.java @@ -1,9 +1,9 @@ package de.effigenix.infrastructure.stub; -import de.effigenix.domain.masterdata.CategoryName; -import de.effigenix.domain.masterdata.ProductCategory; -import de.effigenix.domain.masterdata.ProductCategoryId; -import de.effigenix.domain.masterdata.ProductCategoryRepository; +import de.effigenix.domain.masterdata.productcategory.CategoryName; +import de.effigenix.domain.masterdata.productcategory.ProductCategory; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryId; +import de.effigenix.domain.masterdata.productcategory.ProductCategoryRepository; import de.effigenix.shared.common.RepositoryError; import de.effigenix.shared.common.Result; import org.springframework.context.annotation.Profile; diff --git a/backend/src/main/java/de/effigenix/infrastructure/stub/StubStockMovementRepository.java b/backend/src/main/java/de/effigenix/infrastructure/stub/StubStockMovementRepository.java index 64e8a45..f495ae7 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/stub/StubStockMovementRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/stub/StubStockMovementRepository.java @@ -5,7 +5,7 @@ import de.effigenix.domain.inventory.StockId; import de.effigenix.domain.inventory.StockMovement; import de.effigenix.domain.inventory.StockMovementId; import de.effigenix.domain.inventory.StockMovementRepository; -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.springframework.context.annotation.Profile; diff --git a/backend/src/main/java/de/effigenix/infrastructure/stub/StubStockRepository.java b/backend/src/main/java/de/effigenix/infrastructure/stub/StubStockRepository.java index f051e92..3130ca5 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/stub/StubStockRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/stub/StubStockRepository.java @@ -4,7 +4,7 @@ import de.effigenix.domain.inventory.Stock; import de.effigenix.domain.inventory.StockId; import de.effigenix.domain.inventory.StockRepository; import de.effigenix.domain.inventory.StorageLocationId; -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.springframework.context.annotation.Profile; diff --git a/backend/src/main/java/de/effigenix/infrastructure/stub/StubSupplierRepository.java b/backend/src/main/java/de/effigenix/infrastructure/stub/StubSupplierRepository.java index ff99609..b6ebe50 100644 --- a/backend/src/main/java/de/effigenix/infrastructure/stub/StubSupplierRepository.java +++ b/backend/src/main/java/de/effigenix/infrastructure/stub/StubSupplierRepository.java @@ -1,10 +1,10 @@ package de.effigenix.infrastructure.stub; -import de.effigenix.domain.masterdata.Supplier; -import de.effigenix.domain.masterdata.SupplierId; -import de.effigenix.domain.masterdata.SupplierName; -import de.effigenix.domain.masterdata.SupplierRepository; -import de.effigenix.domain.masterdata.SupplierStatus; +import de.effigenix.domain.masterdata.supplier.Supplier; +import de.effigenix.domain.masterdata.supplier.SupplierId; +import de.effigenix.domain.masterdata.supplier.SupplierName; +import de.effigenix.domain.masterdata.supplier.SupplierRepository; +import de.effigenix.domain.masterdata.supplier.SupplierStatus; import de.effigenix.shared.common.RepositoryError; import de.effigenix.shared.common.Result; import org.springframework.context.annotation.Profile; diff --git a/backend/src/test/java/de/effigenix/application/inventory/AddStockBatchTest.java b/backend/src/test/java/de/effigenix/application/inventory/AddStockBatchTest.java index 4e51d8f..0470a2a 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/AddStockBatchTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/AddStockBatchTest.java @@ -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( diff --git a/backend/src/test/java/de/effigenix/application/inventory/BlockStockBatchTest.java b/backend/src/test/java/de/effigenix/application/inventory/BlockStockBatchTest.java index d21873c..5cadd39 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/BlockStockBatchTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/BlockStockBatchTest.java @@ -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() diff --git a/backend/src/test/java/de/effigenix/application/inventory/CheckStockExpiryTest.java b/backend/src/test/java/de/effigenix/application/inventory/CheckStockExpiryTest.java index 5588fa4..5f89a33 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/CheckStockExpiryTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/CheckStockExpiryTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/inventory/ConfirmReservationTest.java b/backend/src/test/java/de/effigenix/application/inventory/ConfirmReservationTest.java index 736f27a..e9eac0c 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/ConfirmReservationTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/ConfirmReservationTest.java @@ -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() ); diff --git a/backend/src/test/java/de/effigenix/application/inventory/CreateInventoryCountTest.java b/backend/src/test/java/de/effigenix/application/inventory/CreateInventoryCountTest.java index 6063997..1e2334f 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/CreateInventoryCountTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/CreateInventoryCountTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/inventory/DeactivateStorageLocationTest.java b/backend/src/test/java/de/effigenix/application/inventory/DeactivateStorageLocationTest.java index d575c7c..dacd27a 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/DeactivateStorageLocationTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/DeactivateStorageLocationTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/inventory/GetStockMovementTest.java b/backend/src/test/java/de/effigenix/application/inventory/GetStockMovementTest.java index 83cdb22..3d79b7e 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/GetStockMovementTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/GetStockMovementTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/inventory/GetStockTest.java b/backend/src/test/java/de/effigenix/application/inventory/GetStockTest.java index cb575fc..ffc4692 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/GetStockTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/GetStockTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/inventory/ListStockMovementsTest.java b/backend/src/test/java/de/effigenix/application/inventory/ListStockMovementsTest.java index 9e2d19b..4677df7 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/ListStockMovementsTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/ListStockMovementsTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/inventory/ListStocksBelowMinimumTest.java b/backend/src/test/java/de/effigenix/application/inventory/ListStocksBelowMinimumTest.java index c76c886..123b724 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/ListStocksBelowMinimumTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/ListStocksBelowMinimumTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/inventory/ListStocksTest.java b/backend/src/test/java/de/effigenix/application/inventory/ListStocksTest.java index 406672e..defb616 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/ListStocksTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/ListStocksTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/inventory/ReleaseReservationTest.java b/backend/src/test/java/de/effigenix/application/inventory/ReleaseReservationTest.java index a5ba561..cf01634 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/ReleaseReservationTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/ReleaseReservationTest.java @@ -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() ); diff --git a/backend/src/test/java/de/effigenix/application/inventory/RemoveStockBatchTest.java b/backend/src/test/java/de/effigenix/application/inventory/RemoveStockBatchTest.java index aa6e2f0..0d5c878 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/RemoveStockBatchTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/RemoveStockBatchTest.java @@ -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() diff --git a/backend/src/test/java/de/effigenix/application/inventory/ReserveStockTest.java b/backend/src/test/java/de/effigenix/application/inventory/ReserveStockTest.java index 372b3dc..1042bc4 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/ReserveStockTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/ReserveStockTest.java @@ -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() ); diff --git a/backend/src/test/java/de/effigenix/application/inventory/UnblockStockBatchTest.java b/backend/src/test/java/de/effigenix/application/inventory/UnblockStockBatchTest.java index 34e53ea..7653d5d 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/UnblockStockBatchTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/UnblockStockBatchTest.java @@ -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() diff --git a/backend/src/test/java/de/effigenix/application/inventory/UpdateStockTest.java b/backend/src/test/java/de/effigenix/application/inventory/UpdateStockTest.java index ab09ae7..1d0c5b1 100644 --- a/backend/src/test/java/de/effigenix/application/inventory/UpdateStockTest.java +++ b/backend/src/test/java/de/effigenix/application/inventory/UpdateStockTest.java @@ -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(), diff --git a/backend/src/test/java/de/effigenix/application/masterdata/ArticleUseCaseTest.java b/backend/src/test/java/de/effigenix/application/masterdata/ArticleUseCaseTest.java index 16a7524..c265b33 100644 --- a/backend/src/test/java/de/effigenix/application/masterdata/ArticleUseCaseTest.java +++ b/backend/src/test/java/de/effigenix/application/masterdata/ArticleUseCaseTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/masterdata/CustomerUseCaseTest.java b/backend/src/test/java/de/effigenix/application/masterdata/CustomerUseCaseTest.java index da3a6b5..b91fcf8 100644 --- a/backend/src/test/java/de/effigenix/application/masterdata/CustomerUseCaseTest.java +++ b/backend/src/test/java/de/effigenix/application/masterdata/CustomerUseCaseTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/masterdata/ProductCategoryUseCaseTest.java b/backend/src/test/java/de/effigenix/application/masterdata/ProductCategoryUseCaseTest.java index b073e77..82defd0 100644 --- a/backend/src/test/java/de/effigenix/application/masterdata/ProductCategoryUseCaseTest.java +++ b/backend/src/test/java/de/effigenix/application/masterdata/ProductCategoryUseCaseTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/application/masterdata/SupplierUseCaseTest.java b/backend/src/test/java/de/effigenix/application/masterdata/SupplierUseCaseTest.java index 27c28f5..1e7b0fe 100644 --- a/backend/src/test/java/de/effigenix/application/masterdata/SupplierUseCaseTest.java +++ b/backend/src/test/java/de/effigenix/application/masterdata/SupplierUseCaseTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/domain/inventory/InventoryCountTest.java b/backend/src/test/java/de/effigenix/domain/inventory/InventoryCountTest.java index b4c1f88..95dd32d 100644 --- a/backend/src/test/java/de/effigenix/domain/inventory/InventoryCountTest.java +++ b/backend/src/test/java/de/effigenix/domain/inventory/InventoryCountTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/domain/inventory/StockMovementTest.java b/backend/src/test/java/de/effigenix/domain/inventory/StockMovementTest.java index 83957fe..3ec7654 100644 --- a/backend/src/test/java/de/effigenix/domain/inventory/StockMovementTest.java +++ b/backend/src/test/java/de/effigenix/domain/inventory/StockMovementTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/domain/inventory/StockTest.java b/backend/src/test/java/de/effigenix/domain/inventory/StockTest.java index 0656d9a..ac6bd36 100644 --- a/backend/src/test/java/de/effigenix/domain/inventory/StockTest.java +++ b/backend/src/test/java/de/effigenix/domain/inventory/StockTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/domain/masterdata/ArticleTest.java b/backend/src/test/java/de/effigenix/domain/masterdata/ArticleTest.java index 8d7f0d0..4dc2b07 100644 --- a/backend/src/test/java/de/effigenix/domain/masterdata/ArticleTest.java +++ b/backend/src/test/java/de/effigenix/domain/masterdata/ArticleTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/domain/masterdata/CustomerTest.java b/backend/src/test/java/de/effigenix/domain/masterdata/CustomerTest.java index b4ff341..62cdb95 100644 --- a/backend/src/test/java/de/effigenix/domain/masterdata/CustomerTest.java +++ b/backend/src/test/java/de/effigenix/domain/masterdata/CustomerTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/domain/masterdata/ProductCategoryTest.java b/backend/src/test/java/de/effigenix/domain/masterdata/ProductCategoryTest.java index 0942be2..c9a3552 100644 --- a/backend/src/test/java/de/effigenix/domain/masterdata/ProductCategoryTest.java +++ b/backend/src/test/java/de/effigenix/domain/masterdata/ProductCategoryTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/domain/masterdata/SupplierTest.java b/backend/src/test/java/de/effigenix/domain/masterdata/SupplierTest.java index 212610c..38d92e1 100644 --- a/backend/src/test/java/de/effigenix/domain/masterdata/SupplierTest.java +++ b/backend/src/test/java/de/effigenix/domain/masterdata/SupplierTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/infrastructure/masterdata/web/ArticleControllerIntegrationTest.java b/backend/src/test/java/de/effigenix/infrastructure/masterdata/web/ArticleControllerIntegrationTest.java index d36b862..304ca55 100644 --- a/backend/src/test/java/de/effigenix/infrastructure/masterdata/web/ArticleControllerIntegrationTest.java +++ b/backend/src/test/java/de/effigenix/infrastructure/masterdata/web/ArticleControllerIntegrationTest.java @@ -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; diff --git a/backend/src/test/java/de/effigenix/infrastructure/masterdata/web/CustomerControllerIntegrationTest.java b/backend/src/test/java/de/effigenix/infrastructure/masterdata/web/CustomerControllerIntegrationTest.java index 271810d..c998011 100644 --- a/backend/src/test/java/de/effigenix/infrastructure/masterdata/web/CustomerControllerIntegrationTest.java +++ b/backend/src/test/java/de/effigenix/infrastructure/masterdata/web/CustomerControllerIntegrationTest.java @@ -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.*;