added multi language support for doculink attachments

DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.json

@@ -10,8 +10,8 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    //"AnswerConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "AnswerConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
 
   }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments.Test/AttachmentsServiceTest.cs

@@ -20,7 +20,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentsAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponse();
             mockAttachmentService.Setup(service => service.GetAttachmentsAsync()).ReturnsAsync(mockResponse);
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
@@ -33,7 +33,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentsAsync_ShouldReturnStatusCode204()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<UploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getNoContentResponse();
             mockAttachmentService.Setup(service => service.GetAttachmentsAsync()).ReturnsAsync(mockResponse);
 
@@ -47,7 +47,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<UploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockAttachmentService.Setup(service => service.GetAttachmentByIdAsync(1)).ReturnsAsync(mockResponse);
 
@@ -61,7 +61,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentAsync_ShouldReturnStatusCode404()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<UploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockAttachmentService.Setup(service => service.GetAttachmentByIdAsync(99)).ReturnsAsync(mockResponse);
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
@@ -73,7 +73,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PostAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<UploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponse();
             var AttachmentResponse = await MockData.GetAttachmentInfo(0);
             var mockInputAttachment = await MockData.getInputAttachmentData();
@@ -89,7 +89,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PostAttachmentAsync_ShouldReturnStatusCode400()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<UploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockInputAttachment = await MockData.getInputAttachmentData();
             var mockResponse = await MockData.getBadRequestResponse();
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
@@ -105,7 +105,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PutAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<UploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponse();
             var AttachmentResponse = await MockData.GetAttachmentInfo(1);
             var mockInputAttachment = await MockData.getInputAttachmentData();
@@ -121,7 +121,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PutAttachmentAsync_ShouldReturnStatusCode400()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<UploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockInputAttachment = await MockData.getInputAttachmentData();
             var mockResponse = await MockData.getBadRequestResponse();
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
@@ -136,7 +136,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task DeleteAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<UploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockAttachmentService.Setup(service => service.DeleteAttachmentAsync(1)).ReturnsAsync(mockResponse);
             mockUploadService.Setup(service => service.Deletefile(""));
@@ -150,7 +150,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task DeleteAttachmentAsync_ShouldReturnStatusCode404()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<UploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockAttachmentService.Setup(service => service.DeleteAttachmentAsync(1)).ReturnsAsync(mockResponse);
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);

DamageAssesmentApi/DamageAssesment.Api.Attachments/Controllers/AttachmentsController.cs

@@ -15,10 +15,10 @@ namespace DamageAssesment.Api.Attachments.Controllers
         private IUploadService UploadService;
         private IAzureBlobService azureBlobService;
 
-        public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService UploadService)
+        public AttachmentsController(IAttachmentsProvider AttachmentsProvider,  IAzureBlobService azureBlobService)
         {
             this.AttachmentProvider = AttachmentsProvider;
-            this.UploadService = UploadService;
+            this.azureBlobService = azureBlobService;
         }
         /// <summary>
         /// Get all attachments.
@@ -92,7 +92,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                 if (attachmentInfo.Answers.Count > 0)
                 {
                     var Attachments =  await this.AttachmentProvider.GetAttachmentCounter();
-                    List<Models.Attachment> attachments =  UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
+                    List<Models.Attachment> attachments = await azureBlobService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
                     var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments);
                     if (result.IsSuccess)
                     {
@@ -121,7 +121,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                     var res =  await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
                     if (res.IsSuccess)
                     {
-                        List<Models.Attachment> attachments =  UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
+                        List<Models.Attachment> attachments = await azureBlobService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
                         var result = await this.AttachmentProvider.PutAttachmentAsync(attachments);
                         if (result.IsSuccess)
                         {
@@ -150,7 +150,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
             if (result.IsSuccess)
             {
                 // deleting file from folder
-                UploadService.Movefile(result.Attachment.URI);
+                azureBlobService.Movefile(result.Attachment.URI);
                 return Ok(result.Attachment);
             }
             return NotFound();

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json

@@ -16,8 +16,8 @@
     "BlobContainerName": "doculinks"
   },
   "ConnectionStrings": {
-    "AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    //"AttachmentConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "AttachmentConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
 
   }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DoculinkServiceTest.cs

@@ -15,9 +15,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentsLanguageAsync_ShouldReturnStatusCode204()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en",null)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", null)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "", null);
@@ -29,7 +29,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentsLinkTypeAsync_ShouldReturnStatusCode204()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getNoContentResponse();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
 
@@ -42,7 +42,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentsAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", null)).ReturnsAsync(mockResponse);
 
@@ -55,7 +55,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetActiveDocumentsAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
 
@@ -69,7 +69,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetActiveDocumentsLinkTypeIdAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
 
@@ -82,7 +82,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentsLinkTypeIdAsync_ShouldReturnStatusCode204()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getNoContentResponse();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
 
@@ -95,7 +95,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockDocumentService.Setup(service => service.GetDocumentAsync(1, "forms", "en")).ReturnsAsync(mockResponse);
 
@@ -109,7 +109,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentAsync_ShouldReturnStatusCode404()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.GetDocumentAsync(99, "forms", "en")).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -120,7 +120,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PostDocumentAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputDocument = await MockData.getInputDocumentData();
             var DocumentResponse = await MockData.GetDocuLinksInfo(0);
@@ -135,7 +135,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PostDocumentAsync_ShouldReturnStatusCode400()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockInputDocument = await MockData.getInputDocumentData();
             var mockResponse = await MockData.getBadRequestResponse();
             ReqDoculink documentInfo = null;
@@ -150,7 +150,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PutDocumentAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputDocument = await MockData.getInputDocumentData();
             var DocumentResponse = await MockData.GetDocuLinksInfo(1);
@@ -165,7 +165,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PutDocumentAsync_ShouldReturnStatusCode400()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputDocument = await MockData.getInputDocumentData();
             mockDocumentService.Setup(service => service.UpdateDocumentAsync(99, mockInputDocument)).ReturnsAsync(mockResponse);
@@ -178,7 +178,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task DeleteDocumentAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -190,7 +190,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task DeleteDocumentAsync_ShouldReturnStatusCode404()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -206,7 +206,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await LinkTypeMockData.getOkResponse();
             mockDocumentService.Setup(service => service.GetLinkTypesAsync("en")).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -219,7 +219,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode204()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await LinkTypeMockData.getNoContentResponse();
             mockDocumentService.Setup(service => service.GetLinkTypesAsync("en")).ReturnsAsync(mockResponse);
 
@@ -233,7 +233,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
             mockDocumentService.Setup(service => service.GetLinkTypeAsync(1, "en")).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -246,7 +246,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.GetLinkTypeAsync(99, "en")).ReturnsAsync(mockResponse);
 
@@ -259,7 +259,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(0);
             mockDocumentService.Setup(service => service.PostLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
@@ -273,7 +273,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode400()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
             var mockResponse = await LinkTypeMockData.getBadRequestResponse();
             mockDocumentService.Setup(service => service.PostLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
@@ -287,7 +287,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
             mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
@@ -301,7 +301,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
             mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99, mockInputDocument)).ReturnsAsync(mockResponse);
@@ -315,7 +315,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode400()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await LinkTypeMockData.getBadRequestResponse();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
             mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
@@ -329,7 +329,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
 
             mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
@@ -342,7 +342,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
+            var mockUploadService = new Mock<IAzureBlobService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
 

DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/MockData.cs

@@ -34,6 +34,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
                     docName = "",
                     Path = "www.google.com",
                     IsAttachments = false,
+                    Language = "en",
                     CustomOrder = 1
                 });
                 list.Add(new DocuLinks.Models.ResDoculink()
@@ -140,6 +141,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 docName = "",
                 Path = "www.google.com",
                 IsAttachments = false,
+                Language = "en",
                 CustomOrder = 1
             });
             return new Models.Doculink
@@ -167,6 +169,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 docName = "",
                 Path = "www.google.com",
                 IsAttachments = false,
+                Language="en",
                 CustomOrder = 1
             });
             List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Controllers/DoculinkController.cs

@@ -15,11 +15,11 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         private readonly IUploadService uploadService;
         private readonly IAzureBlobService azureBlobService;
 
-        public DoculinkController(IDoculinkProvider documentsProvider, IUploadService uploadService)
+        public DoculinkController(IDoculinkProvider documentsProvider, IAzureBlobService azureBlobService)
         {
 
             this.documentsProvider = documentsProvider;
-            this.uploadService = uploadService;
+            this.azureBlobService = azureBlobService;
 
         }
         /// <summary>
@@ -190,7 +190,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 if (dbdoc.IsSuccess)
                 {
                     var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink=  uploadService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
+                    Models.Doculink DocuLink= await azureBlobService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
                     var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
                     if (result.IsSuccess)
                     {
@@ -215,7 +215,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 if (documentInfo != null)
                 {
                     //var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink=  uploadService.UploadDocument(1, documentInfo);
+                    Models.Doculink DocuLink= await azureBlobService.UploadDocument(1, documentInfo);
                     var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
                     if (result.IsSuccess)
                     {
@@ -245,7 +245,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 // deleting file from folder
                 foreach (var item in result.Document.doclinksAttachments)
                 {
-                    uploadService.Movefile(item.Path);
+                    azureBlobService.Movefile(item.Path);
                 }
                 return Ok(result.Document);
             }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/DoculinkAttachments.cs

@@ -15,5 +15,6 @@ namespace DamageAssesment.Api.DocuLinks.Db
         public string Path { get; set; }
         public bool IsAttachments { get; set; }
         public int CustomOrder { get; set; }
+        public string Language { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Models/DoculinkAttachments.cs

@@ -8,6 +8,7 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public string docName { get; set; }
         public string Path { get; set; }
         public bool IsAttachments { get; set; }
+        public string Language { get; set; }
         public int CustomOrder { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Models/ReqDoculink.cs

@@ -17,6 +17,7 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public string? FileExtension { get; set; }
         public int CustomOrder { get; set; }
         public string url { get;set; }
+        public string Language { get; set; }
         public bool IsAttachments { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/AzureBlobService.cs

@@ -15,7 +15,7 @@ using System.Threading.Tasks;
 
 namespace DamageAssesment.Api.DocuLinks.Providers
 {
-    public class AzureBlobService: IAzureBlobService
+    public class AzureBlobService : IAzureBlobService
     {
         BlobServiceClient _blobClient;
         BlobContainerClient _containerClient;
@@ -32,7 +32,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
         public async Task<Models.Doculink> UploadDocument(int counter, ReqDoculink documentInfo)
         {
             Models.Doculink Documents = new Models.Doculink();
-            List <Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
+            List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
             try
             {
                 string path = "", UserfileName = "";
@@ -55,7 +55,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         }
                         else
                             path = item.url;
-                        attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder });
+                        attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder, Language = item.Language });
                     }
                 }
                 Documents = new Models.Doculink()
@@ -84,7 +84,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             {
                 foreach (var item in document.doclinksAttachments)
                 {
-                     Movefile(item.Path);
+                    Movefile(item.Path);
                 }
                 string path = "", UserfileName = "";
                 List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
@@ -104,7 +104,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     }
                     else
                         path = item.url;
-                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder });
+                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder, Language = item.Language });
                 }
                 Models.Doculink Documents = new Models.Doculink()
                 {
@@ -148,7 +148,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
         {
             var list = movefilename.Split('.');
             if (list.Length > 0)
-                list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") +"_"+ DateTime.Now.ToShortTimeString().Replace("/", "_")+"." + list[list.Length - 1];
+                list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") + "_" + DateTime.Now.ToShortTimeString().Replace("/", "_") + "." + list[list.Length - 1];
             return string.Join("_", list);
         }
         public void Movefile(string path)
@@ -162,28 +162,28 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     BlobClient sourceBlobClient = _containerClient.GetBlobClient(path);
                     BlobClient destinationBlobClient = _containerClient.GetBlobClient(MovePath);
                     // Start the copy operation from the source to the destination
-                     destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri);
+                    destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri);
 
                     // Check if the copy operation completed successfully
-                     WaitForCopyToComplete(destinationBlobClient);
+                    WaitForCopyToComplete(destinationBlobClient);
 
                     // Delete the source blob after a successful copy
-                     sourceBlobClient.DeleteIfExists();
+                    sourceBlobClient.DeleteIfExists();
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
 
             }
         }
-        static void  WaitForCopyToComplete(BlobClient blobClient)
+        static void WaitForCopyToComplete(BlobClient blobClient)
         {
-            BlobProperties properties =  blobClient.GetProperties();
+            BlobProperties properties = blobClient.GetProperties();
 
             while (properties.CopyStatus == CopyStatus.Pending)
             {
-                 Task.Delay(TimeSpan.FromSeconds(1));
-                properties =  blobClient.GetProperties();
+                Task.Delay(TimeSpan.FromSeconds(1));
+                properties = blobClient.GetProperties();
             }
         }
         public void DeleteFile(string url)

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs

@@ -6,10 +6,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System;
-using System.Collections.Immutable;
 using System.Diagnostics.Eventing.Reader;
 using System.Reflection.Metadata;
-using System.Xml;
 using System.Xml.Linq;
 
 namespace DamageAssesment.Api.DocuLinks.Providers
@@ -67,20 +65,13 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 int counter = 0;
                 for (int i = 1; i <= 4; i++)
                 {
-                    int linkTypeId = 2;
-                    FileModel fileModel = new FileModel();
-                    if (i < 3)
-                    {
-                        linkTypeId = 1;
-
-                        fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 };
-                    }
-                    else
-                        fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
+                    FileModel fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
                     ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
-                    Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
+                    Db.DoculinkTranslation documents = new Db.DoculinkTranslation { DocumentId = i, title = "Test" + i, description = "ss" + i, Language = "en" };
+                    Models.Doculink document = await azureBlobService.UploadDocument(counter, documentInfo);
                     DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
                     DocumentDbContext.SaveChanges();
+                    DocumentDbContext.DocumentsTranslations.AddRange(documents);
                     var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(document.doclinksAttachments);
                     dbattachments.ForEach(a => a.DocumentId = i);
                     DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
@@ -88,34 +79,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     counter++;
                 }
             }
-            if (!DocumentDbContext.DocumentsTranslations.Any())
-            {
-                string[] titles = {
-                         "Mobile App Damage Assessment Instructions",
-                         "PC Damage Assessment Instructions",
-                         "Emergency Evacuation centers",
-                         "Mobile App Damage Assessment Instructions" };
-                string[] esTranslations = {
-                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil",
-                         "Instrucciones de Evaluación de Daños del PC",
-                         "Centros de Evacuación de Emergencia",
-                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil"  };
-                string[] frTranslations = {
-                      "Instructions d'Évaluation des Dommages de l'Application Mobile",
-                      "Instructions d'Évaluation des Dommages du PC",
-                       "Centres d'Évacuation d'Urgence",
-                       "Instructions d'Évaluation des Dommages de l'Application Mobile" };
-                List<Db.DoculinkTranslation> documents = new List<Db.DoculinkTranslation>();
-                for (int i = 0; i < 4; i++)
-                {
-                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = titles[i], description = titles[i], Language = "en" });
-                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = esTranslations[i], description = esTranslations[i], Language = "es" });
-                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = frTranslations[i], description = frTranslations[i], Language = "fr" });
-                }
-                DocumentDbContext.DocumentsTranslations.AddRange(documents);
-                DocumentDbContext.SaveChanges();
-            }
-
         }
         public List<Models.DoculinkTranslation> GetDocumentTranslations(int id, string? language)
         {
@@ -172,7 +135,19 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             MultiLanguage = dicttitle;
             return MultiLanguage;
         }
-
+        private List<Models.DoculinkAttachments> GetDocumentAttachment(int id, string? language)
+        {
+            if (string.IsNullOrEmpty(language))
+            {
+                return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                    DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+            }
+            else
+            {
+                return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList());
+            }
+        }
         public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
         {
 
@@ -180,7 +155,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             {
                 logger?.LogInformation("Query Question");
                 var documents = new List<Db.Doculink>();
-                if (linkTypeId==null)
+                if (linkTypeId == null)
                     documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
                 else
                     documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
@@ -194,10 +169,9 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         item.titles = multilan.titles;
                         item.description = multilan.description;
                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
+                        item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
                     }
-                   // List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
+                    // List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -230,10 +204,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         item.titles = multilan.titles;
                         item.description = multilan.description;
                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
+                        item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
                     }
-                    //List<ResDoculinks> doculinks =  result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -286,8 +258,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
                             DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
 
-                    result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+                    result.doclinksAttachments = GetDocumentAttachment(id, "");
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -319,8 +290,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
                     result.titles = multilan.titles;
                     result.description = multilan.description;
-                    result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+                    result.doclinksAttachments = GetDocumentAttachment(id, language);
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -431,8 +401,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 result.titles = multilan.titles;
                 result.description = multilan.description;
                 result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, ""));
-                result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                    DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+                result.doclinksAttachments = GetDocumentAttachment(id, "");
                 Document.IsActive = false;
                 DocumentDbContext.Documents.Update(Document);
                 DocumentDbContext.SaveChanges();
@@ -450,7 +419,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
         {
             try
             {
-                int AttachmentId = DocumentDbContext.DoclinksAttachments.Max(a => a.Id);
+                int AttachmentId = DocumentDbContext.Documents.Max(a => a.Id);
                 return (true, AttachmentId, "");
             }
             catch (Exception ex)

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/UploadService.cs

@@ -32,7 +32,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
             try
             {
-                string path = "", UserfileName="";
+                string path = "", UserfileName = "";
                 var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
                 if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
                     Directory.CreateDirectory(fullDirectoryPath);
@@ -51,16 +51,23 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         }
                         else
                             path = item.url;
-                        attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
+                        attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder, Language = item.Language });
                     }
                 }
-                Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
-                    IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true};
+                Documents = new Models.Doculink()
+                {
+                    linkTypeId = documentInfo.linkTypeId,
+                    documentsTranslations = documentInfo.documentsTranslations,
+                    doclinksAttachments = attachments,
+                    IsDeleted = false,
+                    CustomOrder = documentInfo.CustomOrder,
+                    IsActive = true
+                };
 
                 return Documents;
             }
-            catch (Exception ex) {
+            catch (Exception ex)
+            {
                 return new Models.Doculink();
             }
 
@@ -93,15 +100,15 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     }
                     else
                         path = item.url;
-                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
+                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder, Language = item.Language });
                 }
                 Models.Doculink Documents = new Models.Doculink()
                 {
                     Id = documentInfo.Id,
                     linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations=documentInfo.documentsTranslations,
+                    documentsTranslations = documentInfo.documentsTranslations,
                     IsActive = true,
-                    IsDeleted=false,
+                    IsDeleted = false,
                     CustomOrder = documentInfo.CustomOrder,
                     doclinksAttachments = attachments
                 };
@@ -109,7 +116,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 return Documents;
             }
 
-             catch (Exception ex) {
+            catch (Exception ex)
+            {
                 return new Models.Doculink();
             }
         }
@@ -118,7 +126,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             if (path != "")
             {
                 FileInfo file = new FileInfo(path);
-                if (file?.Exists??false)//check file exsit or not  
+                if (file?.Exists ?? false)//check file exsit or not  
                 {
                     file.Delete();
                 }
@@ -134,8 +142,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 FileInfo file = new FileInfo(path);
                 if (file?.Exists ?? false)//check file exsit or not  
                 {
-                    string filename = file.Name.Replace(file.Extension, " ") + DateTime.Now.ToShortDateString().Replace("/","_") + file.Extension;
-                    file.MoveTo(pathToSave+"\\"+ filename);
+                    string filename = file.Name.Replace(file.Extension, " ") + DateTime.Now.ToShortDateString().Replace("/", "_") + file.Extension;
+                    file.MoveTo(pathToSave + "\\" + filename);
                 }
             }
         }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json

@@ -10,8 +10,8 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DoculinkConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    //"DoculinkConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"DoculinkConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "DoculinkConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
 
   },
   "Fileupload": {

DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs

@@ -77,7 +77,8 @@ namespace DamageAssesment.Api.Employees.Providers
                     EmployeeDbContext.Employees.Add(_employee);
                     Employee.Id = _employee.Id;
                     EmployeeDbContext.SaveChanges();
-                    return (true, Employee, null);
+                    //return (true, Employee, null);
+                    return (true, mapper.Map<Db.Employee, Models.Employee>(_employee), null);
                 }
                 return (false, null, "Employee code is already exits");
             }

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

@@ -10,8 +10,8 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    //"EmployeeConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "EmployeeConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
 
   }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.json

@@ -13,8 +13,8 @@
   //  "LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
   //},
   "ConnectionStrings": {
-    "LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    //"LocationConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "LocationConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
 
   }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json

@@ -10,8 +10,8 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "QuestionConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    //"QuestionConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"QuestionConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "QuestionConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
 
   }
 }

DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs

@@ -472,13 +472,13 @@ namespace DamageAssesment.Api.Responses.Providers
                              where answer.LocationId.Equals(location.Id)
                              select new 
                              {
-                                 answer.Id,
-                                 answer.QuestionId,
-                                 answer.AnswerText,
-                                 answer.Comment,
-                                 location.RegionId,
-                                 LocationId = location.Id,
-                                 answer.SurveyResponseId
+                                answer.Id,
+                                answer.QuestionId,
+                                answer.AnswerText,
+                                answer.Comment,
+                                location.RegionId,
+                                LocationId = location.Id,
+                                answer.SurveyResponseId
                              };
 
                
@@ -505,7 +505,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                   where u.RegionId.Equals(region.Id)
                                   select u.Answers; 
    
-                    resultList.Add(new { RegionId = region.Id, region.Name, region.Abbreviation, Answers = answers });
+                    resultList.Add(new { RegionId = region.Id, region.Name, region.Abbreviation, Answers = answers});
                 }
                 //return the object result
                 return new { Regions = resultList };
@@ -1052,7 +1052,7 @@ namespace DamageAssesment.Api.Responses.Providers
             {
                 if (request != null)
                 {
-                    var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId, ClientDevice = request.ClientDevice, KeyAnswerResult = request.KeyAnswerResult, Latitude = Convert.ToDouble(request.Latitude), Longitute = Convert.ToDouble(request.Longitute), CreatedDate = DateTime.Now });
+                    var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId, ClientDevice = request.ClientDevice, KeyAnswerResult = request.KeyAnswerResult, Latitude = Convert.ToDouble(request.Latitude), Longitute = Convert.ToDouble(request.Longitute), CreatedDate=DateTime.Now });
                     if (response.IsSuccess)
                     {
                         var surveyResponse = response.SurveyResponse;

DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json

@@ -10,8 +10,8 @@
     "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
   },
   "ConnectionStrings": {
-    "ResponsesConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    //"ResponsesConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"ResponsesConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "ResponsesConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
 
   },
   //"EndPointSettings": {
@@ -46,10 +46,5 @@
     "AnswerByResponse": "/answers/byresponse/{0}",
     "Location": "/locations",
     "Region": "/regions"
-  },
-  "ConnectionStrings": {
-    //"SurveyResponseConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-     //"ResponsesConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "ResponsesConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
   }
 }

DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.json

@@ -10,8 +10,8 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "SurveyConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    //"SurveyConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"SurveyConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "SurveyConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
 
   }
 }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Properties/launchSettings.json

@@ -1,9 +1,20 @@
-{
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:28382",
+      "sslPort": 0
+    }
+  },
   "profiles": {
     "DamageAssesment.Api.Users": {
       "commandName": "Project",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5027",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       },

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/appsettings.json

@@ -38,8 +38,8 @@
     }
   ],
   "ConnectionStrings": {
-    "UsersAccessConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    //"UsersAccessConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"UsersAccessConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "UsersAccessConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
 
   }
 }

DamageAssesmentApi/DamageAssesment.sln

@@ -11,7 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Attachm
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CB40DC2-D9D2-4384-A7A6-9968F5C777A2}"
 	ProjectSection(SolutionItems) = preProject
-		..\..\..\..\Sample\Migrations.ps1 = ..\..\..\..\Sample\Migrations.ps1
+		..\db\migrate-sqldb_v1.ps1 = ..\db\migrate-sqldb_v1.ps1
+		..\..\Sample\Migrations.ps1 = ..\..\Sample\Migrations.ps1
 		ReadMe.txt = ReadMe.txt
 		ReadMe4Dev.txt = ReadMe4Dev.txt
 	EndProjectSection

db/migrate-sqldb_v1.ps1

@@ -10,7 +10,8 @@ $microservices = @(
     "DamageAssesment.Api.Locations",
     "DamageAssesment.Api.Questions",
     "DamageAssesment.Api.Responses",
-    "DamageAssesment.Api.Surveys"
+    "DamageAssesment.Api.Surveys",
+    "DamageAssesment.Api.UsersAccess"
 )