fix: Remove trailing whitespace in Seq config

.gitea/workflows/kub-deploy.yml

@@ -20,12 +20,14 @@ jobs:
         HTTPS_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128
         NO_PROXY: localhost,127.0.0.1,gitea-svc,194.5.195.53,10.0.0.0/8
     steps:
-      - name: Install git
+      - name: Install dependencies
-        run: apk add --no-cache git
-
-      - name: Clone repo
         run: |
-          git clone --depth 1 --branch kub-stage http://gitea-svc:3000/admin/CMS.git .
+          apk add --no-cache git curl
+          
+          # Install kubectl
+          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+          chmod +x kubectl
+          mv kubectl /usr/local/bin/
 
       - name: Start Docker daemon with insecure registry
         run: |
@@ -52,7 +54,11 @@ jobs:
             docker info >/dev/null 2>&1 && break || sleep 2
           done
           docker info
-
+  	
+      - name: Checkout code
+        run: |
+          git clone --depth 1 --branch kub-stage http://gitea-svc:3000/admin/CMS.git .
+          git log -1 --format="%H %s"
       - name: Build Docker Image
         run: |
           docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \
@@ -66,3 +72,15 @@ jobs:
           echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin
           docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
           docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+          
+      - name: Deploy to Kubernetes
+        run: |
+          # Setup kubeconfig
+          mkdir -p ~/.kube
+          echo "${{ secrets.KUBECONFIG }}" | base64 -d > ~/.kube/config
+          
+          # Restart deployment to pull new image
+          kubectl rollout restart deployment/cms || echo "Deployment doesn't exist yet"
+          
+          # Wait for rollout to complete
+          kubectl rollout status deployment/cms --timeout=5m || echo "Deployment rollout pending"

src/CMSMicroservice.Domain/Enums/DayaLoanStatus.cs

@@ -6,17 +6,28 @@ namespace CMSMicroservice.Domain.Enums;
 public enum DayaLoanStatus
 {
     /// <summary>
-    /// در انتظار دریافت وام (خرید انجام شده، قرارداد امضا شده، درخواست وام ثبت شده)
+    /// هنوز درخواست نشده
     /// </summary>
-    PendingReceive = 0,
+    NotRequested = 0,
     
     /// <summary>
-    /// وام دریافت شده (در آینده اضافه می‌شود)
+    /// در انتظار دریافت وام (قرارداد امضا شده، در انتظار تسویه)
+    /// وضعیت: "فعال شده (در انتظار تسویه)"
     /// </summary>
-    Received = 1,
+    PendingReceive = 1,
     
     /// <summary>
-    /// رد شده (در آینده اضافه می‌شود)
+    /// وام دریافت شده و شارژ شده
     /// </summary>
-    Rejected = 2,
+    Received = 2,
+    
+    /// <summary>
+    /// رد شده
+    /// </summary>
+    Rejected = 3,
+    
+    /// <summary>
+    /// در حال بررسی
+    /// </summary>
+    UnderReview = 4,
 }

src/CMSMicroservice.Infrastructure/ConfigureServices.cs

@@ -32,7 +32,39 @@ public static class ConfigureServices
         services.AddScoped<INetworkPlacementService, NetworkPlacementService>();
         services.AddScoped<IAlertService, AlertService>();
         services.AddScoped<IUserNotificationService, UserNotificationService>();
-        services.AddScoped<IDayaLoanApiService, MockDayaLoanApiService>(); // Mock - جایگزین با Real برای Production
+        
+        // Daya Loan API Service - قابل تغییر بین Mock و Real
+        var useMockDayaApi = configuration.GetValue<bool>("DayaApi:UseMock", false);
+        
+        if (useMockDayaApi)
+        {
+            // Mock برای Development/Testing
+            services.AddScoped<IDayaLoanApiService, MockDayaLoanApiService>();
+        }
+        else
+        {
+            // Real Implementation با HttpClient
+            services.AddHttpClient<IDayaLoanApiService, DayaLoanApiService>()
+                .SetHandlerLifetime(TimeSpan.FromMinutes(5))
+                .ConfigureHttpClient((sp, client) =>
+                {
+                    var config = sp.GetRequiredService<IConfiguration>();
+                    
+                    // Base Address
+                    var baseAddress = config["DayaApi:BaseAddress"] ?? "https://testdaya.tadbirandishan.com";
+                    client.BaseAddress = new Uri(baseAddress);
+                    
+                    // Merchant Permission Key
+                    var permissionKey = config["DayaApi:MerchantPermissionKey"];
+                    if (!string.IsNullOrEmpty(permissionKey))
+                    {
+                        client.DefaultRequestHeaders.Add("merchant-permission-key", permissionKey);
+                    }
+                    
+                    // Timeout
+                    client.Timeout = TimeSpan.FromSeconds(30);
+                });
+        }
         
         // Payment Gateway Service - فقط Daya (درگاه اینترنتی از Gateway میاد نه CMS)
         var useRealPaymentGateway = configuration.GetValue<bool>("UseRealPaymentGateway", false);

src/CMSMicroservice.Infrastructure/Services/DayaLoanApiService.cs

@@ -1,11 +1,15 @@
 using CMSMicroservice.Application.DayaLoanCQ.Services;
 using CMSMicroservice.Domain.Enums;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Configuration;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
+using System.Net.Http.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Text.Json.Serialization;
+using System.Linq;
 
 namespace CMSMicroservice.Infrastructure.Services;
 
@@ -74,31 +78,232 @@ public class MockDayaLoanApiService : IDayaLoanApiService
 
 /// <summary>
 /// Real Implementation برای API واقعی دایا
-/// TODO: این کلاس باید پیاده‌سازی شود زمانی که API دایا آماده شد
+/// مبتنی بر مستند TA-DAYA-S10-G-MerchantServices
 /// </summary>
 public class DayaLoanApiService : IDayaLoanApiService
 {
     private readonly HttpClient _httpClient;
     private readonly ILogger<DayaLoanApiService> _logger;
+    private readonly IConfiguration _configuration;
 
-    public DayaLoanApiService(HttpClient httpClient, ILogger<DayaLoanApiService> logger)
+    public DayaLoanApiService(
+        HttpClient httpClient, 
+        ILogger<DayaLoanApiService> logger,
+        IConfiguration configuration)
     {
         _httpClient = httpClient;
         _logger = logger;
+        _configuration = configuration;
+        
+        // تنظیم Base Address از Configuration
+        var baseAddress = _configuration["DayaApi:BaseAddress"] ?? "https://testdaya.tadbirandishan.com";
+        _httpClient.BaseAddress = new Uri(baseAddress);
+        
+        // تنظیم merchant-permission-key از Configuration
+        var permissionKey = _configuration["DayaApi:MerchantPermissionKey"];
+        if (!string.IsNullOrEmpty(permissionKey))
+        {
+            _httpClient.DefaultRequestHeaders.Add("merchant-permission-key", permissionKey);
+        }
+        else
+        {
+            _logger.LogWarning("⚠️ DayaApi:MerchantPermissionKey is not configured in appsettings!");
+        }
     }
 
     public async Task<List<DayaLoanStatusResult>> CheckLoanStatusAsync(
         List<string> nationalCodes,
         CancellationToken cancellationToken = default)
     {
-        // TODO: پیاده‌سازی واقعی API دایا
+        try
-        // مثال:
+        {
-        // var request = new DayaApiRequest { NationalCodes = nationalCodes };
+            _logger.LogInformation("Calling Daya API for {Count} national codes", nationalCodes.Count);
-        // var response = await _httpClient.PostAsJsonAsync("/api/loan/check", request, cancellationToken);
+
-        // response.EnsureSuccessStatusCode();
+            // ساخت Request Body
-        // var result = await response.Content.ReadFromJsonAsync<DayaApiResponse>(cancellationToken);
+            var requestBody = new DayaContractsRequest
-        // return MapToResults(result);
+            {
-        
+                NationalCodes = nationalCodes
-        throw new NotImplementedException("Real Daya API is not implemented yet. Use MockDayaLoanApiService for testing.");
+            };
+
+            // فراخوانی API
+            var response = await _httpClient.PostAsJsonAsync(
+                "/api/merchant/contracts", 
+                requestBody, 
+                cancellationToken);
+
+            // خواندن پاسخ
+            var apiResponse = await response.Content.ReadFromJsonAsync<DayaContractsResponse>(cancellationToken);
+
+            // بررسی موفقیت
+            if (apiResponse == null)
+            {
+                _logger.LogError("Daya API returned null response");
+                return CreateEmptyResults(nationalCodes);
+            }
+
+            if (!apiResponse.Succeed)
+            {
+                _logger.LogWarning("Daya API call failed. Code: {Code}, Message: {Message}", 
+                    apiResponse.Code, apiResponse.Message);
+                return CreateEmptyResults(nationalCodes);
+            }
+
+            if (apiResponse.Data == null || !apiResponse.Data.Any())
+            {
+                _logger.LogInformation("Daya API returned no contract data");
+                return CreateEmptyResults(nationalCodes);
+            }
+
+            // تبدیل نتایج API به مدل داخلی
+            var results = MapApiResponseToResults(apiResponse.Data, nationalCodes);
+
+            _logger.LogInformation("Daya API returned {Count} contracts for {RequestCount} national codes", 
+                results.Count(r => !string.IsNullOrEmpty(r.ContractNumber)), 
+                nationalCodes.Count);
+
+            return results;
+        }
+        catch (HttpRequestException ex)
+        {
+            _logger.LogError(ex, "HTTP error calling Daya API. Status: {StatusCode}", ex.StatusCode);
+            return CreateEmptyResults(nationalCodes);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Unexpected error calling Daya API");
+            return CreateEmptyResults(nationalCodes);
+        }
+    }
+
+    /// <summary>
+    /// تبدیل پاسخ API دایا به مدل داخلی
+    /// </summary>
+    private List<DayaLoanStatusResult> MapApiResponseToResults(
+        List<DayaContractData> apiData, 
+        List<string> requestedNationalCodes)
+    {
+        var results = new List<DayaLoanStatusResult>();
+
+        // برای هر کد ملی درخواستی
+        foreach (var nationalCode in requestedNationalCodes)
+        {
+            // پیدا کردن آخرین قرارداد این کد ملی (براساس تاریخ)
+            var latestContract = apiData
+                .Where(d => d.NationalCode == nationalCode)
+                .OrderByDescending(d => d.DateTime)
+                .FirstOrDefault();
+
+            if (latestContract != null)
+            {
+                // تعیین وضعیت براساس StatusDescription
+                var status = MapStatusDescription(latestContract.StatusDescription);
+
+                results.Add(new DayaLoanStatusResult
+                {
+                    NationalCode = nationalCode,
+                    Status = status,
+                    ContractNumber = latestContract.ApplicationNo
+                });
+
+                _logger.LogDebug("Daya contract found for {NationalCode}: {ContractNo}, Status: {Status}", 
+                    nationalCode, latestContract.ApplicationNo, latestContract.StatusDescription);
+            }
+            else
+            {
+                // هیچ قراردادی برای این کد ملی پیدا نشد
+                results.Add(new DayaLoanStatusResult
+                {
+                    NationalCode = nationalCode,
+                    Status = DayaLoanStatus.NotRequested,
+                    ContractNumber = null
+                });
+            }
+        }
+
+        return results;
+    }
+
+    /// <summary>
+    /// تبدیل StatusDescription دایا به Enum داخلی
+    /// </summary>
+    private DayaLoanStatus MapStatusDescription(string statusDescription)
+    {
+        if (string.IsNullOrWhiteSpace(statusDescription))
+            return DayaLoanStatus.NotRequested;
+
+        // براساس مستند دایا: "فعال شده (در انتظار تسویه)" = وام تایید شده
+        if (statusDescription.Contains("فعال شده") || statusDescription.Contains("در انتظار تسویه"))
+            return DayaLoanStatus.PendingReceive;
+
+        if (statusDescription.Contains("رد شده") || statusDescription.Contains("رد"))
+            return DayaLoanStatus.Rejected;
+
+        if (statusDescription.Contains("بررسی") || statusDescription.Contains("در حال"))
+            return DayaLoanStatus.UnderReview;
+
+        // پیش‌فرض
+        return DayaLoanStatus.NotRequested;
+    }
+
+    /// <summary>
+    /// ساخت نتایج خالی در صورت خطا
+    /// </summary>
+    private List<DayaLoanStatusResult> CreateEmptyResults(List<string> nationalCodes)
+    {
+        return nationalCodes.Select(nc => new DayaLoanStatusResult
+        {
+            NationalCode = nc,
+            Status = DayaLoanStatus.NotRequested,
+            ContractNumber = null
+        }).ToList();
     }
 }
+
+#region Daya API Models
+
+/// <summary>
+/// Request body برای /api/merchant/contracts
+/// </summary>
+internal class DayaContractsRequest
+{
+    [JsonPropertyName("NationalCodes")]
+    public List<string> NationalCodes { get; set; } = new();
+}
+
+/// <summary>
+/// Response از /api/merchant/contracts
+/// </summary>
+internal class DayaContractsResponse
+{
+    [JsonPropertyName("succeed")]
+    public bool Succeed { get; set; }
+
+    [JsonPropertyName("code")]
+    public int Code { get; set; }
+
+    [JsonPropertyName("message")]
+    public string? Message { get; set; }
+
+    [JsonPropertyName("data")]
+    public List<DayaContractData>? Data { get; set; }
+}
+
+/// <summary>
+/// داده‌های قرارداد در پاسخ API
+/// </summary>
+internal class DayaContractData
+{
+    [JsonPropertyName("nationalCode")]
+    public string NationalCode { get; set; } = string.Empty;
+
+    [JsonPropertyName("applicationNo")]
+    public string ApplicationNo { get; set; } = string.Empty;
+
+    [JsonPropertyName("statusDescription")]
+    public string StatusDescription { get; set; } = string.Empty;
+
+    [JsonPropertyName("dateTime")]
+    public DateTime DateTime { get; set; }
+}
+
+#endregion

src/CMSMicroservice.WebApi/Dockerfile

@@ -13,7 +13,7 @@ COPY ["CMSMicroservice.Application/CMSMicroservice.Application.csproj", "CMSMicr
 COPY ["CMSMicroservice.Domain/CMSMicroservice.Domain.csproj", "CMSMicroservice.Domain/"]
 COPY ["CMSMicroservice.Infrastructure/CMSMicroservice.Infrastructure.csproj", "CMSMicroservice.Infrastructure/"]
 COPY ["CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj", "CMSMicroservice.Protobuf/"]
-RUN dotnet restore "CMSMicroservice.WebApi/CMSMicroservice.WebApi.csproj"
+RUN dotnet restore "CMSMicroservice.WebApi/CMSMicroservice.WebApi.csproj" --configfile ../NuGet.config
 COPY . .
 WORKDIR "/src/CMSMicroservice.WebApi"
 RUN dotnet build "CMSMicroservice.WebApi.csproj" -c Release -o /app/build

src/CMSMicroservice.WebApi/Program.cs

@@ -8,17 +8,29 @@ using Microsoft.Extensions.Logging;
 using Serilog.Core;
 using Serilog;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using Microsoft.OpenApi.Models;
 using CMSMicroservice.WebApi.Common.Behaviours;
 using Hangfire;
 using Hangfire.SqlServer;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
 
 var builder = WebApplication.CreateBuilder(args);
+
+if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+{
+    builder.WebHost.ConfigureKestrel(options =>
+    {
+        // Setup a HTTP/2 endpoint without TLS.
+        options.ListenLocalhost(5000, o => o.Protocols =
+            HttpProtocols.Http2);
+    });
+}
 var levelSwitch = new LoggingLevelSwitch();
 
 // Read Seq configuration from appsettings.json
 var seqServerUrl = builder.Configuration["Seq:ServerUrl"] ?? "http://seq-svc:5341";
-var seqApiKey = builder.Configuration["Seq:ApiKey"];
+var seqApiKey = builder.Configuration["Seq:ApiKey"]; 
 
 var logger = new LoggerConfiguration()
      .WriteTo.Console()
@@ -30,7 +42,7 @@ var logger = new LoggerConfiguration()
      //        AutoCreateSqlTable = true
      //    })
      .WriteTo.Seq(seqServerUrl,
-                  apiKey: string.IsNullOrEmpty(seqApiKey) ? null : seqApiKey,
+                  apiKey: string.IsNullOrEmpty(seqApiKey) ? null : seqApiKey, 
                   controlLevelSwitch: levelSwitch)
     .CreateLogger();
 builder.Logging.AddSerilog(logger);

src/CMSMicroservice.WebApi/Workers/DayaLoanCheckWorker.cs

@@ -115,7 +115,7 @@ public class DayaLoanCheckWorker
             "daya-loan-check",
             worker => worker.ExecuteAsync(),
             "*/15 * * * *", // هر 15 دقیقه
-            TimeZoneInfo.Utc
+            TimeZoneInfo.Local
         );
     }
 }

src/CMSMicroservice.WebApi/appsettings.json

@@ -44,6 +44,12 @@
     "BaseUrl": "https://api.daya.ir",
     "ApiKey": "YOUR_DAYA_API_KEY"
   },
+  "DayaApi": {
+    "UseMock": false,
+    "BaseAddress": "https://testdaya.tadbirandishan.com",
+    "MerchantPermissionKey": "56146364$04sXjethI5WxhItR1Q9xnmFdJzl2BB8Bclsq8dAy7YVSZp3vtt-wP7ivrcCvmKLq",
+    "CacheDurationMinutes": 20
+  },
   "AllowedHosts": "*",
   "Kestrel": {
     "EndpointDefaults": {