From 8264a1e857ea86e5955d75f75bbd6d22e3ee1ed9 Mon Sep 17 00:00:00 2001 From: "pin11kurochkin@gmail.com" Date: Sun, 24 Sep 2023 22:07:56 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=B8=D0=B0=D0=B3=D1=80=D0=B0=D0=BC?= =?UTF-8?q?=D0=BC=D0=B0=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GetAllSection/GetAllSectionQuery.cs | 8 ++++ .../GetAllSectionQueryHandler.cs | 37 +++++++++++++++++++ .../Section/Section/Queries/SectionVm.cs | 5 +++ .../Section/Section/Queries/SectionsVm.cs | 5 +++ DeliveryService.Domain/ClassDiagram.cd | 2 + .../Courier/CourierEntity.cs | 16 ++++++++ .../Customer/CustomerEntity.cs | 1 + .../Product/ProductEntity.cs | 1 + DeliveryService.Domain/Role/RoleEntity.cs | 1 + .../SectionEntity/SectionEntity.cs | 10 ++++- DeliveryService_ASP.NET.sln | 6 --- 11 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQuery.cs create mode 100644 DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQueryHandler.cs create mode 100644 DeliveryService.App/Section/Section/Queries/SectionVm.cs create mode 100644 DeliveryService.App/Section/Section/Queries/SectionsVm.cs create mode 100644 DeliveryService.Domain/ClassDiagram.cd diff --git a/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQuery.cs b/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQuery.cs new file mode 100644 index 0000000..50c7e8a --- /dev/null +++ b/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQuery.cs @@ -0,0 +1,8 @@ +using ErrorOr; +using MediatR; + +namespace DeliveryService.App.Section.Queries.GetAllSection; + +public record GetAllSectionQuery : IRequest> +{ +} diff --git a/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQueryHandler.cs b/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQueryHandler.cs new file mode 100644 index 0000000..693220b --- /dev/null +++ b/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQueryHandler.cs @@ -0,0 +1,37 @@ +using DeliveryService.App.Common.Interfaces.Persistence; +using DeliveryService.App.Product.Queries; +using ErrorOr; +using MediatR; +using static DeliveryService.App.Common.Errors.Errors; + +namespace DeliveryService.App.Section.Queries.GetAllSection; + +public class GetAllSectionQueryHandler + : IRequestHandler> +{ + private readonly IUnitOfWork _unitOfWork; + + public GetAllSectionQueryHandler(IUnitOfWork unitOfWork) + { + _unitOfWork = unitOfWork; + } + + public async Task> Handle( + GetAllSectionQuery request, + CancellationToken cancellationToken) + { + var sections = await _unitOfWork.Sections.GetAll(); + if (sections is null) + { + return new ErrorOr(); + } + + var allSections = sections.Select(section => new SectionVm( + section.Id.ToString(), + section.Name + ) + ).ToList(); + + return new SectionsVm(allSections); + } +} diff --git a/DeliveryService.App/Section/Section/Queries/SectionVm.cs b/DeliveryService.App/Section/Section/Queries/SectionVm.cs new file mode 100644 index 0000000..f5921bf --- /dev/null +++ b/DeliveryService.App/Section/Section/Queries/SectionVm.cs @@ -0,0 +1,5 @@ +namespace DeliveryService.App.Section.Queries; + +public record SectionVm( + string SectionId, + string Name); diff --git a/DeliveryService.App/Section/Section/Queries/SectionsVm.cs b/DeliveryService.App/Section/Section/Queries/SectionsVm.cs new file mode 100644 index 0000000..71ab957 --- /dev/null +++ b/DeliveryService.App/Section/Section/Queries/SectionsVm.cs @@ -0,0 +1,5 @@ +namespace DeliveryService.App.Section.Queries; + +public record SectionsVm( + List Sections); + diff --git a/DeliveryService.Domain/ClassDiagram.cd b/DeliveryService.Domain/ClassDiagram.cd new file mode 100644 index 0000000..7b89419 --- /dev/null +++ b/DeliveryService.Domain/ClassDiagram.cd @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/DeliveryService.Domain/Courier/CourierEntity.cs b/DeliveryService.Domain/Courier/CourierEntity.cs index bdbe4ef..acc3b7a 100644 --- a/DeliveryService.Domain/Courier/CourierEntity.cs +++ b/DeliveryService.Domain/Courier/CourierEntity.cs @@ -20,6 +20,22 @@ public class CourierEntity public IReadOnlyList Orders => _orders.AsReadOnly(); + public User.UserEntity UserEntity + { + get => default; + set + { + } + } + + public OrderEntity OrderEntity + { + get => default; + set + { + } + } + public CourierEntity(Guid id, string lastName, string firstName) { Id = id; diff --git a/DeliveryService.Domain/Customer/CustomerEntity.cs b/DeliveryService.Domain/Customer/CustomerEntity.cs index aab04ee..e9f132c 100644 --- a/DeliveryService.Domain/Customer/CustomerEntity.cs +++ b/DeliveryService.Domain/Customer/CustomerEntity.cs @@ -20,6 +20,7 @@ public class CustomerEntity public IReadOnlyList Orders => _orders.AsReadOnly(); + public CustomerEntity(Guid id, string lastName, string firstName) { Id = id; diff --git a/DeliveryService.Domain/Product/ProductEntity.cs b/DeliveryService.Domain/Product/ProductEntity.cs index fa2f706..3998648 100644 --- a/DeliveryService.Domain/Product/ProductEntity.cs +++ b/DeliveryService.Domain/Product/ProductEntity.cs @@ -12,6 +12,7 @@ public class ProductEntity public SectionEntity? Section { get; set; } + public ProductEntity(int id, string title) { Id = id; diff --git a/DeliveryService.Domain/Role/RoleEntity.cs b/DeliveryService.Domain/Role/RoleEntity.cs index a6bf064..0852562 100644 --- a/DeliveryService.Domain/Role/RoleEntity.cs +++ b/DeliveryService.Domain/Role/RoleEntity.cs @@ -4,4 +4,5 @@ public class RoleEntity { public Guid Id { get; set; } public string Name { get; set; } + } 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..74f65b1 100644 --- a/DeliveryService_ASP.NET.sln +++ b/DeliveryService_ASP.NET.sln @@ -21,8 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeliveryService.Contracts", EndProject Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{13B28158-9D06-458A-A62D-B6019BC6EE3D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp2", "..\ConsoleApp2\ConsoleApp2.csproj", "{10DF0D27-F726-472F-A01E-16C22224C9D3}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -53,10 +51,6 @@ Global {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From aca46d33a72039b60654552fc2f7997ccc36d2ac Mon Sep 17 00:00:00 2001 From: "pin11kurochkin@gmail.com" Date: Tue, 26 Sep 2023 17:23:17 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GetAllSection/GetAllSectionQuery.cs | 8 -- .../GetAllSectionQueryHandler.cs | 37 ------- .../Section/Section/Queries/SectionVm.cs | 5 - .../Section/Section/Queries/SectionsVm.cs | 5 - DeliveryService.Domain/ClassDiagram.cd | 98 ++++++++++++++++++- .../Courier/CourierEntity.cs | 16 --- .../Customer/CustomerEntity.cs | 1 - .../Product/ProductEntity.cs | 7 -- DeliveryService.Domain/Role/RoleEntity.cs | 1 - 9 files changed, 97 insertions(+), 81 deletions(-) delete mode 100644 DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQuery.cs delete mode 100644 DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQueryHandler.cs delete mode 100644 DeliveryService.App/Section/Section/Queries/SectionVm.cs delete mode 100644 DeliveryService.App/Section/Section/Queries/SectionsVm.cs diff --git a/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQuery.cs b/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQuery.cs deleted file mode 100644 index 50c7e8a..0000000 --- a/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQuery.cs +++ /dev/null @@ -1,8 +0,0 @@ -using ErrorOr; -using MediatR; - -namespace DeliveryService.App.Section.Queries.GetAllSection; - -public record GetAllSectionQuery : IRequest> -{ -} diff --git a/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQueryHandler.cs b/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQueryHandler.cs deleted file mode 100644 index 693220b..0000000 --- a/DeliveryService.App/Section/Section/Queries/GetAllSection/GetAllSectionQueryHandler.cs +++ /dev/null @@ -1,37 +0,0 @@ -using DeliveryService.App.Common.Interfaces.Persistence; -using DeliveryService.App.Product.Queries; -using ErrorOr; -using MediatR; -using static DeliveryService.App.Common.Errors.Errors; - -namespace DeliveryService.App.Section.Queries.GetAllSection; - -public class GetAllSectionQueryHandler - : IRequestHandler> -{ - private readonly IUnitOfWork _unitOfWork; - - public GetAllSectionQueryHandler(IUnitOfWork unitOfWork) - { - _unitOfWork = unitOfWork; - } - - public async Task> Handle( - GetAllSectionQuery request, - CancellationToken cancellationToken) - { - var sections = await _unitOfWork.Sections.GetAll(); - if (sections is null) - { - return new ErrorOr(); - } - - var allSections = sections.Select(section => new SectionVm( - section.Id.ToString(), - section.Name - ) - ).ToList(); - - return new SectionsVm(allSections); - } -} diff --git a/DeliveryService.App/Section/Section/Queries/SectionVm.cs b/DeliveryService.App/Section/Section/Queries/SectionVm.cs deleted file mode 100644 index f5921bf..0000000 --- a/DeliveryService.App/Section/Section/Queries/SectionVm.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace DeliveryService.App.Section.Queries; - -public record SectionVm( - string SectionId, - string Name); diff --git a/DeliveryService.App/Section/Section/Queries/SectionsVm.cs b/DeliveryService.App/Section/Section/Queries/SectionsVm.cs deleted file mode 100644 index 71ab957..0000000 --- a/DeliveryService.App/Section/Section/Queries/SectionsVm.cs +++ /dev/null @@ -1,5 +0,0 @@ -namespace DeliveryService.App.Section.Queries; - -public record SectionsVm( - List Sections); - diff --git a/DeliveryService.Domain/ClassDiagram.cd b/DeliveryService.Domain/ClassDiagram.cd index 7b89419..d551aaf 100644 --- a/DeliveryService.Domain/ClassDiagram.cd +++ b/DeliveryService.Domain/ClassDiagram.cd @@ -1,2 +1,98 @@  - \ No newline at end of file + + + + + 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/Courier/CourierEntity.cs b/DeliveryService.Domain/Courier/CourierEntity.cs index acc3b7a..bdbe4ef 100644 --- a/DeliveryService.Domain/Courier/CourierEntity.cs +++ b/DeliveryService.Domain/Courier/CourierEntity.cs @@ -20,22 +20,6 @@ public class CourierEntity public IReadOnlyList Orders => _orders.AsReadOnly(); - public User.UserEntity UserEntity - { - get => default; - set - { - } - } - - public OrderEntity OrderEntity - { - get => default; - set - { - } - } - public CourierEntity(Guid id, string lastName, string firstName) { Id = id; diff --git a/DeliveryService.Domain/Customer/CustomerEntity.cs b/DeliveryService.Domain/Customer/CustomerEntity.cs index e9f132c..aab04ee 100644 --- a/DeliveryService.Domain/Customer/CustomerEntity.cs +++ b/DeliveryService.Domain/Customer/CustomerEntity.cs @@ -20,7 +20,6 @@ public class CustomerEntity public IReadOnlyList Orders => _orders.AsReadOnly(); - public CustomerEntity(Guid id, string lastName, string firstName) { Id = id; diff --git a/DeliveryService.Domain/Product/ProductEntity.cs b/DeliveryService.Domain/Product/ProductEntity.cs index 3998648..fa8c711 100644 --- a/DeliveryService.Domain/Product/ProductEntity.cs +++ b/DeliveryService.Domain/Product/ProductEntity.cs @@ -12,13 +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/Role/RoleEntity.cs b/DeliveryService.Domain/Role/RoleEntity.cs index 0852562..a6bf064 100644 --- a/DeliveryService.Domain/Role/RoleEntity.cs +++ b/DeliveryService.Domain/Role/RoleEntity.cs @@ -4,5 +4,4 @@ public class RoleEntity { public Guid Id { get; set; } public string Name { get; set; } - } From 8dd0da0589ee432ec2551b6913b464425bd9c188 Mon Sep 17 00:00:00 2001 From: "pin11kurochkin@gmail.com" Date: Tue, 26 Sep 2023 21:13:47 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=91=D0=94=20=D0=B4=D0=BB=D1=8F=20PaymentAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DeliveryService_ASP.NET.sln | 19 ++++++++++++++----- DeliveryService_ASP.NET/Dockerfile | 2 +- docker-compose.dcproj | 2 +- docker-compose.yml | 20 +++++++++----------- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/DeliveryService_ASP.NET.sln b/DeliveryService_ASP.NET.sln index 74f65b1..1b46c16 100644 --- a/DeliveryService_ASP.NET.sln +++ b/DeliveryService_ASP.NET.sln @@ -19,7 +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("{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 @@ -47,10 +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 + {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 @@ -61,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