diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs index eed6b4f..61a2190 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/DocumentRepository/DocumentRepository.cs @@ -3,6 +3,8 @@ using CustomerOnlineV2.Common.Models; using CustomerOnlineV2.Common.Models.DocumentModel; using CustomerOnlineV2.Repository.ConnectionHelper; using System; +using System.Collections; +using System.Data; namespace CustomerOnlineV2.Repository.Repository.DocumentRepository { @@ -102,32 +104,25 @@ namespace CustomerOnlineV2.Repository.Repository.DocumentRepository sql += ",@documentType =" + _connHelper.FilterString(doc.documentType); sql += ",@rowIdField =" + _connHelper.FilterString(doc.sessionId); + var dt = _connHelper.ExecuteDataTable(sql); if (dt == null || dt.Rows.Count <= 0) { doc.ResponseCode = ResponseHelper.FAILED; doc.ResponseMessage = "DB Null Error!"; - - } else { doc.ResponseCode = ResponseHelper.SUCCESS; doc.ResponseMessage = ResponseMessageHelper.SUCCESS; - - } } catch (Exception ex) { doc.ResponseCode = ResponseHelper.EXCEPTION; doc.ResponseMessage = "Exception occured: " + ex.Message; - } - return await Task.FromResult(doc); - - } public async Task UploadProfilePic(CustomerDocumentModel doc, string url, string user) @@ -146,8 +141,6 @@ namespace CustomerOnlineV2.Repository.Repository.DocumentRepository { doc.ResponseCode = ResponseHelper.FAILED; doc.ResponseMessage = "DB Null Error!"; - - } else { @@ -156,7 +149,6 @@ namespace CustomerOnlineV2.Repository.Repository.DocumentRepository doc.Extra = dt.Rows[0]["Extra"].ToString(); // doc.Extra1 = ApplicationConfig.GetMobileApiUrl(); doc.Extra2 = url; - } } catch (Exception ex) @@ -165,10 +157,7 @@ namespace CustomerOnlineV2.Repository.Repository.DocumentRepository doc.ResponseMessage = "Exception occured: " + ex.Message; } - return await Task.FromResult(doc); - - } } diff --git a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs index 8bb61a3..54b73df 100644 --- a/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs +++ b/CustomerOnlineV2/CustomerOnlineV2.Repository/Repository/RegisterRepository/RegisterRepository.cs @@ -106,22 +106,27 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository sql += " @Flag = " + _connHelper.FilterString("detail"); sql += ",@customerId= " + _connHelper.FilterString(loginDetails.UserId); //logger.LogDebug("HOMEREPOSITORY | GETTRANSACTIONDETAIL | SQL | " + sql); - var dt = _connHelper.ExecuteDataTable(sql); + var ds = _connHelper.ExecuteDataset(sql); - if (dt == null || dt.Rows.Count <= 0) + //if (dt == null || dt.Rows.Count <= 0) + //{ + // _response.ResponseCode = ResponseHelper.FAILED; + // _response.ResponseMessage = "DB Null Error!"; + + // //_logger.LogError("HOMEREPOSITORY | GETTRANSACTIONDETAIL | DB RESPONSE | " + JsonConvert.SerializeObject(_response)); + //} + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) { _response.ResponseCode = ResponseHelper.FAILED; _response.ResponseMessage = "DB Null Error!"; - - //_logger.LogError("HOMEREPOSITORY | GETTRANSACTIONDETAIL | DB RESPONSE | " + JsonConvert.SerializeObject(_response)); } else { - _response.ResponseCode = Convert.ToInt16(dt.Rows[0]["errorCode"]); - _response.ResponseMessage = Convert.ToString(dt.Rows[0]["msg"]); + _response.ResponseCode = Convert.ToInt16(ds.Tables[0].Rows[0]["errorCode"]); + _response.ResponseMessage = Convert.ToString(ds.Tables[0].Rows[0]["msg"]); List obj = new List(); - foreach (DataRow item in dt.Rows) + foreach (DataRow item in ds.Tables[0].Rows) { obj.Add(new CustomerListModel { @@ -142,7 +147,20 @@ namespace CustomerOnlineV2.Repository.Repository.RegisterRepository nativeCountry = Convert.ToString(item["ICountryName"]) }); } + List obj1 = new List(); + foreach (DataRow item in ds.Tables[1].Rows) + { + obj1.Add(new CustomerDocumentListModel + { + fileName = Convert.ToString(item["fileName"]), + fileType = Convert.ToString(item["fileType"]), + documentType = Convert.ToString(item["documentType"]), + documentName = Convert.ToString(item["documentName"]), + cdid = Convert.ToString(item["cdid"]), + }); + } _response.CustomerListModel = obj; + _response.CustomerDocumentListModel = obj1; } } catch (Exception ex) diff --git a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerDocumentController.cs b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerDocumentController.cs index b561f8c..09b420b 100644 --- a/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerDocumentController.cs +++ b/CustomerOnlineV2/CustomerOnlineV2/Controllers/CustomerDocumentController.cs @@ -89,38 +89,23 @@ namespace CustomerOnlineV2.Controllers var cd= await _business.GetCustomerImageSavePath(loginDetails.Email); doc.fileName = MyUploader.FileName; - - SaveFileToPath(MyUploader, cd.Id, Path.GetExtension(MyUploader.FileName), MyUploader.FileName, cd.Extra1); - - - //ReceiverInformationModel _response = new ReceiverInformationModel(); - var Document = await _business.AddCustomerDocument(doc, loginDetails.UserId, loginDetails.Email); - //if (ModelState.IsValid) - //{ - // string folder = null; - // if (doc.File != null) - // { - // if (doc.File.Length > 0) - // { - // Guid guid1 = Guid.NewGuid(); - // folder = "/attachement/docs/" + guid1 + doc.File.FileName; - // string uploadFolder = Path.Combine(webHostEnvironment.WebRootPath, "attachement/docs"); - // string uniqueFileName = guid1 + doc.File.FileName; - - // string filePath = Path.Combine(uploadFolder, uniqueFileName); - - // using (var stream = new FileStream(filePath, FileMode.Create)) - // { - // await doc.FormFile.CopyToAsync(stream); - // } - // } - // } - //} + SaveFileToPath(MyUploader, cd.Id, Path.GetExtension(MyUploader.FileName), MyUploader.FileName, cd.Extra1); + + var Document = await _business.AddCustomerDocument(doc, loginDetails.UserId, loginDetails.Email); return Document; } + private static byte[] ConvertIFormFileToByteArray(IFormFile file) + { + using (var memoryStream = new MemoryStream()) + { + file.CopyTo(memoryStream); + return memoryStream.ToArray(); + } + } + [HttpPost] [Authorization("UploadProfilePic")] public async Task UploadProfilePic(CustomerDocumentModel doc, IFormFile file)