diff --git a/DeliveryService.Domain/ClassDiagram.cd b/DeliveryService.Domain/ClassDiagram.cd
new file mode 100644
index 0000000..d551aaf
--- /dev/null
+++ b/DeliveryService.Domain/ClassDiagram.cd
@@ -0,0 +1,98 @@
+
+
+
+
+
+ AAUCAGAgAAEAAAAAAAAAAAAAAAAIAAAIAAAAAAAAAAg=
+ Courier\CourierEntity.cs
+
+
+
+
+
+ AAUCAGAgAAEAAAAAAAAAAAAAAAAIAAAIAAAAAAAAAAg=
+ Customer\CustomerEntity.cs
+
+
+
+
+
+ IAUCAEAgAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAg=
+ Manager\ManagerEntity.cs
+
+
+
+
+
+
+
+ Order\OrderEntity.cs
+
+
+
+
+ AAMCBAAEAAEgAAAAAIAAAABEABAQBAQAAAgAAAAAAAA=
+ Order\OrderEntity.cs
+
+
+
+
+
+ AABCAAAAAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
+ PaymentOrder\PaymentOrderEntity.cs
+
+
+
+
+
+ AAACAAAAAQAAAEAAAAAACAAAAAAAAAAAAAAAAIAAAAA=
+ Product\ProductEntity.cs
+
+
+
+
+
+
+
+ Restaurant\RestaurantEntity.cs
+
+
+
+
+ AAACAAAEAAAAAAAAAAAAAAQEAAAAAAACACAAAAAAAAQ=
+ Restaurant\RestaurantEntity.cs
+
+
+
+
+
+ AAACAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA=
+ Role\RoleEntity.cs
+
+
+
+
+
+ AAACAEAAACAAAAAAEAAQAAAAAAIAAAACAAAAAAAAAAg=
+ User\UserEntity.cs
+
+
+
+
+
+ EAECAAAAAAAAAEAAAAAACAQAAAAAQAAAAAAAAAAAAAA=
+ OrderItemEntity\OrderItemEntity.cs
+
+
+
+
+
+ AAACAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA=
+ SectionEntity\SectionEntity.cs
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DeliveryService.Domain/Product/ProductEntity.cs b/DeliveryService.Domain/Product/ProductEntity.cs
index fa2f706..fa8c711 100644
--- a/DeliveryService.Domain/Product/ProductEntity.cs
+++ b/DeliveryService.Domain/Product/ProductEntity.cs
@@ -12,12 +12,6 @@ public class ProductEntity
public SectionEntity? Section { get; set; }
- public ProductEntity(int id, string title)
- {
- Id = id;
- Title = title;
- }
-
public ProductEntity(int id, string name, double price, SectionEntity section)
{
Id = id;
diff --git a/DeliveryService.Domain/SectionEntity/SectionEntity.cs b/DeliveryService.Domain/SectionEntity/SectionEntity.cs
index 7dcd1ee..1f6c212 100644
--- a/DeliveryService.Domain/SectionEntity/SectionEntity.cs
+++ b/DeliveryService.Domain/SectionEntity/SectionEntity.cs
@@ -3,7 +3,15 @@
public Guid Id { get; set; }
public string Name { get; set; }
- public SectionEntity(Guid id, string name)
+ public DeliveryService.Domain.Product.ProductEntity Product
+ {
+ get => default;
+ set
+ {
+ }
+ }
+
+ public SectionEntity(Guid id, string name)
{
Id = id;
Name = name;
diff --git a/DeliveryService_ASP.NET.sln b/DeliveryService_ASP.NET.sln
index 5266515..1b46c16 100644
--- a/DeliveryService_ASP.NET.sln
+++ b/DeliveryService_ASP.NET.sln
@@ -19,9 +19,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeliveryService.App", "Deli
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeliveryService.Contracts", "DeliveryService.Contracts\DeliveryService.Contracts.csproj", "{B02B938D-8CA0-4CD0-B31A-B3167D7B4605}"
EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{13B28158-9D06-458A-A62D-B6019BC6EE3D}"
+Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{2FC6AD18-3BEB-43F7-9FDD-3CF226455744}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp2", "..\ConsoleApp2\ConsoleApp2.csproj", "{10DF0D27-F726-472F-A01E-16C22224C9D3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{4FD900BD-08C8-417F-9162-EF047244097B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeliveryService.Services.PaymentAPI", "..\DeliveryService.Services.PaymentAPI\DeliveryService.Services.PaymentAPI.csproj", "{F2DDA11D-5610-4D94-A4B7-74ADDF5E42D9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -49,14 +51,14 @@ Global
{B02B938D-8CA0-4CD0-B31A-B3167D7B4605}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B02B938D-8CA0-4CD0-B31A-B3167D7B4605}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B02B938D-8CA0-4CD0-B31A-B3167D7B4605}.Release|Any CPU.Build.0 = Release|Any CPU
- {13B28158-9D06-458A-A62D-B6019BC6EE3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {13B28158-9D06-458A-A62D-B6019BC6EE3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {13B28158-9D06-458A-A62D-B6019BC6EE3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {13B28158-9D06-458A-A62D-B6019BC6EE3D}.Release|Any CPU.Build.0 = Release|Any CPU
- {10DF0D27-F726-472F-A01E-16C22224C9D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {10DF0D27-F726-472F-A01E-16C22224C9D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {10DF0D27-F726-472F-A01E-16C22224C9D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {10DF0D27-F726-472F-A01E-16C22224C9D3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2FC6AD18-3BEB-43F7-9FDD-3CF226455744}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2FC6AD18-3BEB-43F7-9FDD-3CF226455744}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2FC6AD18-3BEB-43F7-9FDD-3CF226455744}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2FC6AD18-3BEB-43F7-9FDD-3CF226455744}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F2DDA11D-5610-4D94-A4B7-74ADDF5E42D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F2DDA11D-5610-4D94-A4B7-74ADDF5E42D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F2DDA11D-5610-4D94-A4B7-74ADDF5E42D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F2DDA11D-5610-4D94-A4B7-74ADDF5E42D9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -67,6 +69,7 @@ Global
{2ED1AD2D-0740-410E-895D-9842D10A221A} = {EDB841FB-9A89-4E15-8BF2-6CF7A63475AA}
{EB23172B-1FE1-4281-AC50-4F560A18F5D0} = {C4E7D0C8-C6E2-481A-8214-4D2CADC6F311}
{B02B938D-8CA0-4CD0-B31A-B3167D7B4605} = {7FCA4D67-5A3E-476F-B125-A2E1C2AE835D}
+ {F2DDA11D-5610-4D94-A4B7-74ADDF5E42D9} = {4FD900BD-08C8-417F-9162-EF047244097B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8C515027-DD6A-4FB2-A343-04CC8DDFD87E}
diff --git a/DeliveryService_ASP.NET/Dockerfile b/DeliveryService_ASP.NET/Dockerfile
index b693600..221f5af 100644
--- a/DeliveryService_ASP.NET/Dockerfile
+++ b/DeliveryService_ASP.NET/Dockerfile
@@ -1,4 +1,4 @@
-#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
WORKDIR /app
diff --git a/docker-compose.dcproj b/docker-compose.dcproj
index 28011c9..9f1bd1f 100644
--- a/docker-compose.dcproj
+++ b/docker-compose.dcproj
@@ -3,7 +3,7 @@
2.1
Linux
- 13b28158-9d06-458a-a62d-b6019bc6ee3d
+ 2fc6ad18-3beb-43f7-9fdd-3cf226455744
LaunchBrowser
{Scheme}://localhost:{ServicePort}
deliveryservice.api
diff --git a/docker-compose.yml b/docker-compose.yml
index 2828b1f..4d0469c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,16 +8,14 @@ services:
dockerfile: DeliveryService_ASP.NET/Dockerfile
ports:
- 5000:80
- minio:
- container_name: minio
- image: minio/minio:RELEASE.2021-09-15T04-54-25Z.hotfix.908b0f10a
+ rabbitmq:
+ image: rabbitmq:3.8-management-alpine
+ hostname: delivery_rabbitmq
+ restart: always
environment:
- MINIO_ROOT_USER: minio
- MINIO_ROOT_PASSWORD: minio123
- command: server --console-address ":9001" /data
- volumes:
- - ./docker/minio:/data
+ - RABBITMQ_DEFAULT_USER=rmuser
+ - RABBITMQ_DEFAULT_PASS=rmpassword
+ - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbit log_levels [{connection,error},{default,error}] disk_free_limit 2147483648
ports:
- - "9000:9000"
- - "9001:9001"
-
+ - 15672:15672
+ - 5672:5672