UPDATE: reorganize usings - Ws.Domain.Services

Author: BaggerFast

Src/Apps/Desktop/ScalesDesktop/Source/GlobalUsings.cs

@@ -9,12 +9,13 @@
 global using Refit;
 global using Phetch.Core;
 
-
 // MODULES
 global using Ws.Shared.Resources;
 
 // INTERNAL
 global using ScalesDesktop.Source.Shared.Models;
 global using ScalesDesktop.Source.Shared.Utils;
 global using ScalesDesktop.Source.Shared.Services;
-global using ScalesDesktop.Source.Shared.Localization;
+global using ScalesDesktop.Source.Shared.Localization;
+global using ScalesDesktop.Source.Shared.Services.Api;
+global using ScalesDesktop.Source.Shared.Services.Contexts;

Src/Apps/Desktop/ScalesDesktop/Source/Shared/Services/ArmApi.cs Src/Apps/Desktop/ScalesDesktop/Source/Shared/Services/Api/ArmApi.cs

@@ -2,7 +2,7 @@
 using Ws.Desktop.Models;
 using Ws.Desktop.Models.Features.Arms.Output;
 
-namespace ScalesDesktop.Source.Shared.Services;
+namespace ScalesDesktop.Source.Shared.Services.Api;
 
 public class ArmApi(IDesktopApi desktopApi, PrinterService printerService)
 {

Src/Apps/Desktop/ScalesDesktop/Source/Shared/Services/PalletApi.cs Src/Apps/Desktop/ScalesDesktop/Source/Shared/Services/Api/PalletApi.cs

@@ -2,7 +2,7 @@
 using Ws.Desktop.Models.Features.PalletMen;
 using Ws.Desktop.Models.Features.Pallets.Output;
 
-namespace ScalesDesktop.Source.Shared.Services;
+namespace ScalesDesktop.Source.Shared.Services.Api;
 
 public class PalletApi(IDesktopApi desktopApi)
 {

Src/Apps/Desktop/ScalesDesktop/Source/Shared/Services/PluApi.cs Src/Apps/Desktop/ScalesDesktop/Source/Shared/Services/Api/PluApi.cs

@@ -2,7 +2,7 @@
 using Ws.Desktop.Models.Features.Plus.Piece.Output;
 using Ws.Desktop.Models.Features.Plus.Weight.Output;
 
-namespace ScalesDesktop.Source.Shared.Services;
+namespace ScalesDesktop.Source.Shared.Services.Api;
 
 public class PluApi(IDesktopApi desktopApi)
 {

Src/Apps/Desktop/ScalesDesktop/Source/Shared/Services/LabelContext.cs Src/Apps/Desktop/ScalesDesktop/Source/Shared/Services/Contexts/LabelContext.cs

@@ -1,6 +1,6 @@
 using Ws.Desktop.Models.Features.Plus.Weight.Output;
 
-namespace ScalesDesktop.Source.Shared.Services;
+namespace ScalesDesktop.Source.Shared.Services.Contexts;
 
 public class LabelContext
 {

Src/Apps/Desktop/ScalesDesktop/Source/Shared/Services/PalletContext.cs Src/Apps/Desktop/ScalesDesktop/Source/Shared/Services/Contexts/PalletContext.cs

@@ -1,7 +1,7 @@
 using Ws.Desktop.Models.Features.PalletMen;
 using Ws.Desktop.Models.Features.Pallets.Output;
 
-namespace ScalesDesktop.Source.Shared.Services;
+namespace ScalesDesktop.Source.Shared.Services.Contexts;
 
 public class PalletContext {
     public PalletInfo? Pallet { get; private set; }

Src/Apps/Desktop/ScalesDesktop/Source/Widgets/LabelDisplay/LabelDisplay.razor

@@ -27,4 +27,4 @@
       </div>
     </div>
   </LabelDisplayErrorBoundary>
-</div>
+</div>

Src/Apps/Desktop/ScalesDesktop/Source/Widgets/LabelDisplay/LabelDisplayErrorBoundary.razor

@@ -44,4 +44,4 @@
   protected override void OnInitialized() => LabelContext.StateChanged += StateHasChanged;
 
   public void Dispose() => LabelContext.StateChanged -= StateHasChanged;
-}
+}

Src/Apps/Desktop/ScalesDesktop/Source/Widgets/LabelDisplay/LabelDisplayNetWeight.razor

@@ -18,4 +18,4 @@
       <span>@WsDataLocalizer["MeasureKg"]</span>
     </div>
   }
-</LabelDisplayItem>
+</LabelDisplayItem>

Src/Apps/Desktop/ScalesDesktop/Source/_Imports.razor

@@ -23,6 +23,8 @@
 @using ScalesDesktop.Source.Shared.Models
 @using ScalesDesktop.Source.Shared.Services
 @using ScalesDesktop.Source.Shared.Localization
+@using ScalesDesktop.Source.Shared.Services.Api
+@using ScalesDesktop.Source.Shared.Services.Contexts
 
 @* MODULES *@
 @using ButtonType = Ws.Components.Source.UI.ButtonType

Src/Apps/Desktop/Ws.Desktop.Api/App/Features/Arms/Common/IArmService.cs

@@ -11,7 +11,7 @@ public interface IArmService
 
     #endregion
 
-    #region ArmService
+    #region Commands
 
     public bool Update(Guid armId, UpdateArmDto dto);
 

Src/Infrastructure/Ws.Domain.Models/Entities/Devices/Arms/Arm.cs

@@ -12,7 +12,7 @@ namespace Ws.Domain.Models.Entities.Devices.Arms;
 public class Arm : EntityBase
 {
     private int _counter;
-    public virtual int Counter { get => _counter; set => _counter = value > 1_000_000 ? 1 : value; }
+    public virtual int Counter { get => _counter; set => _counter = value > 999999 ? 1 : value; }
 
     public virtual int Number { get; set; }
     public virtual string Name { get; set; } = string.Empty;

Src/Services/Ws.Domain.Services/Features/Arms/ArmService.cs

@@ -3,7 +3,6 @@
 using Ws.Domain.Models.Entities.Devices.Arms;
 using Ws.Domain.Models.Entities.Ref;
 using Ws.Domain.Models.Entities.Ref1c.Plus;
-using Ws.Domain.Services.Aspects;
 using Ws.Domain.Services.Features.Arms.Specs;
 using Ws.Domain.Services.Features.Arms.Validators;
 using Ws.Domain.Services.Features.Plus.Specs;

Src/Services/Ws.Domain.Services/Features/Arms/IArmService.cs

@@ -1,8 +1,6 @@
 using Ws.Domain.Models.Entities.Devices.Arms;
 using Ws.Domain.Models.Entities.Ref;
 using Ws.Domain.Models.Entities.Ref1c.Plus;
-using Ws.Domain.Services.Common.Commands;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Arms;
 

Src/Services/Ws.Domain.Services/Features/Boxes/BoxService.cs

@@ -1,6 +1,5 @@
 using Ws.Database.Nhibernate.Entities.Ref1c.Boxes;
 using Ws.Domain.Models.Entities.Ref1c;
-using Ws.Domain.Services.Aspects;
 
 namespace Ws.Domain.Services.Features.Boxes;
 

Src/Services/Ws.Domain.Services/Features/Boxes/IBoxService.cs

@@ -1,5 +1,4 @@
 using Ws.Domain.Models.Entities.Ref1c;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Boxes;
 

Src/Services/Ws.Domain.Services/Features/Brands/BrandService.cs

@@ -1,6 +1,5 @@
 using Ws.Database.Nhibernate.Entities.Ref1c.Brands;
 using Ws.Domain.Models.Entities.Ref1c;
-using Ws.Domain.Services.Aspects;
 
 namespace Ws.Domain.Services.Features.Brands;
 

Src/Services/Ws.Domain.Services/Features/Brands/IBrandService.cs

@@ -1,6 +1,4 @@
 using Ws.Domain.Models.Entities.Ref1c;
-using Ws.Domain.Services.Common.Commands;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Brands;
 

Src/Services/Ws.Domain.Services/Features/Bundles/BundleService.cs

@@ -1,6 +1,5 @@
 using Ws.Database.Nhibernate.Entities.Ref1c.Bundles;
 using Ws.Domain.Models.Entities.Ref1c;
-using Ws.Domain.Services.Aspects;
 
 namespace Ws.Domain.Services.Features.Bundles;
 

Src/Services/Ws.Domain.Services/Features/Bundles/IBundleService.cs

@@ -1,5 +1,4 @@
 using Ws.Domain.Models.Entities.Ref1c;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Bundles;
 

Src/Services/Ws.Domain.Services/Features/Clips/ClipService.cs

@@ -1,6 +1,5 @@
 using Ws.Database.Nhibernate.Entities.Ref1c.Clips;
 using Ws.Domain.Models.Entities.Ref1c;
-using Ws.Domain.Services.Aspects;
 
 namespace Ws.Domain.Services.Features.Clips;
 

Src/Services/Ws.Domain.Services/Features/Clips/IClipService.cs

@@ -1,5 +1,4 @@
 using Ws.Domain.Models.Entities.Ref1c;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Clips;
 

Src/Services/Ws.Domain.Services/Features/GlobalUsings.cs

@@ -1,2 +1,5 @@
 global using FluentValidation;
-global using FluentValidation.Results;
+global using FluentValidation.Results;
+global using Ws.Domain.Services.Common.Commands;
+global using Ws.Domain.Services.Common.Queries;
+global using Ws.Domain.Services.Aspects;

Src/Services/Ws.Domain.Services/Features/Labels/ILabelService.cs

@@ -1,5 +1,4 @@
 using Ws.Domain.Models.Entities.Print;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Labels;
 

Src/Services/Ws.Domain.Services/Features/Labels/LabelService.cs

@@ -1,6 +1,5 @@
 using Ws.Database.Nhibernate.Entities.Print.Labels;
 using Ws.Domain.Models.Entities.Print;
-using Ws.Domain.Services.Aspects;
 
 namespace Ws.Domain.Services.Features.Labels;
 

Src/Services/Ws.Domain.Services/Features/PalletMen/IPalletManService.cs

@@ -1,7 +1,5 @@
 using Ws.Domain.Models.Entities.Ref;
 using Ws.Domain.Models.Entities.Users;
-using Ws.Domain.Services.Common.Commands;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.PalletMen;
 

Src/Services/Ws.Domain.Services/Features/PalletMen/PalletManService.cs

@@ -1,7 +1,6 @@
 using Ws.Database.Nhibernate.Entities.Ref.PalletMen;
 using Ws.Domain.Models.Entities.Ref;
 using Ws.Domain.Models.Entities.Users;
-using Ws.Domain.Services.Aspects;
 using Ws.Domain.Services.Features.PalletMen.Validators;
 
 namespace Ws.Domain.Services.Features.PalletMen;

Src/Services/Ws.Domain.Services/Features/Pallets/PalletService.cs

@@ -3,7 +3,6 @@
 using Ws.Database.Nhibernate.Entities.Ref.Arms;
 using Ws.Database.Nhibernate.Sessions;
 using Ws.Domain.Models.Entities.Print;
-using Ws.Domain.Services.Aspects;
 
 namespace Ws.Domain.Services.Features.Pallets;
 

Src/Services/Ws.Domain.Services/Features/Plus/IPluService.cs

@@ -1,6 +1,4 @@
 using Ws.Domain.Models.Entities.Ref1c.Plus;
-using Ws.Domain.Services.Common.Commands;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Plus;
 

Src/Services/Ws.Domain.Services/Features/Plus/PluService.cs

@@ -1,6 +1,5 @@
 using Ws.Database.Nhibernate.Entities.Ref1c.Plus;
 using Ws.Domain.Models.Entities.Ref1c.Plus;
-using Ws.Domain.Services.Aspects;
 
 namespace Ws.Domain.Services.Features.Plus;
 

Src/Services/Ws.Domain.Services/Features/Printers/IPrinterService.cs

@@ -1,7 +1,5 @@
 using Ws.Domain.Models.Entities.Devices;
 using Ws.Domain.Models.Entities.Ref;
-using Ws.Domain.Services.Common.Commands;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Printers;
 

Src/Services/Ws.Domain.Services/Features/Printers/PrinterService.cs

@@ -1,7 +1,6 @@
 using Ws.Database.Nhibernate.Entities.Ref.Printers;
 using Ws.Domain.Models.Entities.Devices;
 using Ws.Domain.Models.Entities.Ref;
-using Ws.Domain.Services.Aspects;
 using Ws.Domain.Services.Features.Printers.Specs;
 using Ws.Domain.Services.Features.Printers.Validators;
 

Src/Services/Ws.Domain.Services/Features/ProductionSites/IProductionSiteService.cs

@@ -1,6 +1,4 @@
 using Ws.Domain.Models.Entities.Ref;
-using Ws.Domain.Services.Common.Commands;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.ProductionSites;
 

Src/Services/Ws.Domain.Services/Features/ProductionSites/ProductionSiteService.cs

@@ -1,6 +1,5 @@
 using Ws.Database.Nhibernate.Entities.Ref.ProductionSites;
 using Ws.Domain.Models.Entities.Ref;
-using Ws.Domain.Services.Aspects;
 using Ws.Domain.Services.Features.ProductionSites.Validators;
 
 namespace Ws.Domain.Services.Features.ProductionSites;

Src/Services/Ws.Domain.Services/Features/Templates/ITemplateService.cs

@@ -1,6 +1,4 @@
 using Ws.Domain.Models.Entities.Print;
-using Ws.Domain.Services.Common.Commands;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Templates;
 

Src/Services/Ws.Domain.Services/Features/Templates/TemplateService.cs

@@ -1,7 +1,6 @@
 using EasyCaching.Core;
 using Ws.Database.Nhibernate.Entities.Ref.Templates;
 using Ws.Domain.Models.Entities.Print;
-using Ws.Domain.Services.Aspects;
 using Ws.Domain.Services.Features.Templates.Specs;
 using Ws.Domain.Services.Features.Templates.Validators;
 

Src/Services/Ws.Domain.Services/Features/Users/IUserService.cs

@@ -1,6 +1,4 @@
 using Ws.Domain.Models.Entities.Users;
-using Ws.Domain.Services.Common.Commands;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Users;
 

Src/Services/Ws.Domain.Services/Features/Users/UserService.cs

@@ -1,6 +1,5 @@
 using Ws.Database.Nhibernate.Entities.Ref.Users;
 using Ws.Domain.Models.Entities.Users;
-using Ws.Domain.Services.Aspects;
 
 namespace Ws.Domain.Services.Features.Users;
 

Src/Services/Ws.Domain.Services/Features/Warehouses/IWarehouseService.cs

@@ -1,6 +1,4 @@
 using Ws.Domain.Models.Entities.Ref;
-using Ws.Domain.Services.Common.Commands;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.Warehouses;
 

Src/Services/Ws.Domain.Services/Features/Warehouses/WarehouseService.cs

@@ -1,6 +1,5 @@
 using Ws.Database.Nhibernate.Entities.Ref.Warehouses;
 using Ws.Domain.Models.Entities.Ref;
-using Ws.Domain.Services.Aspects;
 using Ws.Domain.Services.Features.Warehouses.Specs;
 using Ws.Domain.Services.Features.Warehouses.Validators;
 

Src/Services/Ws.Domain.Services/Features/ZplResources/IZplResourceService.cs

@@ -1,6 +1,4 @@
 using Ws.Domain.Models.Entities.Print;
-using Ws.Domain.Services.Common.Commands;
-using Ws.Domain.Services.Common.Queries;
 
 namespace Ws.Domain.Services.Features.ZplResources;
 

Src/Services/Ws.Domain.Services/Features/ZplResources/ZplResourceService.cs

@@ -1,7 +1,6 @@
 using EasyCaching.Core;
 using Ws.Database.Nhibernate.Entities.Ref.ZplResources;
 using Ws.Domain.Models.Entities.Print;
-using Ws.Domain.Services.Aspects;
 using Ws.Domain.Services.Features.ZplResources.Validators;
 
 namespace Ws.Domain.Services.Features.ZplResources;

Src/Services/Ws.Labels.Service/Generate/Models/Variables/TemplateVars.cs

@@ -20,7 +20,8 @@ public class TemplateVars(
     decimal weightNet,
     decimal weightGross,
     DateTime productDt,
-    DateTime expirationDt)
+    DateTime expirationDt
+    )
 {
 
     #region Barcodes
@@ -39,7 +40,6 @@ public class TemplateVars(
 
     #endregion
 
-
     #region Other
 
     public readonly string WeightNet =  weightNet.ToSepStr(',');