From dc0ba7a5ef7bbb72d6c30654c68413a694556279 Mon Sep 17 00:00:00 2001 From: MeysamMoghaddam <65253484+MeysamMoghaddam@users.noreply.github.com> Date: Sun, 28 Sep 2025 06:51:49 +0330 Subject: [PATCH] Generator Changes at 9/28/2025 6:32:18 AM --- docs/model.ndm2 | 2 +- .../CreateNewOtpToken/CreateNewOtpTokenResponseDto.cs | 4 ++++ .../Commands/VerifyOtpToken/VerifyOtpTokenCommand.cs | 2 ++ .../VerifyOtpToken/VerifyOtpTokenCommandHandler.cs | 2 +- .../VerifyOtpToken/VerifyOtpTokenCommandValidator.cs | 2 ++ .../VerifyOtpToken/VerifyOtpTokenResponseDto.cs | 4 ++++ .../UserCQ/Queries/GetUser/GetUserQuery.cs | 2 -- .../UserCQ/Queries/GetUser/GetUserQueryValidator.cs | 6 ++---- src/FrontOffice.BFF.WebApi/Services/UserService.cs | 4 ++-- .../FrontOffice.BFF.User.Protobuf/Protos/user.proto | 11 ++++++----- .../Validator/VerifyOtpTokenRequestValidator.cs | 2 ++ 11 files changed, 26 insertions(+), 15 deletions(-) diff --git a/docs/model.ndm2 b/docs/model.ndm2 index 849cbf5..a9bac42 100644 --- a/docs/model.ndm2 +++ b/docs/model.ndm2 @@ -8519,7 +8519,7 @@ "name": "ParentReferralCode", "type": "nvarchar", "size": -2147483648, - "isNullable": "No", + "isNullable": "Yes", "scale": -2147483648, "comment": "کد معرف والد", "computedExpression": "", diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenResponseDto.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenResponseDto.cs index b227aba..0252300 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenResponseDto.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/CreateNewOtpToken/CreateNewOtpTokenResponseDto.cs @@ -5,5 +5,9 @@ public class CreateNewOtpTokenResponseDto public bool Success { get; set; } //پیام public string Message { get; set; } + //تلاش باقی مانده + public int RemainingAttempts { get; set; } + //ثانیه باقی مانده + public int RemainingSeconds { get; set; } } \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommand.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommand.cs index 2f883c7..2cdf4a6 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommand.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommand.cs @@ -7,5 +7,7 @@ public record VerifyOtpTokenCommand : IRequest public string Purpose { get; init; } //کد public string Code { get; init; } + //کد معرف والد + public string ParentReferralCode { get; init; } } \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs index 7bf402b..88bf409 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandHandler.cs @@ -1,4 +1,4 @@ -using CMSMicroservice.Protobuf.Protos.OtpToken; +using CMSMicroservice.Protobuf.Protos.OtpToken; namespace FrontOffice.BFF.Application.UserCQ.Commands.VerifyOtpToken; public class VerifyOtpTokenCommandHandler : IRequestHandler diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandValidator.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandValidator.cs index 5cd1c5a..61c9589 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandValidator.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenCommandValidator.cs @@ -9,6 +9,8 @@ public class VerifyOtpTokenCommandValidator : AbstractValidator model.Code) .NotEmpty(); + RuleFor(model => model.ParentReferralCode) + .NotEmpty(); } public Func>> ValidateValue => async (model, propertyName) => { diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenResponseDto.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenResponseDto.cs index 871b8fc..1cca755 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenResponseDto.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/VerifyOtpToken/VerifyOtpTokenResponseDto.cs @@ -7,5 +7,9 @@ public class VerifyOtpTokenResponseDto public string Message { get; set; } //توکن public string? Token { get; set; } + //تلاش باقی مانده + public int RemainingAttempts { get; set; } + //ثانیه باقی مانده + public int RemainingSeconds { get; set; } } \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserQuery.cs b/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserQuery.cs index 566617e..378ee1f 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserQuery.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserQuery.cs @@ -1,7 +1,5 @@ namespace FrontOffice.BFF.Application.UserCQ.Queries.GetUser; public record GetUserQuery : IRequest { - //شناسه - public long Id { get; init; } } \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserQueryValidator.cs b/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserQueryValidator.cs index bd05504..c114d67 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserQueryValidator.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Queries/GetUser/GetUserQueryValidator.cs @@ -1,14 +1,12 @@ namespace FrontOffice.BFF.Application.UserCQ.Queries.GetUser; -public class GetUserQueryValidator : AbstractValidator +public class GetUserQueryValidator : AbstractValidator { public GetUserQueryValidator() { - RuleFor(model => model.Id) - .NotNull(); } public Func>> ValidateValue => async (model, propertyName) => { - var result = await ValidateAsync(ValidationContext.CreateWithOptions((GetUserQuery)model, x => x.IncludeProperties(propertyName))); + var result = await ValidateAsync(ValidationContext.CreateWithOptions((Unit)model, x => x.IncludeProperties(propertyName))); if (result.IsValid) return Array.Empty(); return result.Errors.Select(e => e.ErrorMessage); diff --git a/src/FrontOffice.BFF.WebApi/Services/UserService.cs b/src/FrontOffice.BFF.WebApi/Services/UserService.cs index 968523c..132c948 100644 --- a/src/FrontOffice.BFF.WebApi/Services/UserService.cs +++ b/src/FrontOffice.BFF.WebApi/Services/UserService.cs @@ -23,9 +23,9 @@ public class UserService : UserContract.UserContractBase { return await _dispatchRequestToCQRS.Handle(request, context); } - public override async Task GetUser(GetUserRequest request, ServerCallContext context) + public override async Task GetUser(Empty request, ServerCallContext context) { - return await _dispatchRequestToCQRS.Handle(request, context); + return await _dispatchRequestToCQRS.Handle(context); } public override async Task GetAllUserByFilter(GetAllUserByFilterRequest request, ServerCallContext context) { diff --git a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto index aef274f..7d42eb3 100644 --- a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto +++ b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto @@ -24,7 +24,7 @@ service UserContract body: "*" }; }; - rpc GetUser(GetUserRequest) returns (GetUserResponse){ + rpc GetUser(google.protobuf.Empty) returns (GetUserResponse){ option (google.api.http) = { get: "/GetUser" @@ -68,10 +68,6 @@ message DeleteUserRequest { int64 id = 1; } -message GetUserRequest -{ - int64 id = 1; -} message GetUserResponse { int64 id = 1; @@ -131,18 +127,23 @@ message CreateNewOtpTokenResponse { bool success = 1; string message = 2; + int32 remaining_attempts = 3; + int32 remaining_seconds = 4; } message VerifyOtpTokenRequest { string mobile = 1; string purpose = 2; string code = 3; + string parent_referral_code = 4; } message VerifyOtpTokenResponse { bool success = 1; string message = 2; google.protobuf.StringValue token = 3; + int32 remaining_attempts = 4; + int32 remaining_seconds = 5; } message PaginationState diff --git a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/VerifyOtpTokenRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/VerifyOtpTokenRequestValidator.cs index cc8b4be..4c958c0 100644 --- a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/VerifyOtpTokenRequestValidator.cs +++ b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/VerifyOtpTokenRequestValidator.cs @@ -12,6 +12,8 @@ public class VerifyOtpTokenRequestValidator : AbstractValidator model.Code) .NotEmpty(); + RuleFor(model => model.ParentReferralCode) + .NotEmpty(); } public Func>> ValidateValue => async (model, propertyName) => {