#34182 changes for registration tracker

# Conflicts:
#	Business/Mobile/MobileServices.cs

Business/Mobile/IMobileServices.cs

@@ -96,6 +96,8 @@ namespace Business.Mobile
         JsonRxResponse GetFieldsByProduct(MappingType type, string customer, string receiverId, string payoutPartner);
         JsonRxResponse ValidateReferralCode(string referralCode);
 
+        JsonRxResponse TempUserRegister(TempUserRegisterModel tempUserRegister);
+
         //JsonRxResponse QueryAddress(string postCode);
     }
 }

Business/Mobile/MobileServices.cs

@@ -749,8 +749,6 @@ namespace Business.Mobile
                     Language = Convert.ToString(CallContext.GetData(Constants.Language))
                 };
                 Log.Debug("RegisterKYC | DB RESPONSE" + JsonConvert.SerializeObject(rep));
-
-
                 return rep;
             }
             catch (Exception ex)
@@ -1779,6 +1777,7 @@ namespace Business.Mobile
             }
             return _resp;
         }
+
         public JsonRxResponse NewUserRegister(NewUserRegisterModel newUserRegister)
         {
             var lang = Convert.ToString(CallContext.GetData(Constants.Language));
@@ -1833,6 +1832,13 @@ namespace Business.Mobile
                     return calculateAge;
                 }
 
+                //var calculateAge = CalculateAge(dob);
+                Log.Debug("NewUserRegister.IsValidAge | RESPONSE : " + JsonConvert.SerializeObject(calculateAge));
+                if (calculateAge.ErrorCode != "0")
+                {
+                    return calculateAge;
+                }
+
                 newUserRegister.MobileNumber = newUserRegister.MobileNumber.getUKFormattedNumber();
 
                 res = _requestServices.NewUserRegister(newUserRegister);
@@ -2554,11 +2560,11 @@ namespace Business.Mobile
 
                 }
 
-                if (receiver.address.Contains("@") && receiver.address.IsValidEmail())
-                {
-                    jsonResult.SetResponse("1", "Please input valid receiver address!");
-                    return jsonResult;
-                }
+                //if (receiver.address.Contains("@") && receiver.address.IsValidEmail())
+                //{
+                //    jsonResult.SetResponse("1", "Please input valid receiver address!");
+                //    return jsonResult;
+                //}
                 jsonResult = _requestServices.AddReceiver(customerId, receiver);
 
                 if (jsonResult.ErrorCode == "0")
@@ -3111,5 +3117,63 @@ namespace Business.Mobile
                 return jsonRx;
             }
         }
+
+        public JsonRxResponse TempUserRegister(TempUserRegisterModel tempUserRegister)
+        {
+            var lang = Convert.ToString(CallContext.GetData(Constants.Language));
+
+            JsonRxResponse res = new JsonRxResponse();
+            try
+            {
+                string fullName = tempUserRegister.FullName;
+                string mobileNo = tempUserRegister.MobileNumber;
+                string enumString = string.Empty;
+                string regStep = tempUserRegister.RegStep;
+
+                if (regStep == "1")
+                {
+                    var ds = _requestServices.GetCustId();
+                    string custId = "";
+                    if (ds.Tables[0].Rows.Count > 0)
+                    {
+                        custId = ds.Tables[0].Rows[0]["tempCustId"]?.ToString();
+                    }
+
+                    int newCustId = 1;
+                    tempUserRegister.tempCustId = newCustId.ToString();
+
+                    if (!string.IsNullOrEmpty(custId))
+                    {
+                        newCustId = int.Parse(custId) + 1;
+                        tempUserRegister.tempCustId = newCustId.ToString();
+                    }
+                }
+
+                else if (regStep == "2")
+                {
+                    if (!tempUserRegister.Email.IsValidEmail())
+                    {
+                        enumString = RESPONSE_MSG.NEW_USER_REGISTER_FAIL_4.ToString(); ;
+                        var map = Utilities.GetLanguageMapping(enumString, lang);
+                        res.SetResponse("100", map.Message);
+
+                        return res;
+                    }
+                }
+
+                tempUserRegister.MobileNumber = tempUserRegister.MobileNumber.getUKFormattedNumber();
+
+                res = _requestServices.TempUserRegister(tempUserRegister);
+
+                Log.Debug("TempUserRegister | completed with db response. " + "ErrorCode: " + res.ErrorCode + " Msg: " + res.Msg);
+                return res;
+            }
+            catch (Exception ex)
+            {
+                Log.Error("Something Went Wrong, Please Try Again!!", ex);
+                res.SetResponse("1", "Error occurred while registering the customer.");
+                return res;
+            }
+        }
     }
 }

Common/Common.csproj

@@ -97,6 +97,7 @@
     <Compile Include="Model\CustomerRegister\NewUserRegisterModel.cs" />
     <Compile Include="Model\CustomerRegister\OldUserAccessRequestModel.cs" />
     <Compile Include="Model\CustomerRegister\OldUserRegisterModel.cs" />
+    <Compile Include="Model\CustomerRegister\TempUserRegisterModel.cs" />
     <Compile Include="Model\Customer\LoadReceiverAccount.cs" />
     <Compile Include="Model\DateFilterParams.cs" />
     <Compile Include="Model\DepositSlip\DepositSlip.cs" />
@@ -107,6 +108,7 @@
     <Compile Include="Model\ExRateResponse.cs" />
     <Compile Include="Model\External\CallbackParam.cs" />
     <Compile Include="Model\External\CallbackTpResponse.cs" />
+    <Compile Include="Model\FireApi\AccessToken.cs" />
     <Compile Include="Model\GetDetailForDllTxn.cs" />
     <Compile Include="Model\Inbound\InboundBanks.cs" />
     <Compile Include="Model\Inbound\TranHistory.cs" />

Common/Model/Config/ResponseMsgType.cs

@@ -264,6 +264,10 @@ namespace Common.Model.Config
 
         [Description("mobile/newUserRegister")]
         NEW_USER_REGISTER_FAIL_8,
+
+        [Description("mobile/newUserRegister")]
+        NEW_USER_REGISTER_FAIL_9,
+
         [Description("mobile/requestOTP")]
         REQUEST_OTP_SUCCESS_1,
 

Common/Model/CustomerRegister/NewUserRegisterModel.cs

@@ -38,7 +38,7 @@ namespace Common.Model.CustomerRegister
         public string Nationality { get; set; }
         [Required]
         public string Gender { get; set; }
-
+        public string TempCustId { get; set; }
 
     }
 }

Common/Model/CustomerRegister/TempUserRegisterModel.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Common.Model.CustomerRegister
+{
+    public class TempUserRegisterModel
+    {
+        [Required(ErrorMessage = "Full Name is required.")]
+        public string FullName { get; set; }
+        [Required]
+        public string MobileNumber { get; set; }
+        public string Email { get; set; }
+        public string AppVersion { get; set; }
+        public string phoneBrand { get; set; }
+        public string phoneOs { get; set; }
+        public string fcmId { get; set; }
+        public string osVersion { get; set; }
+        public string RegStep { get; set; }
+        public string tempCustId { get; set; }
+        public string flag { get; set; }
+    }
+}

Common/Model/DateFilterParams.cs

@@ -8,6 +8,7 @@
         public string Page { get; set; }
 
         public string PageCount { get; set; }
+        public string ViewAll { get; set; }
         //public string tranId { get; set; }
     }
 }

Common/Model/ExRateCalculateRequest.cs

@@ -23,7 +23,6 @@ namespace Common.Model
         public string tpPCurrnecy { get; set; }
         public string userId { get; set; }
         public string discountedFee { get; set; }
-
         public string DeviceType { get; set; }
     }
 

JsonRx/Api/CustomerController.cs

@@ -412,5 +412,64 @@ namespace JsonRx.Api
             }
             return ModelValidationError(ModelState);
         }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="registerParam"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ApplicationLevelAuthentication]
+        [Route("mobile/tempUserRegister")]
+        public IHttpActionResult TempUserRegister(TempUserRegisterModel tempUserRegister)
+        {
+            var processid = Guid.NewGuid().ToString();
+            LogicalThreadContext.Properties[LoggerProperty.PROCESSID] = processid;
+            LogicalThreadContext.Properties[LoggerProperty.CREATEDBY] = tempUserRegister.Email;
+            LogicalThreadContext.Properties[LoggerProperty.METHODNAME] = "TempUserRegister";
+
+            Log.Debug("TempUserRegister | REQUEST : " + JsonConvert.SerializeObject(tempUserRegister));
+
+            JsonRxResponse res = new JsonRxResponse();
+
+            if (string.IsNullOrEmpty(tempUserRegister.MobileNumber))
+            {
+                res.SetResponse("100", "Mobile Number is required!");
+                return Ok(res);
+            }
+
+            if (string.IsNullOrEmpty(tempUserRegister.Email))
+            {
+                tempUserRegister.RegStep = "1";
+                tempUserRegister.flag = "sign-up-temp-cust";
+            }
+            else
+            {
+                tempUserRegister.RegStep = "2";
+                tempUserRegister.flag = "update-temp-cust";
+            }
+
+            if (tempUserRegister.RegStep == "2")
+            {
+                if (string.IsNullOrEmpty(tempUserRegister.Email))
+                {
+                    res.SetResponse("100", "Email is required!");
+                    return Ok(res);
+                }
+            }
+            Validate(tempUserRegister);
+            if (ModelState.IsValid)
+            {
+                tempUserRegister.FullName = tempUserRegister.FullName.ToTitleCase(TitleCase.All);
+                var custRegisterResponse = _requestServices.TempUserRegister(tempUserRegister);
+                if (custRegisterResponse.ErrorCode == "0")
+                {
+                    tempUserRegister.tempCustId = custRegisterResponse.Id;
+                }
+                Log.Debug("TempUserRegister | RESPONSE : " + JsonConvert.SerializeObject(custRegisterResponse));
+
+                return Ok(custRegisterResponse);
+            }
+            return ModelValidationError(ModelState, "100");
+        }
     }
 }

JsonRx/Api/MobileController.cs

@@ -165,15 +165,7 @@ namespace JsonRx.Api
             requestOTPModel.DeviceType = Util.GetDeviceType(Request);
             requestOTPModel.ProcessId = ProcessId;
             Log.Debug("RequestOTP | REQUEST : " + JsonConvert.SerializeObject(requestOTPModel));
-
-
             JsonRxResponse staticDataResponse = new JsonRxResponse();
-            //if (string.IsNullOrEmpty(requestOTPModel.userId))
-            //{
-            //    staticDataResponse.SetResponse("100", "Email is required!");
-            //    return Ok(staticDataResponse);
-            //}
-
              staticDataResponse = _requestServices.RequestOTP(requestOTPModel);
             return Ok(staticDataResponse);
         }
@@ -228,9 +220,7 @@ namespace JsonRx.Api
             LogicalThreadContext.Properties[LoggerProperty.CREATEDBY] = model.userId ?? model.pCurrency;
             LogicalThreadContext.Properties[LoggerProperty.METHODNAME] = "CalculateDefExRate";
             LogicalThreadContext.Properties[LoggerProperty.IPADDRESS] = Request.GetClientIpAddress();
-
             model.DeviceType = Util.GetDeviceType(Request);
-
             Log.Debug("CalculateDefExRate | REQUEST : " + JsonConvert.SerializeObject(model));
             if (ModelState.IsValid)
             {

JsonRx/Config/ResponseMsg.json

@@ -769,6 +769,11 @@
     "Message": "Password is missing!",
     "Lang": "en"
   },
+  {
+    "Key": "NEW_USER_REGISTER_FAIL_9",
+    "Message": "The mobile number should either be maximum length of '13' number including '+44' or be '10' excluding '+44'",
+    "Lang": "en"
+  },
   {
     "Key": "USER_REGISTER_FAIL_7",
     "Message": "Invalid Referral Code!",

Repository/Authentication/AuthenticationRepo.cs

@@ -129,7 +129,7 @@ namespace Repository.Authentication
                 ls.ErrorCode = "1";
               //   ls.Msg = dataTable.Rows[0]["errorCode"] +  Convert.ToString(dataTable.Rows[0]["msg"]);
 
-                ////return ls;
+                //return ls;
                 //string enumString = string.Empty;
 
                 //if (dataTable.Rows[0]["errorCode"].Equals("1"))

Repository/Mobile/IMobileServicesRepo.cs

@@ -104,5 +104,9 @@ namespace Repository.Mobile
        //ataSet StaticQueryAddress();
 
         List<KeyValues> GetPaymentMethod(string receiverId, string pcountryid);
+
+        JsonRxResponse TempUserRegister(TempUserRegisterModel tempUserRegister);
+
+        DataSet GetCustId();
     }
 }

Repository/Mobile/MobileServicesRepo.cs

@@ -1341,6 +1341,7 @@ namespace Repository.Mobile
             sql += ", @address2 = " + _dao.FilterString(newUserRegister.Address2);
             sql += ", @city = " + _dao.FilterString(newUserRegister.City);
             sql += ", @gender = " + _dao.FilterString(newUserRegister.Gender);
+            sql += ", @tempCustId = " + _dao.FilterString(newUserRegister.TempCustId);
 
             if (!string.IsNullOrEmpty(newUserRegister.FullName))
             {
@@ -1393,6 +1394,10 @@ namespace Repository.Mobile
             {
                 enumString = RESPONSE_MSG.NEW_USER_REGISTER_FAIL_8.ToString();
             }
+            else if (res.ResponseCode.Equals("9"))
+            {
+                enumString = RESPONSE_MSG.NEW_USER_REGISTER_FAIL_9.ToString();
+            }
             var map = Utilities.GetLanguageMapping(enumString, lang);
 
             return new JsonRxResponse { ErrorCode = res.ResponseCode.Equals("0") ? "0" : "1", Msg = map.Message, Id = res.Id, Extra = res.Extra };
@@ -3240,5 +3245,35 @@ namespace Repository.Mobile
 
             return new JsonRxResponse { ErrorCode = res.ResponseCode.Equals("0") ? "0" : "1", Msg = map.Message, Id = res.Id, Extra = res.Extra };
         }
+
+        public JsonRxResponse TempUserRegister(TempUserRegisterModel tempUserRegister)
+        {
+            var lang = Convert.ToString(CallContext.GetData(Constants.Language));
+
+            var sql = "EXEC JsonRx_Proc_UserRegistration_V2";
+            sql += " @flag = " + _dao.FilterString(tempUserRegister.flag);
+            sql += ", @fullName = " + _dao.FilterString(tempUserRegister.FullName);
+            sql += ", @mobile = " + _dao.FilterString(tempUserRegister.MobileNumber);
+            sql += ", @username = " + _dao.FilterString(tempUserRegister.Email);
+            sql += ", @appVersion = " + _dao.FilterString(tempUserRegister.AppVersion);
+            sql += ", @phoneBrand = " + _dao.FilterString(tempUserRegister.phoneBrand);
+            sql += ", @phoneOs = " + _dao.FilterString(tempUserRegister.phoneOs);
+            sql += ", @fcmId = " + _dao.FilterString(tempUserRegister.fcmId);
+            sql += ", @osVersion = " + _dao.FilterString(tempUserRegister.osVersion);
+            sql += ", @tempCustId = " + _dao.FilterString(tempUserRegister.tempCustId);
+
+            Log.DebugFormat("TempUserRegister | SQL : {0}", sql);
+
+            var res = _dao.ParseDbResult(sql);
+
+            return new JsonRxResponse { ErrorCode = res.ResponseCode.Equals("0") ? "0" : "1", Msg = res.Msg, Id = res.Id, Extra = res.Extra };
+        }
+
+        public DataSet GetCustId()
+        {
+            var sql = "EXEC JsonRx_Proc_UserRegistration_V2 @flag='get-id'";
+            Log.DebugFormat("GetCustId | SQL : {0} | {1}", sql);
+            return _dao.ExecuteDataset(sql);
+        }
     }
 }

Repository/MobileV2/MobileV2Repo.cs

@@ -27,12 +27,14 @@ namespace Repository.MobileV2
             MyTransferDto myTransferDto = new MyTransferDto() { Receivers = new List<ReceiverV2>(), RecentTransactions = new List<TranHistoryResponse>() };
             var lang = Convert.ToString(CallContext.GetData(Constants.Language));
             JsonRxResponse jsonRx = new JsonRxResponse();
+            string viewOption = search.ViewAll;
             try
             {
                 var sql = "EXEC PROC_MOBILE_RECEIVER_INFORMATION";
                 sql += "  @flag = " + _dao.FilterString("receiver-info");
                 sql += ", @customerId = " + _dao.FilterString(customerId);
                 sql += ", @countryId = " + _dao.FilterString(countryid);
+                sql += ", @viewAll = " + _dao.FilterString(viewOption);
 
                 var dataSet = _dao.ExecuteDataset(sql);
                 List<ReceiverV2> rim = new List<ReceiverV2>();
@@ -90,6 +92,7 @@ namespace Repository.MobileV2
 
                 var sql1 = "Exec mobile_proc_TranHistory @flag='tran-history-v2'";
                 sql1 += ", @customerId =" + _dao.FilterString(customerId);
+                sql1 += ", @viewAll =" + _dao.FilterString(viewOption);
 
 
                 Log.DebugFormat("GetReceiverInformation | SQL : {0}", sql);