From 5f65c119e1a785c263632b98ca695c98311a5caf Mon Sep 17 00:00:00 2001 From: masoodafar-web Date: Sun, 16 Nov 2025 01:58:49 +0330 Subject: [PATCH] =?UTF-8?q?Generator=20Changes=20at=2011/16/2025=201:53:26?= =?UTF-8?q?=E2=80=AFAM=20+03:30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AcceptContract/AcceptContractCommand.cs | 6 ++++-- .../AcceptContractCommandValidator.cs | 6 ++++++ .../Services/UserService.cs | 3 --- .../Protos/user.proto | 15 +++------------ .../Validator/AcceptContractRequestValidator.cs | 6 ++++++ 5 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommand.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommand.cs index 944a712..a5d493f 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommand.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommand.cs @@ -2,8 +2,10 @@ namespace FrontOffice.BFF.Application.UserCQ.Commands.AcceptContract; public record AcceptContractCommand : IRequest { //کد otp - public string? Code { get; init; } + public string Code { get; init; } //فایل قرارداد - public string? ContractHtml { get; init; } + public string ContractHtml { get; init; } + //شناسه یکتای امضا + public string SignGuid { get; init; } } \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommandValidator.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommandValidator.cs index a10c280..6a8d5ba 100644 --- a/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommandValidator.cs +++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommandValidator.cs @@ -3,6 +3,12 @@ public class AcceptContractCommandValidator : AbstractValidator model.Code) + .NotEmpty(); + RuleFor(model => model.ContractHtml) + .NotEmpty(); + RuleFor(model => model.SignGuid) + .NotEmpty(); } public Func>> ValidateValue => async (model, propertyName) => { diff --git a/src/FrontOffice.BFF.WebApi/Services/UserService.cs b/src/FrontOffice.BFF.WebApi/Services/UserService.cs index d6fe990..3f099ec 100644 --- a/src/FrontOffice.BFF.WebApi/Services/UserService.cs +++ b/src/FrontOffice.BFF.WebApi/Services/UserService.cs @@ -57,9 +57,6 @@ public class UserService : UserContract.UserContractBase return await _dispatchRequestToCQRS.Handle(request, context); } public override async Task CreateContractOtpToken(CreateContractOtpTokenRequest request, ServerCallContext context) - { - return await _dispatchRequestToCQRS.Handle(request, context); - } public override async Task AcceptContract(AcceptContractRequest request, ServerCallContext context) { return await _dispatchRequestToCQRS.Handle(request, context); diff --git a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto index 5acce8a..397cda2 100644 --- a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto +++ b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Protos/user.proto @@ -60,12 +60,6 @@ service UserContract body: "*" }; }; - rpc CreateContractOtpToken(CreateContractOtpTokenRequest) returns (google.protobuf.Empty){ - option (google.api.http) = { - post: "/CreateContractOtpToken" - body: "*" - }; - }; rpc AcceptContract(AcceptContractRequest) returns (google.protobuf.Empty){ option (google.api.http) = { post: "/AcceptContract" @@ -200,14 +194,11 @@ message SetPasswordForUserRequest string new_password = 2; string confirm_password = 3; } -message CreateContractOtpTokenRequest -{ - google.protobuf.StringValue cotract_guid = 1; -} message AcceptContractRequest { - google.protobuf.StringValue code = 1; - google.protobuf.StringValue contract_html = 2; + string code = 1; + string contract_html = 2; + string sign_guid = 3; } message PaginationState diff --git a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/AcceptContractRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/AcceptContractRequestValidator.cs index 003d39a..3f537ca 100644 --- a/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/AcceptContractRequestValidator.cs +++ b/src/Protobufs/FrontOffice.BFF.User.Protobuf/Validator/AcceptContractRequestValidator.cs @@ -6,6 +6,12 @@ public class AcceptContractRequestValidator : AbstractValidator model.Code) + .NotEmpty(); + RuleFor(model => model.ContractHtml) + .NotEmpty(); + RuleFor(model => model.SignGuid) + .NotEmpty(); } public Func>> ValidateValue => async (model, propertyName) => {