Modify RequestDTO in original RequestAsync

MehdiMst00 · Dec 21, 2023 · 62aa6ec · 62aa6ec
1 parent 880a3ee
commit 62aa6ec
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 12 deletions.
diff --git a/samples/Zarinpal.AspNetCore.Sample/appsettings.json b/samples/Zarinpal.AspNetCore.Sample/appsettings.json
@@ -7,8 +7,8 @@
   },
   "AllowedHosts": "*",
   "Zarinpal": {
-    "MerchantId": "xxxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx",
-    "ZarinpalMode": "Sandbox", // Original - Sandbox
+    "MerchantId": "41c2e177-2e5a-4f37-8cef-569f2b48bdcf",
+    "ZarinpalMode": "Original", // Original - Sandbox
     "Currency": "IRT", // IRR - IRT
     "UseAdvanced": true
   }

diff --git a/src/Zarinpal.AspNetCore/DTOs/ZarinpalRequestDTO.cs b/src/Zarinpal.AspNetCore/DTOs/ZarinpalRequestDTO.cs
@@ -12,15 +12,18 @@ public class ZarinpalRequestDTO
 
     public string? VerifyCallbackUrl { get; set; }
 
+    public string? OrderId { get; set; }
+
     public ZarinpalRequestDTO() { }
 
     public ZarinpalRequestDTO(int amount, string description, string verifyCallbackUrl,
-        string? email = null, string? mobile = null)
+        string? email = null, string? mobile = null, string? orderId = null)
     {
         Amount = amount;
         Description = description;
         VerifyCallbackUrl = verifyCallbackUrl;
         Email = email;
         Mobile = mobile;
+        OrderId = orderId;
     }
 }
diff --git a/src/Zarinpal.AspNetCore/Implementations/OriginalZarinpalService.cs b/src/Zarinpal.AspNetCore/Implementations/OriginalZarinpalService.cs
@@ -1,4 +1,6 @@
-namespace Zarinpal.AspNetCore.Implementations;
+using System.Text.Json.Serialization;
+
+namespace Zarinpal.AspNetCore.Implementations;
 
 public class OriginalZarinpalService : IZarinpalService
 {
@@ -38,8 +40,16 @@ public async Task<ZarinpalRequestResultDTO> RequestAsync(ZarinpalRequestDTO requ
                     Description = request.Description,
                     VerifyCallbackUrl = request.VerifyCallbackUrl,
                     Currency = _zarinpalOptions.Currency,
-                    Email = !string.IsNullOrEmpty(request.Email) ? request.Email : "",
-                    Mobile = !string.IsNullOrEmpty(request.Mobile) ? request.Mobile : "",
+                    Metadata = new RequestMetadataDTO
+                    {
+                        OrderId = request.OrderId,
+                        Email = request.Email,
+                        Mobile = request.Mobile,
+                    }
+                },
+                new JsonSerializerOptions
+                {
+                    DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
                 });
 
             if (response.IsSuccessStatusCode)

diff --git a/src/Zarinpal.AspNetCore/Models/Internal/Original/RequestDTO.cs b/src/Zarinpal.AspNetCore/Models/Internal/Original/RequestDTO.cs
@@ -7,12 +7,6 @@ internal class RequestDTO
     [JsonPropertyName("merchant_id")]
     public string? MerchantId { get; set; }
 
-    [JsonPropertyName("email")]
-    public string? Email { get; set; }
-
-    [JsonPropertyName("mobile")]
-    public string? Mobile { get; set; }
-
     [JsonPropertyName("amount")]
     public int Amount { get; set; }
 
@@ -24,6 +18,21 @@ internal class RequestDTO
 
     [JsonPropertyName("callback_url")]
     public string? VerifyCallbackUrl { get; set; }
+
+    [JsonPropertyName("metadata")]
+    public RequestMetadataDTO? Metadata { get; set; }
+}
+
+internal class RequestMetadataDTO
+{
+    [JsonPropertyName("email")]
+    public string? Email { get; set; }
+
+    [JsonPropertyName("mobile")]
+    public string? Mobile { get; set; }
+
+    [JsonPropertyName("order_id")]
+    public string? OrderId { get; set; }
 }
 
 internal class RequestResultData