ducnt hai 4 semanas
pai
achega
d7f2139ed6

+ 2 - 2
EsimLao/Common/CommonLogic.cs

@@ -18,7 +18,7 @@ public class CommonLogic
 {
     private static readonly log4net.ILog log = log4net.LogManager.GetLogger(typeof(CommonLogic));
 
-    public static String GenToken(IConfiguration configuration, String msisdn, String accountId)
+    public static String GenToken(IConfiguration configuration, String Email, String accountId)
     {
         var issuer = configuration["Jwt:Issuer"];
         var audience = configuration["Jwt:Audience"];
@@ -29,7 +29,7 @@ public class CommonLogic
                 new[]
                 {
                     new Claim("Id", Guid.NewGuid().ToString()),
-                    new Claim("Msisdn", msisdn),
+                    new Claim("Msisdn", Email),
                     new Claim("AccountId", accountId),
                     new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString())
                 }

+ 6 - 0
EsimLao/Common/Http/ContentRequest.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 
 namespace Common.Http
 {
@@ -25,8 +26,13 @@ namespace Common.Http
     public class CustomerReviewCreateReq
     {
         public string? lang { get; set; } = "lo";
+        
+        [Required(ErrorMessage = "Customer name is required")]
         public string customerName { get; set; } = null!;
+        
+        [Required(ErrorMessage = "Review content is required")]
         public string reviewContent { get; set; } = null!;
+        
         public string? destination { get; set; }
         public int rating { get; set; }
     }

+ 0 - 11
EsimLao/Esim.Apis/Business/Content/ContentBusinessImpl.cs

@@ -164,17 +164,6 @@ namespace Esim.Apis.Business
             {
                 string lang = CommonLogic.GetLanguage(httpRequest, request.lang);
 
-                // Validate required fields
-                if (string.IsNullOrEmpty(request.customerName) || string.IsNullOrEmpty(request.reviewContent))
-                {
-                    return DotnetLib.Http.HttpResponse.BuildResponse(
-                        log, url, json,
-                        CommonErrorCode.RequiredFieldMissing,
-                        ConfigManager.Instance.GetConfigWebValue("REQUIRED_FIELD_MISSING", lang),
-                        new { }
-                    );
-                }
-
                 // Create new review (pending approval)
                 var review = new CustomerReview
                 {

+ 16 - 0
EsimLao/Esim.Apis/Controllers/ContentController.cs

@@ -53,6 +53,22 @@ namespace RevoSystem.Apis.Controllers
         [Route(ApiUrlConstant.CustomerReviewCreateUrl)]
         public async Task<IActionResult> CustomerReviewCreate([FromBody] CustomerReviewCreateReq request)
         {
+            if (!ModelState.IsValid)
+            {
+                var errors = ModelState.Values
+                    .SelectMany(v => v.Errors)
+                    .Select(e => e.ErrorMessage)
+                    .ToList();
+                
+                string lang = Common.Logic.CommonLogic.GetLanguage(HttpContext.Request, request?.lang);
+                return DotnetLib.Http.HttpResponse.BuildResponse(
+                    log, HttpContext.Request.Path, Newtonsoft.Json.JsonConvert.SerializeObject(request),
+                    CommonErrorCode.RequiredFieldMissing,
+                    string.Join("; ", errors),
+                    new { }
+                );
+            }
+            
             return await contentBusiness.CustomerReviewCreate(HttpContext.Request, request);
         }