Updated WebApiToolkit from 5.1.0 to 5.2.0

EvilLord666 · EvilLord666 · commit ce62de9dc6c9 · 2025-11-09T17:57:09.000+05:00
diff --git a/WeatherControl/Wissance.WeatherControl.Common/Wissance.WeatherControl.Common.csproj b/WeatherControl/Wissance.WeatherControl.Common/Wissance.WeatherControl.Common.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Wissance.WebApiToolkit.Core" Version="5.1.0" />
+      <PackageReference Include="Wissance.WebApiToolkit.Core" Version="5.2.0" />
     </ItemGroup>
 
 </Project>
diff --git a/WeatherControl/Wissance.WeatherControl.Data/Wissance.WeatherControl.Data.csproj b/WeatherControl/Wissance.WeatherControl.Data/Wissance.WeatherControl.Data.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-      <PackageReference Include="Wissance.WebApiToolkit.Core" Version="5.1.0" />
+      <PackageReference Include="Wissance.WebApiToolkit.Core" Version="5.2.0" />
     </ItemGroup>
 
 </Project>
diff --git a/WeatherControl/Wissance.WeatherControl.Ef.Data/Wissance.WeatherControl.Ef.Data.csproj b/WeatherControl/Wissance.WeatherControl.Ef.Data/Wissance.WeatherControl.Ef.Data.csproj
@@ -17,7 +17,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Wissance.WebApiToolkit.Data.Ef" Version="5.1.0" />
+    <PackageReference Include="Wissance.WebApiToolkit.Data.Ef" Version="5.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/WeatherControl/Wissance.WeatherControl.SemiAuto.WebApi/Controllers/EmptyController.cs b/WeatherControl/Wissance.WeatherControl.SemiAuto.WebApi/Controllers/EmptyController.cs
@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace Wissance.WeatherControl.SemiAuto.WebApi.Controllers
+{
+    [ApiController]
+    public class EmptyController : ControllerBase
+    {
+    }
+}
diff --git a/WeatherControl/Wissance.WeatherControl.SemiAuto.WebApi/Startup.cs b/WeatherControl/Wissance.WeatherControl.SemiAuto.WebApi/Startup.cs
@@ -93,23 +93,28 @@ private void ConfigureWebApi(IServiceCollection services)
         {
             services.AddSwaggerGen();
             ServiceProvider provider = services.BuildServiceProvider();
-            Assembly stationControllerAssembly = services.AddSimplifiedAutoController<StationEntity, Guid, EmptyAdditionalFilters>(
-                provider.GetRequiredService<ModelContext>(), "Station",
-                ControllerType.FullCrud, null, provider.GetRequiredService<ILoggerFactory>());
-            Assembly measureUnitControllerAssembly = services.AddSimplifiedAutoController<MeasureUnitEntity, Guid, EmptyAdditionalFilters>(
-                provider.GetRequiredService<ModelContext>(), "MeasureUnit",
-                ControllerType.ReadOnly, null, provider.GetRequiredService<ILoggerFactory>());
-            Assembly sensorControllerAssembly = services.AddSimplifiedAutoController<SensorEntity, Guid, EmptyAdditionalFilters>(
-                provider.GetRequiredService<ModelContext>(), "Sensor",
-                ControllerType.FullCrud, null, provider.GetRequiredService<ILoggerFactory>());
-            Assembly measurementControllerAssembly = services.AddSimplifiedAutoController<MeasurementEntity, Guid, EmptyAdditionalFilters>(
-                provider.GetRequiredService<ModelContext>(), "Measurement",
-                ControllerType.Bulk, null, provider.GetRequiredService<ILoggerFactory>());
-            
-            services.AddControllers().AddApplicationPart(sensorControllerAssembly).AddControllersAsServices();
-            services.AddControllers().AddApplicationPart(stationControllerAssembly).AddControllersAsServices();
+            ModelContext dbContext = provider.GetRequiredService<ModelContext>();
+            ILoggerFactory loggerFactory = provider.GetRequiredService<ILoggerFactory>();
+
+            Assembly measureUnitControllerAssembly =
+                services.AddSimplifiedAutoController<ModelContext, MeasureUnitEntity, Guid, EmptyAdditionalFilters>(dbContext,
+                    "MeasureUnit", ControllerType.ReadOnly, null, loggerFactory);
+            Assembly stationControllerAssembly =
+                services.AddSimplifiedAutoController<ModelContext, StationEntity, Guid, EmptyAdditionalFilters>(dbContext,
+                    "Station", ControllerType.FullCrud, null, loggerFactory);
+            Assembly sensorControllerAssembly =
+                services.AddSimplifiedAutoController<ModelContext, SensorEntity, Guid, EmptyAdditionalFilters>(dbContext,
+                    "Sensor", ControllerType.FullCrud, null, loggerFactory);
+            Assembly measurementControllerAssembly =
+                services.AddSimplifiedAutoController<ModelContext, MeasurementEntity, Guid, EmptyAdditionalFilters>(dbContext,
+                    "Measurement", ControllerType.Bulk, null, loggerFactory);
+
             services.AddControllers().AddApplicationPart(measureUnitControllerAssembly).AddControllersAsServices();
+            services.AddControllers().AddApplicationPart(stationControllerAssembly).AddControllersAsServices();
+            services.AddControllers().AddApplicationPart(sensorControllerAssembly).AddControllersAsServices();
             services.AddControllers().AddApplicationPart(measurementControllerAssembly).AddControllersAsServices();
+
+            services.AddControllers();
         }
         
         public ApplicationSettings Settings { get; set; }
diff --git a/WeatherControl/Wissance.WeatherControl.SemiAuto.WebApi/Wissance.WeatherControl.SemiAuto.WebApi.csproj b/WeatherControl/Wissance.WeatherControl.SemiAuto.WebApi/Wissance.WeatherControl.SemiAuto.WebApi.csproj
@@ -17,7 +17,7 @@
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
         <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
         <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
-        <PackageReference Include="Wissance.WebApiToolkit.Ef" Version="5.1.0" />
+        <PackageReference Include="Wissance.WebApiToolkit.Ef" Version="5.2.0" />
         <!--<PackageReference Include="Wissance.WebApiToolkit.Ef" Version="5.0.0" />-->
     </ItemGroup>
 
diff --git a/WeatherControl/Wissance.WeatherControl.WebApi.V2/Wissance.WeatherControl.WebApi.V2.csproj b/WeatherControl/Wissance.WeatherControl.WebApi.V2/Wissance.WeatherControl.WebApi.V2.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
     <PackageReference Include="Wissance.EdgeDb.Configurator" Version="1.2.0" />
-    <PackageReference Include="Wissance.WebApiToolkit.Core" Version="5.1.0" />
+    <PackageReference Include="Wissance.WebApiToolkit.Core" Version="5.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/WeatherControl/Wissance.WeatherControl/Factory/MeasureUnitFactory.cs b/WeatherControl/Wissance.WeatherControl/Factory/MeasureUnitFactory.cs
@@ -1,22 +1,12 @@
 using System;
+using Wissance.WeatherControl.Data;
 using Wissance.WeatherControl.Data.Entity;
 using Wissance.WeatherControl.Dto;
 
 namespace Wissance.WeatherControl.WebApi.Factory
 {
     internal static class MeasureUnitFactory
     {
-        public static MeasureUnitEntity Create(MeasureUnitDto dto)
-        {
-            MeasureUnitEntity entity = new MeasureUnitEntity()
-            {
-                Name = dto.Name,
-                Description = dto.Description,
-                Abbreviation = dto.Abbreviation
-            };
-            return entity;
-        }
-
         public static MeasureUnitDto Create(MeasureUnitEntity entity)
         {
             return new MeasureUnitDto()
@@ -27,8 +17,19 @@ public static MeasureUnitDto Create(MeasureUnitEntity entity)
                 Abbreviation = entity.Abbreviation
             };
         }
+        
+        public static MeasureUnitEntity Create(MeasureUnitDto dto, ModelContext context)
+        {
+            MeasureUnitEntity entity = new MeasureUnitEntity()
+            {
+                Name = dto.Name,
+                Description = dto.Description,
+                Abbreviation = dto.Abbreviation
+            };
+            return entity;
+        }
 
-        public static void Update(MeasureUnitDto data, Guid id, MeasureUnitEntity entity)
+        public static void Update(MeasureUnitDto data, Guid id, ModelContext context, MeasureUnitEntity entity)
         {
             entity.Name = data.Name;
             entity.Description = data.Description;
diff --git a/WeatherControl/Wissance.WeatherControl/Factory/MeasurementFactory.cs b/WeatherControl/Wissance.WeatherControl/Factory/MeasurementFactory.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Wissance.WeatherControl.Data;
 using Wissance.WeatherControl.Data.Entity;
 using Wissance.WeatherControl.Dto;
 
@@ -14,7 +15,7 @@ public static MeasurementDto Create(MeasurementEntity entity)
             return new MeasurementDto(entity.Id, entity.SampleDate, entity.Value, entity.SensorId);
         }
 
-        public static MeasurementEntity Create(MeasurementDto dto)
+        public static MeasurementEntity Create(MeasurementDto dto, ModelContext context)
         {
             return new MeasurementEntity()
             {
@@ -25,7 +26,7 @@ public static MeasurementEntity Create(MeasurementDto dto)
             };
         }
 
-        public static void Update(MeasurementDto data, Guid id, MeasurementEntity entity)
+        public static void Update(MeasurementDto data, Guid id, ModelContext context, MeasurementEntity entity)
         {
             entity.Value = data.Value;
             entity.SampleDate = data.SampleDate;
diff --git a/WeatherControl/Wissance.WeatherControl/Factory/SensorFactory.cs b/WeatherControl/Wissance.WeatherControl/Factory/SensorFactory.cs
@@ -1,4 +1,5 @@
 using System;
+using Wissance.WeatherControl.Data;
 using Wissance.WeatherControl.Data.Entity;
 using Wissance.WeatherControl.Dto;
 
@@ -20,7 +21,7 @@ public static SensorEntity Create(SensorDto dto)
             return entity;
         }
 
-        public static SensorEntity Create(SensorMinDataDto dto)
+        public static SensorEntity Create(SensorMinDataDto dto, ModelContext context)
         {
             SensorEntity entity = new SensorEntity()
             {
@@ -63,7 +64,7 @@ public static SensorMinDataDto CreateMin(SensorEntity entity)
             };
         }
 
-        public static void Update(SensorDto data, Guid id, SensorEntity entity)
+        public static void Update(SensorDto data, Guid id, ModelContext context, SensorEntity entity)
         {
             entity.Name = data.Name;
             entity.Description = data.Description;
diff --git a/WeatherControl/Wissance.WeatherControl/Factory/StationFactory.cs b/WeatherControl/Wissance.WeatherControl/Factory/StationFactory.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Wissance.WeatherControl.Data;
 using Wissance.WeatherControl.Data.Entity;
 using Wissance.WeatherControl.Dto;
 
@@ -21,7 +22,7 @@ public static StationDto Create(StationEntity entity)
             return dto;
         }
 
-        public static StationEntity Create(StationDto dto)
+        public static StationEntity Create(StationDto dto, ModelContext context)
         {
             StationEntity entity = new StationEntity()
             {
@@ -33,13 +34,13 @@ public static StationEntity Create(StationDto dto)
 
             if (dto.Sensors != null)
             {
-                entity.Sensors = dto.Sensors.Select(s => SensorFactory.Create(s)).ToList();
+                entity.Sensors = dto.Sensors.Select(s => SensorFactory.Create(s, context)).ToList();
             }
 
             return entity;
         }
 
-        public static void Update(StationDto data, Guid id, StationEntity entity)
+        public static void Update(StationDto data, Guid id, ModelContext context, StationEntity entity)
         {
             entity.Name = data.Name;
             entity.Description = data.Description;
diff --git a/WeatherControl/Wissance.WeatherControl/Managers/MeasureUnitManager.cs b/WeatherControl/Wissance.WeatherControl/Managers/MeasureUnitManager.cs
@@ -13,7 +13,7 @@
 
 namespace Wissance.WeatherControl.WebApi.Managers
 {
-    public class MeasureUnitManager : EfModelManager<MeasureUnitDto, MeasureUnitEntity, Guid>
+    public class MeasureUnitManager : EfModelManager<ModelContext, MeasureUnitDto, MeasureUnitEntity, Guid>
     {
         public MeasureUnitManager(ModelContext modelContext, ILoggerFactory loggerFactory) 
             : base(modelContext, null, MeasureUnitFactory.Create, MeasureUnitFactory.Create, 
diff --git a/WeatherControl/Wissance.WeatherControl/Managers/MeasurementManager.cs b/WeatherControl/Wissance.WeatherControl/Managers/MeasurementManager.cs
@@ -15,7 +15,7 @@
 
 namespace Wissance.WeatherControl.WebApi.Managers
 {
-    public class MeasurementManager : EfModelManager<MeasurementDto, MeasurementEntity, Guid>
+    public class MeasurementManager : EfModelManager<ModelContext, MeasurementDto, MeasurementEntity, Guid>
     {
         public MeasurementManager(ModelContext modelContext, ILoggerFactory loggerFactory) 
             : base(modelContext, MeasurementsFilter.Filter, MeasurementFactory.Create, 
diff --git a/WeatherControl/Wissance.WeatherControl/Managers/SensorManager.cs b/WeatherControl/Wissance.WeatherControl/Managers/SensorManager.cs
@@ -14,7 +14,7 @@
 
 namespace Wissance.WeatherControl.WebApi.Managers
 {
-    public class SensorManager: EfModelManager<SensorDto, SensorEntity,  Guid>
+    public class SensorManager: EfModelManager<ModelContext, SensorDto, SensorEntity,  Guid>
     {
         public SensorManager(ModelContext modelContext, ILoggerFactory loggerFactory) 
             : base(modelContext, SensorFilter.Filter, SensorFactory.Create, SensorFactory.Create, 
diff --git a/WeatherControl/Wissance.WeatherControl/Managers/StationManager.cs b/WeatherControl/Wissance.WeatherControl/Managers/StationManager.cs
@@ -13,7 +13,7 @@
 
 namespace Wissance.WeatherControl.WebApi.Managers
 {
-    public class StationManager : EfModelManager<StationDto, StationEntity, Guid>
+    public class StationManager : EfModelManager<ModelContext, StationDto, StationEntity, Guid>
     {
         public StationManager(ModelContext modelContext, ILoggerFactory loggerFactory) 
             : base(modelContext, StationFilter.Filter, StationFactory.Create, StationFactory.Create,
diff --git a/WeatherControl/Wissance.WeatherControl/Wissance.WeatherControl.WebApi.csproj b/WeatherControl/Wissance.WeatherControl/Wissance.WeatherControl.WebApi.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.5.0" />
-    <PackageReference Include="Wissance.WebApiToolkit.Ef" Version="5.1.0" />
+    <PackageReference Include="Wissance.WebApiToolkit.Ef" Version="5.2.0" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Threading.Tasks;`
	`5`	`+using Wissance.WeatherControl.Data;`
`5`	`6`	`using Wissance.WeatherControl.Data.Entity;`
`6`	`7`	`using Wissance.WeatherControl.Dto;`
`7`	`8`
`@@ -14,7 +15,7 @@ public static MeasurementDto Create(MeasurementEntity entity)`
`14`	`15`	`return new MeasurementDto(entity.Id, entity.SampleDate, entity.Value, entity.SensorId);`
`15`	`16`	`}`
`16`	`17`
`17`		`- public static MeasurementEntity Create(MeasurementDto dto)`
	`18`	`+ public static MeasurementEntity Create(MeasurementDto dto, ModelContext context)`
`18`	`19`	`{`
`19`	`20`	`return new MeasurementEntity()`
`20`	`21`	`{`
`@@ -25,7 +26,7 @@ public static MeasurementEntity Create(MeasurementDto dto)`
`25`	`26`	`};`
`26`	`27`	`}`
`27`	`28`
`28`		`- public static void Update(MeasurementDto data, Guid id, MeasurementEntity entity)`
	`29`	`+ public static void Update(MeasurementDto data, Guid id, ModelContext context, MeasurementEntity entity)`
`29`	`30`	`{`
`30`	`31`	`entity.Value = data.Value;`
`31`	`32`	`entity.SampleDate = data.SampleDate;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using Wissance.WeatherControl.Data;`
`2`	`3`	`using Wissance.WeatherControl.Data.Entity;`
`3`	`4`	`using Wissance.WeatherControl.Dto;`
`4`	`5`
`@@ -20,7 +21,7 @@ public static SensorEntity Create(SensorDto dto)`
`20`	`21`	`return entity;`
`21`	`22`	`}`
`22`	`23`
`23`		`- public static SensorEntity Create(SensorMinDataDto dto)`
	`24`	`+ public static SensorEntity Create(SensorMinDataDto dto, ModelContext context)`
`24`	`25`	`{`
`25`	`26`	`SensorEntity entity = new SensorEntity()`
`26`	`27`	`{`
`@@ -63,7 +64,7 @@ public static SensorMinDataDto CreateMin(SensorEntity entity)`
`63`	`64`	`};`
`64`	`65`	`}`
`65`	`66`
`66`		`- public static void Update(SensorDto data, Guid id, SensorEntity entity)`
	`67`	`+ public static void Update(SensorDto data, Guid id, ModelContext context, SensorEntity entity)`
`67`	`68`	`{`
`68`	`69`	`entity.Name = data.Name;`
`69`	`70`	`entity.Description = data.Description;`