Re-factor on service
This commit is contained in:
		| @@ -7,19 +7,19 @@ | |||||||
| using Core.Blueprint.Mongo; | using Core.Blueprint.Mongo; | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Input | namespace Core.Inventory.Application.UseCases.Inventory.Input.Base | ||||||
| { | { | ||||||
|     /// <summary> |     /// <summary> | ||||||
|     /// Command to change the status of a furniture base model. |     /// Command to change the status of a furniture base model. | ||||||
|     /// </summary> |     /// </summary> | ||||||
|     public class ChangeFurnitureBaseStatusRequest : Notificator, ICommand |     public class ChangeFurnitureBaseStatusRequest : Notificator, ICommand | ||||||
|     { |     { | ||||||
|         public string Id { get; set; } = null!; |         public string MongoId { get; set; } = null!; | ||||||
|         public StatusEnum Status { get; set; } |         public StatusEnum Status { get; set; } | ||||||
| 
 | 
 | ||||||
|         public bool Validate() |         public bool Validate() | ||||||
|         { |         { | ||||||
|             return !string.IsNullOrWhiteSpace(Id); |             return !string.IsNullOrWhiteSpace(MongoId); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -6,7 +6,7 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input.Common; | using Core.Inventory.Application.UseCases.Inventory.Input.Common; | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Input | namespace Core.Inventory.Application.UseCases.Inventory.Input.Base | ||||||
| { | { | ||||||
|     /// <summary> |     /// <summary> | ||||||
|     /// Command for creating a new furniture base entity. |     /// Command for creating a new furniture base entity. | ||||||
| @@ -5,7 +5,7 @@ | |||||||
| // *********************************************************************** | // *********************************************************************** | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Input | namespace Core.Inventory.Application.UseCases.Inventory.Input.Base | ||||||
| { | { | ||||||
|     public class GetAllFurnitureBaseRequest : ICommand |     public class GetAllFurnitureBaseRequest : ICommand | ||||||
|     { |     { | ||||||
| @@ -5,18 +5,18 @@ | |||||||
| // *********************************************************************** | // *********************************************************************** | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Input | namespace Core.Inventory.Application.UseCases.Inventory.Input.Base | ||||||
| { | { | ||||||
|     /// <summary> |     /// <summary> | ||||||
|     /// Query to retrieve a furniture base by its identifier. |     /// Query to retrieve a furniture base by its identifier. | ||||||
|     /// </summary> |     /// </summary> | ||||||
|     public class GetFurnitureBaseByIdRequest : Notificator, ICommand |     public class GetFurnitureBaseByIdRequest : Notificator, ICommand | ||||||
|     { |     { | ||||||
|         public string Id { get; set; } = null!; |         public string MongoId { get; set; } = null!; | ||||||
| 
 | 
 | ||||||
|         public bool Validate() |         public bool Validate() | ||||||
|         { |         { | ||||||
|             return !string.IsNullOrWhiteSpace(Id); |             return !string.IsNullOrWhiteSpace(MongoId); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -6,7 +6,7 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input.Common; | using Core.Inventory.Application.UseCases.Inventory.Input.Common; | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Input | namespace Core.Inventory.Application.UseCases.Inventory.Input.Base | ||||||
| { | { | ||||||
|     /// <summary> |     /// <summary> | ||||||
|     /// Command for updating an existing furniture base entity. |     /// Command for updating an existing furniture base entity. | ||||||
| @@ -6,19 +6,19 @@ | |||||||
| using Core.Blueprint.Mongo; | using Core.Blueprint.Mongo; | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Input | namespace Core.Inventory.Application.UseCases.Inventory.Input.Variant | ||||||
| { | { | ||||||
|     /// <summary> |     /// <summary> | ||||||
|     /// Command to change the status of a furniture variant. |     /// Command to change the status of a furniture variant. | ||||||
|     /// </summary> |     /// </summary> | ||||||
|     public class ChangeFurnitureVariantStatusRequest : Notificator, ICommand |     public class ChangeFurnitureVariantStatusRequest : Notificator, ICommand | ||||||
|     { |     { | ||||||
|         public string Id { get; set; } = null!; |         public string MongoId { get; set; } = null!; | ||||||
|         public StatusEnum Status { get; set; } |         public StatusEnum Status { get; set; } | ||||||
| 
 | 
 | ||||||
|         public bool Validate() |         public bool Validate() | ||||||
|         { |         { | ||||||
|             return !string.IsNullOrWhiteSpace(Id); |             return !string.IsNullOrWhiteSpace(MongoId); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -5,7 +5,7 @@ | |||||||
| // *********************************************************************** | // *********************************************************************** | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Input | namespace Core.Inventory.Application.UseCases.Inventory.Input.Variant | ||||||
| { | { | ||||||
|     public class CreateFurnitureVariantRequest : Notificator, ICommand |     public class CreateFurnitureVariantRequest : Notificator, ICommand | ||||||
|     { |     { | ||||||
| @@ -5,7 +5,7 @@ | |||||||
| // *********************************************************************** | // *********************************************************************** | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Input | namespace Core.Inventory.Application.UseCases.Inventory.Input.Variant | ||||||
| { | { | ||||||
|     public class GetAllFurnitureVariantsByModelIdRequest : Notificator, ICommand |     public class GetAllFurnitureVariantsByModelIdRequest : Notificator, ICommand | ||||||
|     { |     { | ||||||
| @@ -5,15 +5,15 @@ | |||||||
| // *********************************************************************** | // *********************************************************************** | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Input | namespace Core.Inventory.Application.UseCases.Inventory.Input.Variant | ||||||
| { | { | ||||||
|     public class GetFurnitureVariantByIdRequest : Notificator, ICommand |     public class GetFurnitureVariantByIdRequest : Notificator, ICommand | ||||||
|     { |     { | ||||||
|         public string Id { get; set; } = null!; |         public string MongoId { get; set; } = null!; | ||||||
| 
 | 
 | ||||||
|         public bool Validate() |         public bool Validate() | ||||||
|         { |         { | ||||||
|             return !string.IsNullOrWhiteSpace(Id); |             return !string.IsNullOrWhiteSpace(MongoId); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -0,0 +1,22 @@ | |||||||
|  | // *********************************************************************** | ||||||
|  | // <copyright file="GetVariantsByIdsRequest.cs"> | ||||||
|  | //     Core.Inventory | ||||||
|  | // </copyright> | ||||||
|  | // *********************************************************************** | ||||||
|  | using Lib.Architecture.BuildingBlocks; | ||||||
|  |  | ||||||
|  | namespace Core.Inventory.Application.UseCases.Inventory.Input.Variant | ||||||
|  | { | ||||||
|  |     /// <summary> | ||||||
|  |     /// Request to retrieve multiple furniture variants by their identifiers. | ||||||
|  |     /// </summary> | ||||||
|  |     public class GetFurnitureVariantsByIdsRequest : Notificator, ICommand | ||||||
|  |     { | ||||||
|  |         public string[] Ids { get; set; } = []; | ||||||
|  |  | ||||||
|  |         public bool Validate() | ||||||
|  |         { | ||||||
|  |             return Ids is not null && Ids.Length > 0 && Ids.All(id => !string.IsNullOrWhiteSpace(id)); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -6,7 +6,7 @@ | |||||||
| 
 | 
 | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Input | namespace Core.Inventory.Application.UseCases.Inventory.Input.Variant | ||||||
| { | { | ||||||
|     /// <summary> |     /// <summary> | ||||||
|     /// Command for updating an existing furniture variant. |     /// Command for updating an existing furniture variant. | ||||||
| @@ -1,5 +1,7 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Base; | ||||||
|  | using Core.Inventory.Application.UseCases.Inventory.Input.Variant; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Ports; | 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; | ||||||
| using Core.Inventory.External.Clients.Requests; | using Core.Inventory.External.Clients.Requests; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| @@ -20,7 +22,8 @@ namespace Core.Inventory.Application.UseCases.Inventory | |||||||
|         IComponentHandler<UpdateFurnitureVariantRequest>, |         IComponentHandler<UpdateFurnitureVariantRequest>, | ||||||
|         IComponentHandler<GetFurnitureVariantByIdRequest>, |         IComponentHandler<GetFurnitureVariantByIdRequest>, | ||||||
|         IComponentHandler<GetAllFurnitureVariantsByModelIdRequest>, |         IComponentHandler<GetAllFurnitureVariantsByModelIdRequest>, | ||||||
|         IComponentHandler<ChangeFurnitureVariantStatusRequest> |         IComponentHandler<ChangeFurnitureVariantStatusRequest>, | ||||||
|  |         IComponentHandler<GetFurnitureVariantsByIdsRequest> | ||||||
|     { |     { | ||||||
|         // FurnitureBase |         // FurnitureBase | ||||||
|         private readonly IFurnitureBasePort _basePort; |         private readonly IFurnitureBasePort _basePort; | ||||||
| @@ -161,7 +164,7 @@ namespace Core.Inventory.Application.UseCases.Inventory | |||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 ArgumentNullException.ThrowIfNull(command); |                 ArgumentNullException.ThrowIfNull(command); | ||||||
|                 var result = await _inventoryDALService.GetFurnitureBaseByIdAsync(command.Id, cancellationToken); |                 var result = await _inventoryDALService.GetFurnitureBaseByIdAsync(command.MongoId, cancellationToken); | ||||||
|                 if (result is null) |                 if (result is null) | ||||||
|                 { |                 { | ||||||
|                     _basePort.NoContentSuccess(); |                     _basePort.NoContentSuccess(); | ||||||
| @@ -186,7 +189,7 @@ namespace Core.Inventory.Application.UseCases.Inventory | |||||||
|                     return; |                     return; | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
|                 var result = await _inventoryDALService.ChangeFurnitureBaseStatusAsync(command.Id, command.Status, cancellationToken); |                 var result = await _inventoryDALService.ChangeFurnitureBaseStatusAsync(command.MongoId, command.Status, cancellationToken); | ||||||
|                 _basePort.Success(result); |                 _basePort.Success(result); | ||||||
|             } |             } | ||||||
|             catch (Exception ex) |             catch (Exception ex) | ||||||
| @@ -267,7 +270,7 @@ namespace Core.Inventory.Application.UseCases.Inventory | |||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 ArgumentNullException.ThrowIfNull(command); |                 ArgumentNullException.ThrowIfNull(command); | ||||||
|                 var result = await _inventoryDALService.GetFurnitureVariantByIdAsync(command.Id, cancellationToken); |                 var result = await _inventoryDALService.GetFurnitureVariantByIdAsync(command.MongoId, cancellationToken); | ||||||
|                 if (result is null) |                 if (result is null) | ||||||
|                 { |                 { | ||||||
|                     _variantPort.NoContentSuccess(); |                     _variantPort.NoContentSuccess(); | ||||||
| @@ -300,6 +303,34 @@ namespace Core.Inventory.Application.UseCases.Inventory | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         public async ValueTask ExecuteAsync(GetFurnitureVariantsByIdsRequest command, CancellationToken cancellationToken = default) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 ArgumentNullException.ThrowIfNull(command); | ||||||
|  |  | ||||||
|  |                 if (!command.IsValid(new GetFurnitureVariantsByIdsValidator())) | ||||||
|  |                 { | ||||||
|  |                     _variantPort.ValidationErrors(command.Notifications); | ||||||
|  |                     return; | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 var result = await _inventoryDALService.GetFurnitureVariantsByIdsAsync(command.Ids.ToArray()); | ||||||
|  |  | ||||||
|  |                 if (result is null || !result.Any()) | ||||||
|  |                 { | ||||||
|  |                     _variantPort.NoContentSuccess(); | ||||||
|  |                     return; | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 _variantPort.Success([.. result]); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 ApiResponseHelper.EvaluatePort(ex, _variantPort); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|         public async ValueTask ExecuteAsync(ChangeFurnitureVariantStatusRequest command, CancellationToken cancellationToken = default) |         public async ValueTask ExecuteAsync(ChangeFurnitureVariantStatusRequest command, CancellationToken cancellationToken = default) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
| @@ -310,7 +341,7 @@ namespace Core.Inventory.Application.UseCases.Inventory | |||||||
|                     _variantPort.ValidationErrors(command.Notifications); |                     _variantPort.ValidationErrors(command.Notifications); | ||||||
|                     return; |                     return; | ||||||
|                 } |                 } | ||||||
|                 var result = await _inventoryDALService.ChangeFurnitureVariantStatusAsync(command.Id, command.Status, cancellationToken); |                 var result = await _inventoryDALService.ChangeFurnitureVariantStatusAsync(command.MongoId, command.Status, cancellationToken); | ||||||
|                 _variantPort.Success(result); |                 _variantPort.Success(result); | ||||||
|             } |             } | ||||||
|             catch (Exception ex) |             catch (Exception ex) | ||||||
|   | |||||||
| @@ -1,13 +1,13 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Base; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Validator | namespace Core.Inventory.Application.UseCases.Inventory.Validator.Base | ||||||
| { | { | ||||||
|     public class ChangeFurnitureBaseStatusValidator : AbstractValidator<ChangeFurnitureBaseStatusRequest> |     public class ChangeFurnitureBaseStatusValidator : AbstractValidator<ChangeFurnitureBaseStatusRequest> | ||||||
|     { |     { | ||||||
|         public ChangeFurnitureBaseStatusValidator() |         public ChangeFurnitureBaseStatusValidator() | ||||||
|         { |         { | ||||||
|             RuleFor(x => x.Id) |             RuleFor(x => x.MongoId) | ||||||
|                 .NotEmpty().WithMessage("Id is required."); |                 .NotEmpty().WithMessage("Id is required."); | ||||||
| 
 | 
 | ||||||
|             RuleFor(x => x.Status) |             RuleFor(x => x.Status) | ||||||
| @@ -3,11 +3,11 @@ | |||||||
| //     Core.Inventory | //     Core.Inventory | ||||||
| // </copyright> | // </copyright> | ||||||
| // *********************************************************************** | // *********************************************************************** | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Base; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Validator.Common; | using Core.Inventory.Application.UseCases.Inventory.Validator.Common; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Validator | namespace Core.Inventory.Application.UseCases.Inventory.Validator.Base | ||||||
| { | { | ||||||
|     public class CreateFurnitureBaseValidator : AbstractValidator<CreateFurnitureBaseRequest> |     public class CreateFurnitureBaseValidator : AbstractValidator<CreateFurnitureBaseRequest> | ||||||
|     { |     { | ||||||
| @@ -1,13 +1,13 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Base; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Validator | namespace Core.Inventory.Application.UseCases.Inventory.Validator.Base | ||||||
| { | { | ||||||
|     public class GetFurnitureBaseByIdValidator : AbstractValidator<GetFurnitureBaseByIdRequest> |     public class GetFurnitureBaseByIdValidator : AbstractValidator<GetFurnitureBaseByIdRequest> | ||||||
|     { |     { | ||||||
|         public GetFurnitureBaseByIdValidator() |         public GetFurnitureBaseByIdValidator() | ||||||
|         { |         { | ||||||
|             RuleFor(x => x.Id) |             RuleFor(x => x.MongoId) | ||||||
|                 .NotEmpty().WithMessage("Id is required."); |                 .NotEmpty().WithMessage("Id is required."); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| @@ -1,8 +1,8 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Base; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Validator.Common; | using Core.Inventory.Application.UseCases.Inventory.Validator.Common; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Validator | namespace Core.Inventory.Application.UseCases.Inventory.Validator.Base | ||||||
| { | { | ||||||
|     public class UpdateFurnitureBaseValidator : AbstractValidator<UpdateFurnitureBaseRequest> |     public class UpdateFurnitureBaseValidator : AbstractValidator<UpdateFurnitureBaseRequest> | ||||||
|     { |     { | ||||||
| @@ -1,13 +1,13 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Variant; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Validator | namespace Core.Inventory.Application.UseCases.Inventory.Validator.Variant | ||||||
| { | { | ||||||
|     public class ChangeFurnitureVariantStatusValidator : AbstractValidator<ChangeFurnitureVariantStatusRequest> |     public class ChangeFurnitureVariantStatusValidator : AbstractValidator<ChangeFurnitureVariantStatusRequest> | ||||||
|     { |     { | ||||||
|         public ChangeFurnitureVariantStatusValidator() |         public ChangeFurnitureVariantStatusValidator() | ||||||
|         { |         { | ||||||
|             RuleFor(x => x.Id) |             RuleFor(x => x.MongoId) | ||||||
|                 .NotEmpty().WithMessage("Id is required."); |                 .NotEmpty().WithMessage("Id is required."); | ||||||
| 
 | 
 | ||||||
|             RuleFor(x => x.Status) |             RuleFor(x => x.Status) | ||||||
| @@ -1,7 +1,7 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Variant; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Validator | namespace Core.Inventory.Application.UseCases.Inventory.Validator.Variant | ||||||
| { | { | ||||||
|     public class CreateFurnitureVariantValidator : AbstractValidator<CreateFurnitureVariantRequest> |     public class CreateFurnitureVariantValidator : AbstractValidator<CreateFurnitureVariantRequest> | ||||||
|     { |     { | ||||||
| @@ -1,7 +1,7 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Variant; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Validator | namespace Core.Inventory.Application.UseCases.Inventory.Validator.Variant | ||||||
| { | { | ||||||
|     public class GetAllFurnitureVariantsByModelIdValidator : AbstractValidator<GetAllFurnitureVariantsByModelIdRequest> |     public class GetAllFurnitureVariantsByModelIdValidator : AbstractValidator<GetAllFurnitureVariantsByModelIdRequest> | ||||||
|     { |     { | ||||||
| @@ -1,13 +1,13 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Variant; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Validator | namespace Core.Inventory.Application.UseCases.Inventory.Validator.Variant | ||||||
| { | { | ||||||
|     public class GetFurnitureVariantByIdValidator : AbstractValidator<GetFurnitureVariantByIdRequest> |     public class GetFurnitureVariantByIdValidator : AbstractValidator<GetFurnitureVariantByIdRequest> | ||||||
|     { |     { | ||||||
|         public GetFurnitureVariantByIdValidator() |         public GetFurnitureVariantByIdValidator() | ||||||
|         { |         { | ||||||
|             RuleFor(x => x.Id) |             RuleFor(x => x.MongoId) | ||||||
|                 .NotEmpty().WithMessage("Id is required."); |                 .NotEmpty().WithMessage("Id is required."); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| @@ -0,0 +1,27 @@ | |||||||
|  | // *********************************************************************** | ||||||
|  | // <copyright file="GetVariantsByIdsValidator.cs"> | ||||||
|  | //     Core.Inventory | ||||||
|  | // </copyright> | ||||||
|  | // *********************************************************************** | ||||||
|  | using Core.Inventory.Application.UseCases.Inventory.Input.Variant; | ||||||
|  | using FluentValidation; | ||||||
|  |  | ||||||
|  | namespace Core.Inventory.Application.UseCases.Inventory.Validator.Variant | ||||||
|  | { | ||||||
|  |     /// <summary> | ||||||
|  |     /// Validator for <see cref="GetFurnitureVariantsByIdsRequest"/>. | ||||||
|  |     /// </summary> | ||||||
|  |     public class GetFurnitureVariantsByIdsValidator : AbstractValidator<GetFurnitureVariantsByIdsRequest> | ||||||
|  |     { | ||||||
|  |         public GetFurnitureVariantsByIdsValidator() | ||||||
|  |         { | ||||||
|  |             RuleFor(x => x.Ids) | ||||||
|  |                 .NotNull() | ||||||
|  |                 .WithMessage("The list of IDs must not be null.") | ||||||
|  |                 .Must(ids => ids.Length!=0) | ||||||
|  |                 .WithMessage("At least one ID must be provided.") | ||||||
|  |                 .Must(ids => ids.All(id => !string.IsNullOrWhiteSpace(id))) | ||||||
|  |                 .WithMessage("All IDs must be non-empty strings."); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -1,7 +1,7 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Variant; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| 
 | 
 | ||||||
| namespace Core.Inventory.Application.UseCases.Inventory.Validator | namespace Core.Inventory.Application.UseCases.Inventory.Validator.Variant | ||||||
| { | { | ||||||
|     public class UpdateFurnitureVariantValidator : AbstractValidator<UpdateFurnitureVariantRequest> |     public class UpdateFurnitureVariantValidator : AbstractValidator<UpdateFurnitureVariantRequest> | ||||||
|     { |     { | ||||||
| @@ -13,8 +13,8 @@ namespace Core.Inventory.External.Clients | |||||||
|         [Get("/api/v1/FurnitureBase")] |         [Get("/api/v1/FurnitureBase")] | ||||||
|         Task<IEnumerable<FurnitureBase>> GetAllFurnitureBaseAsync(CancellationToken cancellationToken = default); |         Task<IEnumerable<FurnitureBase>> GetAllFurnitureBaseAsync(CancellationToken cancellationToken = default); | ||||||
|  |  | ||||||
|         [Get("/api/v1/FurnitureBase/{id}")] |         [Get("/api/v1/FurnitureBase/{mongoId}")] | ||||||
|         Task<FurnitureBase> GetFurnitureBaseByIdAsync([FromRoute] string id, CancellationToken cancellationToken = default); |         Task<FurnitureBase> GetFurnitureBaseByIdAsync([FromRoute] string mongoId, CancellationToken cancellationToken = default); | ||||||
|  |  | ||||||
|         [Post("/api/v1/FurnitureBase")] |         [Post("/api/v1/FurnitureBase")] | ||||||
|         Task<FurnitureBase> CreateFurnitureBaseAsync([FromBody] FurnitureBaseRequest request, CancellationToken cancellationToken = default); |         Task<FurnitureBase> CreateFurnitureBaseAsync([FromBody] FurnitureBaseRequest request, CancellationToken cancellationToken = default); | ||||||
| @@ -22,18 +22,21 @@ namespace Core.Inventory.External.Clients | |||||||
|         [Put("/api/v1/FurnitureBase/{id}")] |         [Put("/api/v1/FurnitureBase/{id}")] | ||||||
|         Task<FurnitureBase> UpdateFurnitureBaseAsync([FromBody] FurnitureBaseRequest request, [FromRoute] string id, CancellationToken cancellationToken = default); |         Task<FurnitureBase> UpdateFurnitureBaseAsync([FromBody] FurnitureBaseRequest request, [FromRoute] string id, CancellationToken cancellationToken = default); | ||||||
|  |  | ||||||
|         [Patch("/api/v1/FurnitureBase/{id}/{newStatus}/ChangeStatus")] |         [Patch("/api/v1/FurnitureBase/{mongoId}/{newStatus}/ChangeStatus")] | ||||||
|         Task<FurnitureBase> ChangeFurnitureBaseStatusAsync([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken = default); |         Task<FurnitureBase> ChangeFurnitureBaseStatusAsync([FromRoute] string mongoId, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken = default); | ||||||
|  |  | ||||||
|         #endregion |         #endregion | ||||||
|  |  | ||||||
|         #region FurnitureVariant |         #region FurnitureVariant | ||||||
|  |  | ||||||
|         [Get("/api/v1/FurnitureVariant/{modelId}")] |         [Get("/api/v1/FurnitureVariant/ByModel/{modelId}")] | ||||||
|         Task<IEnumerable<FurnitureVariant>> GetAllVariantsByModelIdAsync([FromRoute] string modelId, CancellationToken cancellationToken = default); |         Task<IEnumerable<FurnitureVariant>> GetAllVariantsByModelIdAsync([FromRoute] string modelId, CancellationToken cancellationToken = default); | ||||||
|  |  | ||||||
|         [Get("/api/v1/FurnitureVariant/{id}/byId")] |         [Get("/api/v1/FurnitureVariant/{mongoId}")] | ||||||
|         Task<FurnitureVariant> GetFurnitureVariantByIdAsync([FromRoute] string id, CancellationToken cancellationToken = default); |         Task<FurnitureVariant> GetFurnitureVariantByIdAsync([FromRoute] string mongoId, CancellationToken cancellationToken = default); | ||||||
|  |  | ||||||
|  |         [Post("/api/v1/FurnitureVariant/ByIds")] | ||||||
|  |         Task<IEnumerable<FurnitureVariant>> GetFurnitureVariantsByIdsAsync([Body] string[] ids, CancellationToken cancellationToken = default); | ||||||
|  |  | ||||||
|         [Post("/api/v1/FurnitureVariant")] |         [Post("/api/v1/FurnitureVariant")] | ||||||
|         Task<FurnitureVariant> CreateFurnitureVariantAsync([FromBody] FurnitureVariantRequest request, CancellationToken cancellationToken = default); |         Task<FurnitureVariant> CreateFurnitureVariantAsync([FromBody] FurnitureVariantRequest request, CancellationToken cancellationToken = default); | ||||||
| @@ -41,8 +44,8 @@ namespace Core.Inventory.External.Clients | |||||||
|         [Put("/api/v1/FurnitureVariant/{id}")] |         [Put("/api/v1/FurnitureVariant/{id}")] | ||||||
|         Task<FurnitureVariant> UpdateFurnitureVariantAsync([FromBody] FurnitureVariantRequest request, [FromRoute] string id, CancellationToken cancellationToken = default); |         Task<FurnitureVariant> UpdateFurnitureVariantAsync([FromBody] FurnitureVariantRequest request, [FromRoute] string id, CancellationToken cancellationToken = default); | ||||||
|  |  | ||||||
|         [Patch("/api/v1/FurnitureVariant/{id}/{newStatus}/ChangeStatus")] |         [Patch("/api/v1/FurnitureVariant/{mongoId}/{newStatus}/ChangeStatus")] | ||||||
|         Task<FurnitureVariant> ChangeFurnitureVariantStatusAsync([FromRoute] string id, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken = default); |         Task<FurnitureVariant> ChangeFurnitureVariantStatusAsync([FromRoute] string mongoId, [FromRoute] StatusEnum newStatus, CancellationToken cancellationToken = default); | ||||||
|  |  | ||||||
|         #endregion |         #endregion | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| using Asp.Versioning; | using Asp.Versioning; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Base; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Ports; | using Core.Inventory.Application.UseCases.Inventory.Ports; | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| @@ -10,30 +10,20 @@ namespace Core.Inventory.Service.API.Controllers | |||||||
|     [Route("api/v{api-version:apiVersion}/[controller]")] |     [Route("api/v{api-version:apiVersion}/[controller]")] | ||||||
|     [Produces("application/json")] |     [Produces("application/json")] | ||||||
|     [ApiController] |     [ApiController] | ||||||
|     public class FurnitureBaseController : ControllerBase |     public class FurnitureBaseController( | ||||||
|  |         IComponentHandler<GetFurnitureBaseByIdRequest> getByIdHandler, | ||||||
|  |         IComponentHandler<GetAllFurnitureBaseRequest> getAllHandler, | ||||||
|  |         IComponentHandler<CreateFurnitureBaseRequest> createHandler, | ||||||
|  |         IComponentHandler<UpdateFurnitureBaseRequest> updateHandler, | ||||||
|  |         IComponentHandler<ChangeFurnitureBaseStatusRequest> changeStatusHandler, | ||||||
|  |         IFurnitureBasePort port) : ControllerBase | ||||||
|     { |     { | ||||||
|         private readonly IComponentHandler<GetFurnitureBaseByIdRequest> _getByIdHandler; |         private readonly IComponentHandler<GetFurnitureBaseByIdRequest> _getByIdHandler = getByIdHandler; | ||||||
|         private readonly IComponentHandler<GetAllFurnitureBaseRequest> _getAllHandler; |         private readonly IComponentHandler<GetAllFurnitureBaseRequest> _getAllHandler = getAllHandler; | ||||||
|         private readonly IComponentHandler<CreateFurnitureBaseRequest> _createHandler; |         private readonly IComponentHandler<CreateFurnitureBaseRequest> _createHandler = createHandler; | ||||||
|         private readonly IComponentHandler<UpdateFurnitureBaseRequest> _updateHandler; |         private readonly IComponentHandler<UpdateFurnitureBaseRequest> _updateHandler = updateHandler; | ||||||
|         private readonly IComponentHandler<ChangeFurnitureBaseStatusRequest> _changeStatusHandler; |         private readonly IComponentHandler<ChangeFurnitureBaseStatusRequest> _changeStatusHandler = changeStatusHandler; | ||||||
|         private readonly IFurnitureBasePort _port; |         private readonly IFurnitureBasePort _port = port; | ||||||
|  |  | ||||||
|         public FurnitureBaseController( |  | ||||||
|             IComponentHandler<GetFurnitureBaseByIdRequest> getByIdHandler, |  | ||||||
|             IComponentHandler<GetAllFurnitureBaseRequest> getAllHandler, |  | ||||||
|             IComponentHandler<CreateFurnitureBaseRequest> createHandler, |  | ||||||
|             IComponentHandler<UpdateFurnitureBaseRequest> updateHandler, |  | ||||||
|             IComponentHandler<ChangeFurnitureBaseStatusRequest> changeStatusHandler, |  | ||||||
|             IFurnitureBasePort port) |  | ||||||
|         { |  | ||||||
|             _getByIdHandler= getByIdHandler; |  | ||||||
|             _getAllHandler= getAllHandler; |  | ||||||
|             _createHandler= createHandler; |  | ||||||
|             _updateHandler= updateHandler; |  | ||||||
|             _changeStatusHandler= changeStatusHandler; |  | ||||||
|             _port= port; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         [HttpGet("GetAll")] |         [HttpGet("GetAll")] | ||||||
|         public async Task<IActionResult> GetAllAsync(CancellationToken cancellationToken) |         public async Task<IActionResult> GetAllAsync(CancellationToken cancellationToken) | ||||||
| @@ -45,7 +35,7 @@ namespace Core.Inventory.Service.API.Controllers | |||||||
|         [HttpPost("GetById")] |         [HttpPost("GetById")] | ||||||
|         public async Task<IActionResult> GetByIdAsync([FromBody] GetFurnitureBaseByIdRequest request, CancellationToken cancellationToken) |         public async Task<IActionResult> GetByIdAsync([FromBody] GetFurnitureBaseByIdRequest request, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (string.IsNullOrEmpty(request?.Id)) return BadRequest("Furniture base identifier is required"); |             if (string.IsNullOrEmpty(request?.MongoId)) return BadRequest("Furniture base identifier is required"); | ||||||
|  |  | ||||||
|             await _getByIdHandler.ExecuteAsync(request, cancellationToken).ConfigureAwait(false); |             await _getByIdHandler.ExecuteAsync(request, cancellationToken).ConfigureAwait(false); | ||||||
|             return _port.ViewModel; |             return _port.ViewModel; | ||||||
| @@ -68,7 +58,7 @@ namespace Core.Inventory.Service.API.Controllers | |||||||
|         [HttpPatch("ChangeStatus")] |         [HttpPatch("ChangeStatus")] | ||||||
|         public async Task<IActionResult> ChangeStatusAsync([FromBody] ChangeFurnitureBaseStatusRequest request, CancellationToken cancellationToken) |         public async Task<IActionResult> ChangeStatusAsync([FromBody] ChangeFurnitureBaseStatusRequest request, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (string.IsNullOrEmpty(request?.Id)) return BadRequest("Furniture base identifier is required"); |             if (string.IsNullOrEmpty(request?.MongoId)) return BadRequest("Furniture base identifier is required"); | ||||||
|  |  | ||||||
|             await _changeStatusHandler.ExecuteAsync(request, cancellationToken).ConfigureAwait(false); |             await _changeStatusHandler.ExecuteAsync(request, cancellationToken).ConfigureAwait(false); | ||||||
|             return _port.ViewModel; |             return _port.ViewModel; | ||||||
|   | |||||||
| @@ -1,5 +1,5 @@ | |||||||
| using Asp.Versioning; | using Asp.Versioning; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Variant; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Ports; | using Core.Inventory.Application.UseCases.Inventory.Ports; | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| @@ -16,6 +16,7 @@ namespace Core.Inventory.Service.API.Controllers | |||||||
|         IComponentHandler<CreateFurnitureVariantRequest> createHandler, |         IComponentHandler<CreateFurnitureVariantRequest> createHandler, | ||||||
|         IComponentHandler<UpdateFurnitureVariantRequest> updateHandler, |         IComponentHandler<UpdateFurnitureVariantRequest> updateHandler, | ||||||
|         IComponentHandler<ChangeFurnitureVariantStatusRequest> changeStatusHandler, |         IComponentHandler<ChangeFurnitureVariantStatusRequest> changeStatusHandler, | ||||||
|  |         IComponentHandler<GetFurnitureVariantsByIdsRequest> getByIdsHandler, | ||||||
|         IFurnitureVariantPort port) : ControllerBase |         IFurnitureVariantPort port) : ControllerBase | ||||||
|     { |     { | ||||||
|         private readonly IComponentHandler<GetFurnitureVariantByIdRequest> _getByIdHandler = getByIdHandler; |         private readonly IComponentHandler<GetFurnitureVariantByIdRequest> _getByIdHandler = getByIdHandler; | ||||||
| @@ -23,6 +24,7 @@ namespace Core.Inventory.Service.API.Controllers | |||||||
|         private readonly IComponentHandler<CreateFurnitureVariantRequest> _createHandler = createHandler; |         private readonly IComponentHandler<CreateFurnitureVariantRequest> _createHandler = createHandler; | ||||||
|         private readonly IComponentHandler<UpdateFurnitureVariantRequest> _updateHandler = updateHandler; |         private readonly IComponentHandler<UpdateFurnitureVariantRequest> _updateHandler = updateHandler; | ||||||
|         private readonly IComponentHandler<ChangeFurnitureVariantStatusRequest> _changeStatusHandler = changeStatusHandler; |         private readonly IComponentHandler<ChangeFurnitureVariantStatusRequest> _changeStatusHandler = changeStatusHandler; | ||||||
|  |         private readonly IComponentHandler<GetFurnitureVariantsByIdsRequest> _getByIdsHandler = getByIdsHandler; | ||||||
|         private readonly IFurnitureVariantPort _port = port; |         private readonly IFurnitureVariantPort _port = port; | ||||||
|  |  | ||||||
|         [HttpGet("GetAllByModelId")] |         [HttpGet("GetAllByModelId")] | ||||||
| @@ -38,12 +40,23 @@ namespace Core.Inventory.Service.API.Controllers | |||||||
|         [HttpPost("GetById")] |         [HttpPost("GetById")] | ||||||
|         public async Task<IActionResult> GetByIdAsync([FromBody] GetFurnitureVariantByIdRequest request, CancellationToken cancellationToken) |         public async Task<IActionResult> GetByIdAsync([FromBody] GetFurnitureVariantByIdRequest request, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (string.IsNullOrEmpty(request?.Id)) return BadRequest("Furniture variant identifier is required"); |             if (string.IsNullOrEmpty(request?.MongoId)) return BadRequest("Furniture variant identifier is required"); | ||||||
|  |  | ||||||
|             await _getByIdHandler.ExecuteAsync(request, cancellationToken).ConfigureAwait(false); |             await _getByIdHandler.ExecuteAsync(request, cancellationToken).ConfigureAwait(false); | ||||||
|             return _port.ViewModel; |             return _port.ViewModel; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |         [HttpPost("GetByIds")] | ||||||
|  |         public async Task<IActionResult> GetByIdsAsync([FromBody] GetFurnitureVariantsByIdsRequest request, CancellationToken cancellationToken) | ||||||
|  |         { | ||||||
|  |             if (request?.Ids is null || request.Ids.Length == 0) | ||||||
|  |                 return BadRequest("At least one furniture variant ID must be provided."); | ||||||
|  |  | ||||||
|  |             await _getByIdsHandler.ExecuteAsync(request, cancellationToken).ConfigureAwait(false); | ||||||
|  |             return _port.ViewModel; | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|         [HttpPost("Create")] |         [HttpPost("Create")] | ||||||
|         public async Task<IActionResult> CreateAsync([FromBody] CreateFurnitureVariantRequest request, CancellationToken cancellationToken) |         public async Task<IActionResult> CreateAsync([FromBody] CreateFurnitureVariantRequest request, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
| @@ -61,7 +74,7 @@ namespace Core.Inventory.Service.API.Controllers | |||||||
|         [HttpPatch("ChangeStatus")] |         [HttpPatch("ChangeStatus")] | ||||||
|         public async Task<IActionResult> ChangeStatusAsync([FromBody] ChangeFurnitureVariantStatusRequest request, CancellationToken cancellationToken) |         public async Task<IActionResult> ChangeStatusAsync([FromBody] ChangeFurnitureVariantStatusRequest request, CancellationToken cancellationToken) | ||||||
|         { |         { | ||||||
|             if (string.IsNullOrEmpty(request?.Id)) return BadRequest("Furniture variant identifier is required"); |             if (string.IsNullOrEmpty(request?.MongoId)) return BadRequest("Furniture variant identifier is required"); | ||||||
|  |  | ||||||
|             await _changeStatusHandler.ExecuteAsync(request, cancellationToken).ConfigureAwait(false); |             await _changeStatusHandler.ExecuteAsync(request, cancellationToken).ConfigureAwait(false); | ||||||
|             return _port.ViewModel; |             return _port.ViewModel; | ||||||
|   | |||||||
| @@ -1,8 +1,10 @@ | |||||||
| using Core.Inventory.Application.UseCases.Inventory; | using Core.Inventory.Application.UseCases.Inventory; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Adapter; | using Core.Inventory.Application.UseCases.Inventory.Adapter; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Input; | using Core.Inventory.Application.UseCases.Inventory.Input.Base; | ||||||
|  | using Core.Inventory.Application.UseCases.Inventory.Input.Variant; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Ports; | using Core.Inventory.Application.UseCases.Inventory.Ports; | ||||||
| using Core.Inventory.Application.UseCases.Inventory.Validator; | using Core.Inventory.Application.UseCases.Inventory.Validator.Base; | ||||||
|  | using Core.Inventory.Application.UseCases.Inventory.Validator.Variant; | ||||||
| using FluentValidation; | using FluentValidation; | ||||||
| using Lib.Architecture.BuildingBlocks; | using Lib.Architecture.BuildingBlocks; | ||||||
|  |  | ||||||
| @@ -42,6 +44,7 @@ namespace Core.Inventory.Service.API.Extensions | |||||||
|             services.AddScoped<IComponentHandler<CreateFurnitureVariantRequest>, InventoryHandler>(); |             services.AddScoped<IComponentHandler<CreateFurnitureVariantRequest>, InventoryHandler>(); | ||||||
|             services.AddScoped<IComponentHandler<UpdateFurnitureVariantRequest>, InventoryHandler>(); |             services.AddScoped<IComponentHandler<UpdateFurnitureVariantRequest>, InventoryHandler>(); | ||||||
|             services.AddScoped<IComponentHandler<ChangeFurnitureVariantStatusRequest>, InventoryHandler>(); |             services.AddScoped<IComponentHandler<ChangeFurnitureVariantStatusRequest>, InventoryHandler>(); | ||||||
|  |             services.AddScoped<IComponentHandler<GetFurnitureVariantsByIdsRequest>, InventoryHandler>(); | ||||||
|  |  | ||||||
|             services.AddValidatorsFromAssemblyContaining<CreateFurnitureVariantValidator>(); |             services.AddValidatorsFromAssemblyContaining<CreateFurnitureVariantValidator>(); | ||||||
|             services.AddScoped<IValidator<CreateFurnitureVariantRequest>, CreateFurnitureVariantValidator>(); |             services.AddScoped<IValidator<CreateFurnitureVariantRequest>, CreateFurnitureVariantValidator>(); | ||||||
| @@ -57,6 +60,9 @@ namespace Core.Inventory.Service.API.Extensions | |||||||
|  |  | ||||||
|             services.AddValidatorsFromAssemblyContaining<GetAllFurnitureVariantsByModelIdValidator>(); |             services.AddValidatorsFromAssemblyContaining<GetAllFurnitureVariantsByModelIdValidator>(); | ||||||
|             services.AddScoped<IValidator<GetAllFurnitureVariantsByModelIdRequest>, GetAllFurnitureVariantsByModelIdValidator>(); |             services.AddScoped<IValidator<GetAllFurnitureVariantsByModelIdRequest>, GetAllFurnitureVariantsByModelIdValidator>(); | ||||||
|  |  | ||||||
|  |             services.AddValidatorsFromAssemblyContaining<GetFurnitureVariantsByIdsValidator>(); | ||||||
|  |             services.AddScoped<IValidator<GetFurnitureVariantsByIdsRequest>, GetFurnitureVariantsByIdsValidator>(); | ||||||
|             #endregion |             #endregion | ||||||
|  |  | ||||||
|             return services; |             return services; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user