Merge branch 'dev' into feature/refactoring_api_route

AsbCloudInfrastructure/Services/WellOperationService/OperationsStatService.cs

@@ -431,6 +431,9 @@ namespace AsbCloudInfrastructure.Services.WellOperationService
             var tzOffsetHours = wellService.GetTimezone(idWell).Hours;
 
             var merged = MergeArraysBySections(sectionsIds, wellOperationsPlan, wellOperationsFact).ToList();
+            if (merged.Count ==0)
+                return Enumerable.Empty<PlanFactPredictBase<WellOperationDto>>();
+
             var tvd = new List<PlanFactPredictBase<WellOperationDto>>(merged.Count);
             var (Plan, Fact) = merged.FirstOrDefault();
             var dateStart = Plan?.DateStart ?? Fact!.DateStart;

AsbCloudWebApi/Controllers/UserSettingsController.cs

@@ -94,7 +94,7 @@ namespace AsbCloudWebApi.Controllers
         /// <returns></returns>
         [HttpDelete("/api/admin/user/{idUser}/settings")]
         [Permission]
-        public virtual async Task<ActionResult<int>> DeleteAsync(int idUser, CancellationToken token)
+        public virtual async Task<ActionResult<int>> DeleteAllAsync(int idUser, CancellationToken token)
         {
             var result = await service.DeleteAsync(idUser, token).ConfigureAwait(false);