UPDATE: add prototype of productionSites api - Ws.DeviceControl.Api

Author: BaggerFast

Src/Apps/Web/DeviceControl/Source/Pages/Diagnostics/Migrations/MigrationsPage.razor

@@ -1,5 +1,5 @@
 @using DeviceControl.Source.Shared.Services
-@using Ws.DeviceControl.Models.Models.Database
+@using Ws.DeviceControl.Models.Dto.Database
 @attribute [Route($"{RouteUtils.SectionMigrations}")]
 @attribute [Authorize(Policy = PolicyEnum.Admin)]
 @rendermode InteractiveServer
@@ -13,18 +13,18 @@
 
   <DataGridWrapper>
     <DataGridContainer
-      TItem="MigrationHistoryEntry"
+      TItem="MigrationHistoryDto"
       Items="@(migrationsQuery.HasData ? migrationsQuery.Data : [])"
     >
       <ColumnsContent>
         <DataGridColumn
           Caption="@WsDataLocalizer["ColVersion"]"
-          Field="@nameof(MigrationHistoryEntry.ProductVersion)"
+          Field="@nameof(MigrationHistoryDto.ProductVersion)"
           Width="10%"
         />
         <DataGridColumn
           Caption="@WsDataLocalizer["ColName"]"
-          Field="@nameof(MigrationHistoryEntry.MigrationId)"
+          Field="@nameof(MigrationHistoryDto.MigrationId)"
           Width="90%"
         />
       </ColumnsContent>

Src/Apps/Web/DeviceControl/Source/Pages/Diagnostics/Tables/TablesPage.razor

@@ -1,5 +1,5 @@
 @using DeviceControl.Source.Shared.Services
-@using Ws.DeviceControl.Models.Models.Database
+@using Ws.DeviceControl.Models.Dto.Database
 @attribute [Route($"{RouteUtils.SectionTables}")]
 @attribute [Authorize(Policy = PolicyEnum.Admin)]
 @rendermode InteractiveServer
@@ -13,14 +13,14 @@
 
   <DataGridWrapper>
     <DataGridContainer
-      TItem="DataBaseTableEntry"
+      TItem="DataBaseTableDto"
       Items="@(tablesQuery.HasData ? tablesQuery.Data : [])"
       IsFilterable
     >
       <ColumnsContent>
         <DataGridColumn
           Caption="@WsDataLocalizer["ColScheme"]"
-          Field="@nameof(DataBaseTableEntry.Schema)"
+          Field="@nameof(DataBaseTableDto.Schema)"
           Width="20%"
           Sortable="false"
           FilterMethod="DataGridColumnFilterMethod.Equals"
@@ -48,19 +48,19 @@
 
         <DataGridColumn
           Caption="@WsDataLocalizer["ColName"]"
-          Field="@nameof(DataBaseTableEntry.Table)"
+          Field="@nameof(DataBaseTableDto.Table)"
           Width="30%"
         />
 
         <DataGridColumn
           Caption="Количество записей"
-          Field="@nameof(DataBaseTableEntry.Rows)"
+          Field="@nameof(DataBaseTableDto.Rows)"
           Width="25%"
           Filterable="false"
         />
         <DataGridColumn
           Caption="@($"{WsDataLocalizer["ColSize"]} ({WsDataLocalizer["MeasureMb"]})")"
-          Field="@nameof(DataBaseTableEntry.UsedMb)"
+          Field="@nameof(DataBaseTableDto.UsedMb)"
           Width="25%"
           Filterable="false"
         />

Src/Apps/Web/DeviceControl/Source/Pages/Operations/Labels/LabelsPage.razor

@@ -31,6 +31,7 @@
       <DataGridColumn
         Caption="@WsDataLocalizer["ColProductDt"]"
         Field="@nameof(Label.ProductDt)"
+        DisplayFormat="{0:dd.MM.yyyy}"
         Filterable="false"
         Width="10%"
       />

Src/Apps/Web/DeviceControl/Source/Pages/Operations/Labels/LabelsUpdateForm.razor

@@ -68,12 +68,12 @@
 
     <SectionReadOnlyField
       Label="@WsDataLocalizer["ColProductDt"]"
-      Value="@DialogItem.ProductDt"
+      Value="@DialogItem.ProductDt.ToString("dd.MM.yyyy")"
     />
 
     <SectionReadOnlyField
       Label="@WsDataLocalizer["ColExpirationDt"]"
-      Value="@DialogItem.ExpirationDt"
+      Value="@DialogItem.ExpirationDt.ToString("dd.MM.yyyy")"
     />
 
   </FieldsContent>

Src/Apps/Web/DeviceControl/Source/Shared/Services/DatabaseApi.cs

@@ -1,19 +1,19 @@
 using Phetch.Core;
 using Ws.DeviceControl.Models;
-using Ws.DeviceControl.Models.Models.Database;
+using Ws.DeviceControl.Models.Dto.Database;
 
 namespace DeviceControl.Source.Shared.Services;
 
 public class DatabaseApi(IWebApi webApi)
 {
-    public ParameterlessEndpoint<MigrationHistoryEntry[]> MigrationsEndpoint { get; } = new(
+    public ParameterlessEndpoint<MigrationHistoryDto[]> MigrationsEndpoint { get; } = new(
         webApi.GetMigrations,
         options: new()
         {
             DefaultStaleTime = TimeSpan.FromMinutes(5),
         });
 
-    public ParameterlessEndpoint<DataBaseTableEntry[]> TablesEndpoint { get; } = new(
+    public ParameterlessEndpoint<DataBaseTableDto[]> TablesEndpoint { get; } = new(
         webApi.GetTables,
         options: new()
         {

Src/Apps/Web/Ws.DeviceControl.Api/App/Features/Database/Common/IDatabaseService.cs

@@ -0,0 +1,9 @@
+using Ws.DeviceControl.Models.Dto.Database;
+
+namespace Ws.DeviceControl.Api.App.Features.Diag.Database.Common;
+
+public interface IDatabaseService
+{
+    List<MigrationHistoryDto> GetAllMigrations();
+    List<DataBaseTableDto> GetAllTables();
+}

Src/Apps/Web/Ws.DeviceControl.Api/App/Features/Database/DatabaseController.cs

@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Mvc;
+using Ws.DeviceControl.Api.App.Features.Diag.Database.Common;
+using Ws.DeviceControl.Models.Dto.Database;
+
+namespace Ws.DeviceControl.Api.App.Features.Diag.Database;
+
+[ApiController]
+[Route("api/database/")]
+public class DatabaseController(IDatabaseService databaseService)
+{
+    #region Queries
+
+    [HttpGet("migrations")]
+    public List<MigrationHistoryDto> GetAllMigrations() => databaseService.GetAllMigrations();
+
+    [HttpGet("tables")]
+    public List<DataBaseTableDto> GetAllTables() => databaseService.GetAllTables();
+
+    #endregion
+}

Src/Apps/Web/Ws.DeviceControl.Api/App/Features/Diag/Database/Common/IDatabaseService.cs

@@ -1,24 +1,24 @@
 using System.Runtime.CompilerServices;
 using Microsoft.EntityFrameworkCore;
 using Ws.Database.EntityFramework;
-using Ws.DeviceControl.Api.App.Features.Database.Common;
-using Ws.DeviceControl.Models.Models.Database;
+using Ws.DeviceControl.Api.App.Features.Diag.Database.Common;
+using Ws.DeviceControl.Models.Dto.Database;
 
-namespace Ws.DeviceControl.Api.App.Features.Database.Impl;
+namespace Ws.DeviceControl.Api.App.Features.Diag.Database.Impl;
 
 public class DatabaseService(WsDbContext dbContext) : IDatabaseService
 {
-    public List<MigrationHistoryEntry> GetAllMigrations()
+    public List<MigrationHistoryDto> GetAllMigrations()
     {
         FormattableString getMigrationSql = FormattableStringFactory.Create("SELECT * FROM dbo.__EFMigrationsHistory");
-        List<MigrationHistoryEntry> data = dbContext.Database.SqlQuery<MigrationHistoryEntry>(getMigrationSql).ToList();
+        List<MigrationHistoryDto> data = dbContext.Database.SqlQuery<MigrationHistoryDto>(getMigrationSql).ToList();
         data.Reverse();
         return data;
     }
 
-    public List<DataBaseTableEntry> GetAllTables()
+    public List<DataBaseTableDto> GetAllTables()
     {
-        return dbContext.DatabaseTables.Select(i => new DataBaseTableEntry
+        return dbContext.DatabaseTables.Select(i => new DataBaseTableDto
             {
                 Schema = i.Schema,
                 Table = i.Table,

Src/Apps/Web/Ws.DeviceControl.Api/App/Features/Diag/Database/DatabaseController.cs

@@ -0,0 +1,21 @@
+using Ws.DeviceControl.Models.Dto.References.ProductionSites.Commands.Create;
+using Ws.DeviceControl.Models.Dto.References.ProductionSites.Commands.Update;
+using Ws.DeviceControl.Models.Dto.References.ProductionSites.Queries;
+
+namespace Ws.DeviceControl.Api.App.Features.References.ProductionSites.Common;
+
+public interface IProductionSiteService
+{
+    #region Queries
+
+    Task<List<ProductionSiteDto>> GetAllAsync();
+
+    #endregion
+
+    #region Commands
+
+    Task<ProductionSiteDto> CreateAsync(ProductionSiteCreateDto dto);
+    Task<ProductionSiteDto> UpdateAsync(Guid id, ProductionSiteUpdateDto dto);
+
+    #endregion
+}

Src/Apps/Web/Ws.DeviceControl.Api/App/Features/Database/Impl/DatabaseService.cs Src/Apps/Web/Ws.DeviceControl.Api/App/Features/Diag/Database/Impl/DatabaseService.cs

@@ -0,0 +1,18 @@
+using System.Linq.Expressions;
+using Ws.Database.EntityFramework.Entities.Ref.ProductionSites;
+using Ws.DeviceControl.Models.Dto.References.ProductionSites.Queries;
+
+namespace Ws.DeviceControl.Api.App.Features.References.ProductionSites.Impl.Expressions;
+
+public static class ProductionSiteExpressions
+{
+    public static Expression<Func<ProductionSiteEntity, ProductionSiteDto>> ToDto =>
+        productionSite => new()
+        {
+            Id = productionSite.Id,
+            Name = productionSite.Name,
+            Address = productionSite.Address,
+            CreateDt = productionSite.CreateDt,
+            ChangeDt = productionSite.ChangeDt
+        };
+}

Src/Apps/Web/Ws.DeviceControl.Api/App/Features/References/ProductionSites/Common/IProductionSiteService.cs

@@ -0,0 +1,53 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using Ws.Database.EntityFramework;
+using Ws.Database.EntityFramework.Entities.Ref.ProductionSites;
+using Ws.DeviceControl.Api.App.Features.References.ProductionSites.Common;
+using Ws.DeviceControl.Api.App.Features.References.ProductionSites.Impl.Expressions;
+using Ws.DeviceControl.Models.Dto.References.ProductionSites.Queries;
+using Ws.DeviceControl.Models.Dto.References.ProductionSites.Commands.Create;
+using Ws.DeviceControl.Models.Dto.References.ProductionSites.Commands.Update;
+
+namespace Ws.DeviceControl.Api.App.Features.References.ProductionSites.Impl;
+
+public class ProductionSiteService(WsDbContext dbContext): IProductionSiteService
+{
+    #region Queries
+
+    public Task<List<ProductionSiteDto>> GetAllAsync() => dbContext.ProductionSites
+        .AsNoTracking().Select(ProductionSiteExpressions.ToDto)
+        .OrderBy(i => i.Name)
+        .ToListAsync();
+
+    #endregion
+
+    #region Commands
+
+    public async Task<ProductionSiteDto> CreateAsync(ProductionSiteCreateDto dto)
+    {
+        ProductionSiteEntity item = new()
+        {
+            Name = dto.Name,
+            Address = dto.Address,
+        };
+       await dbContext.ProductionSites.AddAsync(item);
+
+       await dbContext.SaveChangesAsync();
+
+       return ProductionSiteExpressions.ToDto.Compile().Invoke(item);
+    }
+
+    public Task<ProductionSiteDto> UpdateAsync(Guid id, ProductionSiteUpdateDto dto)
+    {
+        return Task.FromResult<ProductionSiteDto>(new()
+        {
+            Id = default,
+            Name = string.Empty,
+            Address = string.Empty,
+            CreateDt = default,
+            ChangeDt = default
+        });
+    }
+
+    #endregion
+}

Src/Apps/Web/Ws.DeviceControl.Api/App/Features/References/ProductionSites/Impl/Expressions/ProductionSiteExpressions.cs

@@ -0,0 +1,31 @@
+using Microsoft.AspNetCore.Mvc;
+using Ws.DeviceControl.Api.App.Features.References.ProductionSites.Common;
+using Ws.DeviceControl.Models.Dto.References.ProductionSites.Commands.Create;
+using Ws.DeviceControl.Models.Dto.References.ProductionSites.Commands.Update;
+using Ws.DeviceControl.Models.Dto.References.ProductionSites.Queries;
+
+namespace Ws.DeviceControl.Api.App.Features.References.ProductionSites;
+
+[ApiController]
+[Route("api/production-sites/")]
+public class ProductionSiteController(IProductionSiteService productionSiteService)
+{
+    #region Queries
+
+    [HttpGet]
+    public Task<List<ProductionSiteDto>> GetAllMigrations() => productionSiteService.GetAllAsync();
+
+    #endregion
+
+    #region Commamnds
+
+    [HttpPost]
+    public Task<ProductionSiteDto> Create([FromBody] ProductionSiteCreateDto dto) =>
+        productionSiteService.CreateAsync(dto);
+
+    [HttpPut("{id:guid}")]
+    public Task<ProductionSiteDto> Update([FromRoute] Guid id, [FromBody] ProductionSiteUpdateDto dto) =>
+        productionSiteService.UpdateAsync(id, dto);
+
+    #endregion
+}

Src/Apps/Web/Ws.DeviceControl.Api/App/Features/References/ProductionSites/Impl/ProductionSiteService.cs

@@ -3,8 +3,10 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Authorization;
 using Ws.Database.EntityFramework;
-using Ws.DeviceControl.Api.App.Features.Database.Common;
-using Ws.DeviceControl.Api.App.Features.Database.Impl;
+using Ws.DeviceControl.Api.App.Features.Diag.Database.Common;
+using Ws.DeviceControl.Api.App.Features.Diag.Database.Impl;
+using Ws.DeviceControl.Api.App.Features.References.ProductionSites.Common;
+using Ws.DeviceControl.Api.App.Features.References.ProductionSites.Impl;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -13,6 +15,7 @@
 #region Internal services
 
 builder.Services.AddScoped<IDatabaseService, DatabaseService>();
+builder.Services.AddScoped<IProductionSiteService, ProductionSiteService>();
 
 #endregion
 

Src/Apps/Web/Ws.DeviceControl.Api/App/Features/References/ProductionSites/ProductionSiteController.cs

@@ -0,0 +1,12 @@
+GET https://localhost:5138/api/production-sites
+
+###
+
+
+POST https://localhost:5138/api/production-sites
+Content-Type: application/json
+
+{
+    "name": "Tets",
+    "address": "dawdadwdaw"
+}

Src/Apps/Web/Ws.DeviceControl.Api/Program.cs

@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
 
-namespace Ws.DeviceControl.Models.Models.Database;
+namespace Ws.DeviceControl.Models.Dto.Database;
 
-public sealed record DataBaseTableEntry
+public sealed record DataBaseTableDto
 {
     [JsonPropertyName("rows")]
     public required int Rows { get; init; }