AgileWebs/Core.Inventory.Service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final fixes for demo

Browse Source
This commit is contained in:
Ignacio Gomez 2025-06-27 23:11:01 -06:00
parent 0038169f5a
commit 542df8a203
12 changed files with 82 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core.Inventory.Application/UseCases/Inventory/Input/Base/UpdateFurnitureBaseRequest.cs
View File

@ -13,6 +13,7 @@ namespace Core.Inventory.Application.UseCases.Inventory.Input.Base
/// </summary>
public class UpdateFurnitureBaseRequest : Notificator, ICommand
{
public string _Id { get; set; } = null!;
public string Id { get; set; } = null!;
public string ModelName { get; set; } = null!;
public string Material { get; set; } = null!;
@ -26,7 +27,8 @@ namespace Core.Inventory.Application.UseCases.Inventory.Input.Base
public List<string>? VariantIds { get; set; }
public bool Validate()
{
return !string.IsNullOrWhiteSpace(Id)
return !string.IsNullOrWhiteSpace(_Id)
&& !string.IsNullOrWhiteSpace(Id)
&& !string.IsNullOrWhiteSpace(ModelName)
&& !string.IsNullOrWhiteSpace(Material)
&& !string.IsNullOrWhiteSpace(Condition);

10
Core.Inventory.Application/UseCases/Inventory/Input/Variant/CreateFurnitureVariantRequest.cs
View File

@ -18,10 +18,10 @@ namespace Core.Inventory.Application.UseCases.Inventory.Input.Variant
public string Currency { get; set; } = "USD";
public int Stock { get; set; }
public Guid CategoryId { get; set; }
public Guid ProviderId { get; set; }
public string CategoryId { get; set; } = string.Empty;
public string ProviderId { get; set; } = string.Empty;
public Dictionary<string, object> Attributes { get; set; } = [];
public Dictionary<string, string> Attributes { get; set; } = [];
public bool Validate()
{
@ -29,9 +29,7 @@ namespace Core.Inventory.Application.UseCases.Inventory.Input.Variant
&& !string.IsNullOrWhiteSpace(Name)
&& !string.IsNullOrWhiteSpace(Color)
&& Price >= 0
&& Stock >= 0
&& CategoryId != Guid.Empty
&& ProviderId != Guid.Empty;
&& Stock >= 0;
}
}
}

10
Core.Inventory.Application/UseCases/Inventory/Input/Variant/UpdateFurnitureVariantRequest.cs
View File

@ -13,6 +13,7 @@ namespace Core.Inventory.Application.UseCases.Inventory.Input.Variant
/// </summary>
public class UpdateFurnitureVariantRequest : Notificator, ICommand
{
public string _Id { get; set; } = null!;
public string Id { get; set; } = null!;
public string ModelId { get; set; } = null!;
public string Name { get; set; } = null!;
@ -23,14 +24,15 @@ namespace Core.Inventory.Application.UseCases.Inventory.Input.Variant
public decimal Price { get; set; }
public string Currency { get; set; } = "USD";
public Guid CategoryId { get; set; }
public Guid ProviderId { get; set; }
public string CategoryId { get; set; } = string.Empty!;
public string ProviderId { get; set; } = string.Empty!;
public Dictionary<string, object> Attributes { get; set; } = [];
public Dictionary<string, string> Attributes { get; set; } = [];
public bool Validate()
{
return !string.IsNullOrWhiteSpace(Id) &&
return !string.IsNullOrWhiteSpace(_Id) &&
!string.IsNullOrWhiteSpace(Id) &&
!string.IsNullOrWhiteSpace(ModelId) &&
!string.IsNullOrWhiteSpace(Name) &&
!string.IsNullOrWhiteSpace(Color) &&

13
Core.Inventory.Application/UseCases/Inventory/InventoryHandler.cs
View File

@ -3,6 +3,7 @@ using Core.Inventory.Application.UseCases.Inventory.Input.Variant;
using Core.Inventory.Application.UseCases.Inventory.Ports;
using Core.Inventory.Application.UseCases.Inventory.Validator.Variant;
using Core.Inventory.External.Clients;
using Core.Inventory.External.Clients.Adapters;
using Core.Inventory.External.Clients.Requests;
using FluentValidation;
using Lib.Architecture.BuildingBlocks;
@ -116,8 +117,10 @@ namespace Core.Inventory.Application.UseCases.Inventory
return;
}
var request = new FurnitureBaseRequest
var request = new FurnitureBaseAdapter
{
_Id = command._Id,
Id = command.Id,
BaseDescription = command.BaseDescription,
Condition = command.Condition,
MaintenanceNotes = command.MaintenanceNotes,
@ -133,7 +136,7 @@ namespace Core.Inventory.Application.UseCases.Inventory
}
};
var result = await _inventoryDALService.UpdateFurnitureBaseAsync(request, command.Id, cancellationToken);
var result = await _inventoryDALService.UpdateFurnitureBaseAsync(command.Id, request, cancellationToken);
_basePort.Success(result);
}
catch (Exception ex)
@ -244,8 +247,10 @@ namespace Core.Inventory.Application.UseCases.Inventory
_variantPort.ValidationErrors(command.Notifications);
return;
}
var request = new FurnitureVariantRequest
var request = new FurnitureVariantAdapter
{
_Id = command._Id,
Id = command.Id,
Stock = command.Stock,
Attributes= command.Attributes,
CategoryId = command.CategoryId,
@ -257,7 +262,7 @@ namespace Core.Inventory.Application.UseCases.Inventory
Price = command.Price,
ProviderId = command.ProviderId
};
var result = await _inventoryDALService.UpdateFurnitureVariantAsync(request, command.Id, cancellationToken);
var result = await _inventoryDALService.UpdateFurnitureVariantAsync(command.Id, request, cancellationToken);
_variantPort.Success(result);
}
catch (Exception ex)

6
Core.Inventory.Application/UseCases/Inventory/Validator/Base/UpdateFurnitureBaseValidator.cs
View File

@ -8,6 +8,12 @@ namespace Core.Inventory.Application.UseCases.Inventory.Validator.Base
{
public UpdateFurnitureBaseValidator()
{
RuleFor(x => x._Id)
.NotEmpty().WithMessage("_Id is required.");
RuleFor(x => x.Id)
.NotEmpty().WithMessage("Id is required.");
RuleFor(x => x.ModelName)
.NotEmpty().WithMessage("Model name is required.");

4
Core.Inventory.Application/UseCases/Inventory/Validator/Variant/CreateFurnitureVariantValidator.cs
View File

@ -23,10 +23,10 @@ namespace Core.Inventory.Application.UseCases.Inventory.Validator.Variant
.GreaterThanOrEqualTo(0).WithMessage("Stock must be a non-negative value.");
RuleFor(x => x.CategoryId)
.NotEqual(Guid.Empty).WithMessage("CategoryId is required.");
.NotEmpty().WithMessage("CategoryId is required.");
RuleFor(x => x.ProviderId)
.NotEqual(Guid.Empty).WithMessage("ProviderId is required.");
.NotEmpty().WithMessage("ProviderId is required.");
RuleFor(x => x.Currency)
.NotEmpty().WithMessage("Currency is required.");

7
Core.Inventory.Application/UseCases/Inventory/Validator/Variant/UpdateFurnitureVariantValidator.cs
View File

@ -7,6 +7,9 @@ namespace Core.Inventory.Application.UseCases.Inventory.Validator.Variant
{
public UpdateFurnitureVariantValidator()
{
RuleFor(x => x._Id)
.NotEmpty().WithMessage("_Id is required.");
RuleFor(x => x.Id)
.NotEmpty().WithMessage("Id is required.");
@ -29,10 +32,10 @@ namespace Core.Inventory.Application.UseCases.Inventory.Validator.Variant
.NotEmpty().WithMessage("Currency is required.");
RuleFor(x => x.CategoryId)
.NotEqual(Guid.Empty).WithMessage("CategoryId is required.");
.NotEmpty().WithMessage("CategoryId is required.");
RuleFor(x => x.ProviderId)
.NotEqual(Guid.Empty).WithMessage("ProviderId is required.");
.NotEmpty().WithMessage("ProviderId is required.");
}
}
}

19
Core.Inventory.External/Clients/Adapters/FurnitureBaseAdapter.cs Normal file
View File

@ -0,0 +1,19 @@
using Core.Adapters.Lib;
namespace Core.Inventory.External.Clients.Adapters
{
public class FurnitureBaseAdapter
{
public string _Id { get; set; } = null!;
public string Id { get; init; } = null!;
public string ModelName { get; set; } = null!;
public string Material { get; set; } = null!;
public string Condition { get; set; } = null!;
public string? BaseDescription { get; set; }
public string? Representation { get; set; }
public string? MaintenanceNotes { get; set; }
public Dimensions Dimensions { get; set; } = new();
public List<string>? VariantIds { get; set; }
}
}

21
Core.Inventory.External/Clients/Adapters/FurnitureVariantAdapter.cs Normal file
View File

@ -0,0 +1,21 @@
namespace Core.Inventory.External.Clients.Adapters
{
public class FurnitureVariantAdapter
{
public string _Id { get; set; } = null!;
public string Id { get; init; } = null!;
public string ModelId { get; set; } = null!;
public string Name { get; set; } = null!;
public string Color { get; set; } = null!;
public string? Line { get; set; }
public decimal Price { get; set; }
public string Currency { get; set; } = "USD";
public int Stock { get; set; }
public string CategoryId { get; set; } = string.Empty!;
public string ProviderId { get; set; } = string.Empty!;
public Dictionary<string, string> Attributes { get; set; } = [];
}
}

5
Core.Inventory.External/Clients/IInventoryServiceClient.cs
View File

@ -1,5 +1,6 @@
using Core.Adapters.Lib;
using Core.Blueprint.Mongo;
using Core.Inventory.External.Clients.Adapters;
using Core.Inventory.External.Clients.Requests;
using Microsoft.AspNetCore.Mvc;
using Refit;
@ -20,7 +21,7 @@ namespace Core.Inventory.External.Clients
Task<FurnitureBase> CreateFurnitureBaseAsync([FromBody] FurnitureBaseRequest request, CancellationToken cancellationToken = default);
[Put("/api/v1/FurnitureBase/{id}")]
Task<FurnitureBase> UpdateFurnitureBaseAsync([FromBody] FurnitureBaseRequest request, [FromRoute] string id, CancellationToken cancellationToken = default);
Task<FurnitureBase> UpdateFurnitureBaseAsync([FromRoute] string id, [FromBody] FurnitureBaseAdapter request, CancellationToken cancellationToken = default);
[Patch("/api/v1/FurnitureBase/{mongoId}/{newStatus}/ChangeStatus")]
Task<FurnitureBase> ChangeFurnitureBaseStatusAsync([FromRoute] string mongoId, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken = default);
@ -42,7 +43,7 @@ namespace Core.Inventory.External.Clients
Task<FurnitureVariant> CreateFurnitureVariantAsync([FromBody] FurnitureVariantRequest request, CancellationToken cancellationToken = default);
[Put("/api/v1/FurnitureVariant/{id}")]
Task<FurnitureVariant> UpdateFurnitureVariantAsync([FromBody] FurnitureVariantRequest request, [FromRoute] string id, CancellationToken cancellationToken = default);
Task<FurnitureVariant> UpdateFurnitureVariantAsync([FromRoute] string id, [FromBody] FurnitureVariantAdapter request, CancellationToken cancellationToken = default);
[Patch("/api/v1/FurnitureVariant/{mongoId}/{newStatus}/ChangeStatus")]
Task<FurnitureVariant> ChangeFurnitureVariantStatusAsync([FromRoute] string mongoId, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken = default);

6
Core.Inventory.External/Clients/Requests/FurnitureVariantRequest.cs
View File

@ -11,9 +11,9 @@
public string Currency { get; set; } = "USD";
public int Stock { get; set; }
public Guid CategoryId { get; set; }
public Guid ProviderId { get; set; }
public string CategoryId { get; set; } = string.Empty!;
public string ProviderId { get; set; } = string.Empty!;
public Dictionary<string, object> Attributes { get; set; } = [];
public Dictionary<string, string> Attributes { get; set; } = [];
}
}

2
Core.Inventory.External/Core.Inventory.External.csproj
View File

@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Adapters.Lib" Version="1.0.3" />
<PackageReference Include="Adapters.Lib" Version="1.0.6" />
<PackageReference Include="BuildingBlocks.Library" Version="1.0.0" />
<PackageReference Include="Refit" Version="8.0.0" />
</ItemGroup>