From 97f9b3bd14e1becdccbed08a4cfb37177941e6d2 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Wed, 19 Jun 2024 11:24:14 +1000 Subject: [PATCH] =?UTF-8?q?feat(api):=20=D0=B2=20WorkGroupResponse=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20Respon?= =?UTF-8?q?seArea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.API/Contracts/V1/Responses/ResponseAreaResponse.cs | 9 +++++++++ PARR.API/Contracts/V1/Responses/WorkGroupResponse.cs | 2 ++ PARR.API/Controllers/V1/WorkGroupController.cs | 3 ++- PARR.API/MappingProfiles/DomainToResponseProfile.cs | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 PARR.API/Contracts/V1/Responses/ResponseAreaResponse.cs diff --git a/PARR.API/Contracts/V1/Responses/ResponseAreaResponse.cs b/PARR.API/Contracts/V1/Responses/ResponseAreaResponse.cs new file mode 100644 index 00000000..e25a8277 --- /dev/null +++ b/PARR.API/Contracts/V1/Responses/ResponseAreaResponse.cs @@ -0,0 +1,9 @@ +namespace PARR.API.Contracts.V1.Responses +{ + public class ResponseAreaResponse + { + public int Code { get; set; } + + public required string Name { get; set; } + } +} diff --git a/PARR.API/Contracts/V1/Responses/WorkGroupResponse.cs b/PARR.API/Contracts/V1/Responses/WorkGroupResponse.cs index 87580677..64b85509 100644 --- a/PARR.API/Contracts/V1/Responses/WorkGroupResponse.cs +++ b/PARR.API/Contracts/V1/Responses/WorkGroupResponse.cs @@ -5,5 +5,7 @@ public Guid Id { get; set; } public required string Name { get; set; } + + public ResponseAreaResponse? ResponseArea { get; set; } } } diff --git a/PARR.API/Controllers/V1/WorkGroupController.cs b/PARR.API/Controllers/V1/WorkGroupController.cs index ab0615e2..91a0e16e 100644 --- a/PARR.API/Controllers/V1/WorkGroupController.cs +++ b/PARR.API/Controllers/V1/WorkGroupController.cs @@ -44,6 +44,7 @@ namespace PARR.API.Controllers.V1 var paginationFilter = mapper.Map(paginationQuery); IQueryable query = workGroupService.Get() + .Include(t => t.ResponseArea) .OrderBy(t => t.Name); if (!string.IsNullOrEmpty(filter.Name)) @@ -69,7 +70,7 @@ namespace PARR.API.Controllers.V1 [HttpGet(ApiRoutes.WorkGroup.Get)] public async Task Get([FromRoute] Guid id) { - var workGroup = await workGroupService.GetAsync(id); + var workGroup = await workGroupService.Get().Include(t => t.ResponseArea).FirstOrDefaultAsync(t => t.Id == id); if (workGroup == null) return NotFound(); diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs index 10f8faf2..1961167b 100644 --- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs +++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs @@ -261,6 +261,10 @@ namespace PARR.API.MappingProfiles #endregion + #region ResponseArea + CreateMap(); + #endregion + CreateMap(); }