feat(api): jobGroup при создании и обновлении принимает поле GroupingUnitFieldId. Валидации. Контроллеры KiiUnitController, RegionalEkPtkGroupController

PARR.API/Controllers/V1/JobGroupController.cs

@@ -34,6 +34,7 @@ namespace PARR.API.Controllers.V1
         private readonly IJobService jobService;
         private readonly IEsppSchTypeConfigService esppConfigService;
         private readonly IValidator<JobGroupRequest> validator;
+        private readonly IJobGroupTypeService jobGroupTypeService;
         private readonly SettingsFromDb settingsFromDb;
 
         public JobGroupController(
@@ -44,6 +45,7 @@ namespace PARR.API.Controllers.V1
             IJobService jobService,
             IEsppSchTypeConfigService esppConfigService,
             IValidator<JobGroupRequest> validator,
+            IJobGroupTypeService jobGroupTypeService,
             SettingsFromDb settingsFromDb
             )
         {
@@ -54,6 +56,7 @@ namespace PARR.API.Controllers.V1
             this.jobService = jobService;
             this.esppConfigService = esppConfigService;
             this.validator = validator;
+            this.jobGroupTypeService = jobGroupTypeService;
             this.settingsFromDb = settingsFromDb;
         }
 
@@ -67,7 +70,9 @@ namespace PARR.API.Controllers.V1
         {
             var paginationFilter = mapper.Map<PaginationFilter>(paginationQuery);
 
-            IQueryable<JobGroup> query = groupService.Get().Include(t => t.GroupType);
+            IQueryable<JobGroup> query = groupService.Get()
+                                            .Include(t => t.GroupType)
+                                            .Include(t => t.GroupingUnitField);
 
             query = query.OrderBy(t => t.GroupName);
 
@@ -105,6 +110,7 @@ namespace PARR.API.Controllers.V1
             var jobGroup = await groupService.Get()
                                         .Include(t => t.Jobs).ThenInclude(t => t.Tnk)
                                         .Include(t => t.GroupType)
+                                        .Include(t => t.GroupingUnitField)
                                         .FirstOrDefaultAsync(t => t.Id == id);
 
             if (jobGroup == null)
@@ -136,6 +142,7 @@ namespace PARR.API.Controllers.V1
                 GroupName = request.Name.Trim(),
                 //IsUmbrella = request.IsUmbrella,
                 GroupTypeId = request.GroupTypeId,
+                GroupingUnitFieldId = await GetGroupingUnitFieldIdAsync(request),
                 ShortDescription = request.ShortDescription.Trim(),
                 FullDescription = request.FullDescription.Trim(),
                 Solution = request.Solution.Trim(),
@@ -167,6 +174,7 @@ namespace PARR.API.Controllers.V1
 
             var createdJobGroup = await groupService.Get().Include(t => t.Jobs).ThenInclude(t => t.Tnk)
                                              .Include(t => t.GroupType)
+                                             .Include(t => t.GroupingUnitField)
                                              .FirstAsync(t => t.Id == jobGroup.Id);
 
             var locationUri = uriService.GetUri(ApiRoutes.JobGroup.Get, ApiRoutes.JobGroup.getParam, createdJobGroup.Id);
@@ -206,6 +214,7 @@ namespace PARR.API.Controllers.V1
             orig.GroupName = request.Name.Trim();
             //orig.IsUmbrella = request.IsUmbrella;
             orig.GroupTypeId = request.GroupTypeId;
+            orig.GroupingUnitFieldId = await GetGroupingUnitFieldIdAsync(request);
             orig.ShortDescription = request.ShortDescription.Trim();
             orig.FullDescription = request.FullDescription.Trim();
             orig.Solution = request.Solution.Trim();
@@ -263,6 +272,7 @@ namespace PARR.API.Controllers.V1
                                                     .Include(t => t.Jobs)
                                                         .ThenInclude(t => t.Tnk)
                                                     .Include(t => t.GroupType)
+                                                    .Include(t => t.GroupingUnitField)
                                                     .FirstAsync(t => t.Id == orig.Id);
 
             var response = mapper.Map<JobGroupResponse>(updatedJobGroup);
@@ -361,7 +371,34 @@ namespace PARR.API.Controllers.V1
             jobGroupResponse.Schedule = scheduleResponse;
 
             jobGroupResponse.JobsCount = await jobService.Get().CountAsync(t => t.GroupId == jobGroupResponse.Id);
+        }
 
+
+        /// <summary>
+        /// Смотрим на тип Группы, и возвращаем GroupingUnitFieldId или обнуляем его
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        private async Task<Guid?> GetGroupingUnitFieldIdAsync(JobGroupRequest request)
+        {
+            // Если request.GroupingUnitFieldId == null, то ничего проверять не будем 
+            if (request.GroupingUnitFieldId == null)
+                return request.GroupingUnitFieldId;
+
+
+            var groupingType = await jobGroupTypeService.Get().FirstAsync(t => t.Code == JobGroupTypesEnum.Group);
+
+            if (request.GroupTypeId == groupingType.Id)
+            {
+                // Это сгруппированный тип, все ок
+                return request.GroupingUnitFieldId;
+            }
+            else
+            {
+                // Это не сгруппированный тип, обнуляем GroupingUnitFieldId
+                logger.LogWarning($"При сохраненни JobGroup, был передан {nameof(request.GroupingUnitFieldId)}: {request.GroupingUnitFieldId}, но при этом тип группы был не ГРУППА, а {request.GroupTypeId}. Обнулил request.GroupingUnitFieldId");
+                return null;
+            }
         }
     }
 }