From 13b4778f01c366728f94565290c4eee2398ab299 Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Sun, 16 Nov 2025 17:29:30 +0330
Subject: [PATCH] Refactor AcceptContractCommandHandler to return
 AcceptContractResponseDto and integrate OTP verification

---
 .../AcceptContractCommandHandler.cs           | 19 ++++++++++++++++---
 .../Services/ApplicationContractContext.cs    |  3 ++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommandHandler.cs b/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommandHandler.cs
index 1b9ebc6..f47e873 100644
--- a/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommandHandler.cs
+++ b/src/FrontOffice.BFF.Application/UserCQ/Commands/AcceptContract/AcceptContractCommandHandler.cs
@@ -1,7 +1,9 @@
+using CMSMicroservice.Protobuf.Protos.OtpToken;
 using CMSMicroservice.Protobuf.Protos.UserContract;
+using FrontOffice.BFF.Application.UserCQ.Commands.VerifyOtpToken;
 
 namespace FrontOffice.BFF.Application.UserCQ.Commands.AcceptContract;
-public class AcceptContractCommandHandler : IRequestHandler<AcceptContractCommand, Unit>
+public class AcceptContractCommandHandler : IRequestHandler<AcceptContractCommand, AcceptContractResponseDto>
 {
     private readonly IApplicationContractContext _context;
     private readonly ICurrentUserService _currentUserService;
@@ -12,7 +14,7 @@ public class AcceptContractCommandHandler : IRequestHandler<AcceptContractComman
         _currentUserService = currentUserService;
     }
 
-    public async Task<Unit> Handle(AcceptContractCommand request, CancellationToken cancellationToken)
+    public async Task<AcceptContractResponseDto> Handle(AcceptContractCommand request, CancellationToken cancellationToken)
     {
         await _context.UserContract.CreateNewUserContractAsync(new CreateNewUserContractRequest()
         {
@@ -21,6 +23,17 @@ public class AcceptContractCommandHandler : IRequestHandler<AcceptContractComman
             ContractId = 1,
             SignedPdfFile = request.ContractHtml,
         }, cancellationToken: cancellationToken);
-        return new Unit();
+        var response = await _context.OtpToken.VerifyOtpTokenAsync(request: request.Adapt<VerifyOtpTokenRequest>(), cancellationToken: cancellationToken);
+        var result = response.Adapt<AcceptContractResponseDto>();
+        if (response.Success && response.UserId.HasValue && response.UserId.Value > 0)
+        {
+            var token = await _context.User.GetJwtTokenAsync(request: new()
+            {
+                Id = response.UserId.Value
+            }, cancellationToken: cancellationToken);
+
+            result.Token = token?.Token;
+        }
+        return result;
     }
 }
diff --git a/src/FrontOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs b/src/FrontOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs
index 77ff925..7a5072c 100644
--- a/src/FrontOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs
+++ b/src/FrontOffice.BFF.Infrastructure/Services/ApplicationContractContext.cs
@@ -2,6 +2,7 @@ using CMSMicroservice.Protobuf.Protos.OtpToken;
 using CMSMicroservice.Protobuf.Protos.Package;
 using CMSMicroservice.Protobuf.Protos.User;
 using CMSMicroservice.Protobuf.Protos.UserAddress;
+using CMSMicroservice.Protobuf.Protos.UserContract;
 using CMSMicroservice.Protobuf.Protos.UserOrder;
 using FrontOffice.BFF.Application.Common.Interfaces;
 using Microsoft.Extensions.DependencyInjection;
@@ -43,7 +44,7 @@ public class ApplicationContractContext : IApplicationContractContext
     public PackageContract.PackageContractClient Package => GetService<PackageContract.PackageContractClient>();
 
     public UserContract.UserContractClient User => GetService<UserContract.UserContractClient>();
-
+    public UserContractContract.UserContractContractClient UserContract => GetService<UserContractContract.UserContractContractClient>();
     public UserAddressContract.UserAddressContractClient UserAddress => GetService<UserAddressContract.UserAddressContractClient>();
 
     public UserOrderContract.UserOrderContractClient UserOrder => GetService<UserOrderContract.UserOrderContractClient>();