Multi language dynamic object changes

DamageAssesmentApi/DamageAssesment.Api.Answers.Test/AnswersServiceTest.cs

@@ -95,10 +95,10 @@ namespace DamageAssesment.Api.Answers.Test
             var mockAnswerService = new Mock<IAnswersProvider>();
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputAnswer = await MockData.getInputAnswerData();
-            mockAnswerService.Setup(service => service.PostAnswerAsync(mockInputAnswer)).Returns(mockResponse);
+            mockAnswerService.Setup(service => service.PostAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (OkObjectResult) AnswerProvider.CreateAnswer(mockInputAnswer);
+            var result =  (OkObjectResult) await AnswerProvider.CreateAnswer(mockInputAnswer);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -109,10 +109,10 @@ namespace DamageAssesment.Api.Answers.Test
             var mockAnswerService = new Mock<IAnswersProvider>();
             var mockInputAnswer = await MockData.getInputAnswerData();
             var mockResponse = await MockData.getBadRequestResponse();
-            mockAnswerService.Setup(service => service.PostAnswerAsync(mockInputAnswer)).Returns(mockResponse);
+            mockAnswerService.Setup(service => service.PostAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (BadRequestObjectResult) AnswerProvider.CreateAnswer(mockInputAnswer);
+            var result = (BadRequestObjectResult)  await AnswerProvider.CreateAnswer(mockInputAnswer);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -123,10 +123,10 @@ namespace DamageAssesment.Api.Answers.Test
             var mockAnswerService = new Mock<IAnswersProvider>();
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputAnswer = await MockData.getInputAnswerData();
-            mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).Returns(mockResponse);
+            mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (OkObjectResult) AnswerProvider.UpdateAnswer(mockInputAnswer);
+            var result = (OkObjectResult) await AnswerProvider.UpdateAnswer(mockInputAnswer);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -137,10 +137,10 @@ namespace DamageAssesment.Api.Answers.Test
             var mockAnswerService = new Mock<IAnswersProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
             var mockInputAnswer = await MockData.getInputAnswerData();
-            mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).Returns(mockResponse);
+            mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (NotFoundObjectResult) AnswerProvider.UpdateAnswer(mockInputAnswer);
+            var result = (NotFoundObjectResult) await AnswerProvider.UpdateAnswer(mockInputAnswer);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -151,10 +151,10 @@ namespace DamageAssesment.Api.Answers.Test
             var mockAnswerService = new Mock<IAnswersProvider>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputAnswer = await MockData.getInputAnswerData();
-            mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).Returns(mockResponse);
+            mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (BadRequestObjectResult) AnswerProvider.UpdateAnswer(mockInputAnswer);
+            var result = (BadRequestObjectResult) await AnswerProvider.UpdateAnswer(mockInputAnswer);
 
             Assert.Equal(400, result.StatusCode);
         }

DamageAssesmentApi/DamageAssesment.Api.Answers/Controllers/AnswersController.cs

@@ -78,11 +78,11 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// </summary>
 
         [HttpPut("Answers")]
-        public IActionResult UpdateAnswer(Models.Answer answer)
+        public async Task<IActionResult> UpdateAnswer(Models.Answer answer)
         {
             if (answer != null)
             {
-                var result =  this.answerProvider.UpdateAnswerAsync(answer);
+                var result = await this.answerProvider.UpdateAnswerAsync(answer);
                 if (result.IsSuccess)
                 {
                     return Ok(result.Answer);
@@ -99,11 +99,11 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// </summary>
 
         [HttpPost("Answers")]
-        public IActionResult CreateAnswer(Models.Answer answer)
+        public async Task<IActionResult> CreateAnswer(Models.Answer answer)
         {
             if (answer != null)
             {
-                var result =  this.answerProvider.PostAnswerAsync(answer);
+                var result =  await this.answerProvider.PostAnswerAsync(answer);
                 if (result.IsSuccess)
                 {
                     return Ok(result.Answer);

DamageAssesmentApi/DamageAssesment.Api.Answers/Interfaces/IAnswersProvider.cs

@@ -6,8 +6,9 @@
         Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersByQuestionAsync(int questionId);
         Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> GetAnswerByIdAsync(int Id);
         Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync(int responseId);
-        (bool IsSuccess, Models.Answer Answer, string ErrorMessage) PostAnswerAsync(Models.Answer Answer);
-        (bool IsSuccess, Models.Answer Answer, string ErrorMessage) UpdateAnswerAsync(Models.Answer Answer);
+        Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer);
+        Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer);
         Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> DeleteAnswerAsync(int Id);
+        void SeedData();
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -25,8 +25,10 @@ builder.Services.AddDbContext<AnswerDbContext>(option =>
 {
     option.UseInMemoryDatabase("Answers");
 });
+
 var app = builder.Build();
 
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {

DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs

@@ -18,12 +18,11 @@ namespace DamageAssesment.Api.Answers.Providers
             this.answerDbContext = answerDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+            //SeedData();
         }
 
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync()
         {
-
             try
             {
                 logger?.LogInformation("Query Question");
@@ -108,7 +107,7 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
-        public (bool IsSuccess, Models.Answer Answer, string ErrorMessage) PostAnswerAsync(Models.Answer Answer)
+        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer)
         {
             try
             {
@@ -117,7 +116,7 @@ namespace DamageAssesment.Api.Answers.Providers
                 {
                     Db.Answer answer = mapper.Map<Models.Answer, Db.Answer>(Answer);
                     answerDbContext.Answers.Add(answer);
-                    answerDbContext.SaveChanges();
+                    await answerDbContext.SaveChangesAsync();
                     var result = mapper.Map<Db.Answer, Models.Answer>(answer);
                     return (true, result, null);
                 }
@@ -129,7 +128,7 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
-        public (bool IsSuccess, Models.Answer Answer, string ErrorMessage) UpdateAnswerAsync(Models.Answer Answer)
+        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer)
         {
             try
             {
@@ -140,7 +139,7 @@ namespace DamageAssesment.Api.Answers.Providers
                     {
                         Db.Answer answer = mapper.Map<Models.Answer, Db.Answer>(Answer);
                         answerDbContext.Answers.Update(answer);
-                        answerDbContext.SaveChanges();
+                        await answerDbContext.SaveChangesAsync();
                         return (true, mapper.Map<Db.Answer, Models.Answer>(answer), "Successful");
                     }
                     else
@@ -154,7 +153,6 @@ namespace DamageAssesment.Api.Answers.Providers
                     logger?.LogInformation($"{Answer} Bad Request");
                     return (false, null, "Bad request");
                 }
-
             }
             catch (Exception ex)
             {
@@ -189,7 +187,7 @@ namespace DamageAssesment.Api.Answers.Providers
             return answerDbContext.Answers.AsNoTracking().Count(e => e.Id == id) > 0;
         }
 
-        private void SeedData()
+        public void SeedData()
         {
             if (!answerDbContext.Answers.Any())
             {
@@ -201,10 +199,6 @@ namespace DamageAssesment.Api.Answers.Providers
                 answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
                 answerDbContext.SaveChanges();
             }
-
         }
-
-
-
     }
 }

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

@@ -77,10 +77,10 @@ namespace DamageAssesment.Api.Attachments.Test
             var mockResponse = await MockData.getOkResponse();
             var AttachmentResponse = await MockData.GetAttachmentInfo(0);
             var mockInputAttachment = await MockData.getInputAttachmentData();
-            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).Returns(mockResponse);
+            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);            
-            var result = (NoContentResult) AttachmentProvider.UploadAttachmentAsync(AttachmentResponse);
+            var result = (NoContentResult) await AttachmentProvider.UploadAttachmentAsync(AttachmentResponse);
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -92,11 +92,11 @@ namespace DamageAssesment.Api.Attachments.Test
             var mockUploadService = new Mock<IUploadService>();
             var mockInputAttachment = await MockData.getInputAttachmentData();
             var mockResponse = await MockData.getBadRequestResponse();
-            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).Returns(mockResponse);
+            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
             AttachmentInfo attachmentInfo=new AttachmentInfo();
-            var result = (BadRequestObjectResult) AttachmentProvider.UploadAttachmentAsync(attachmentInfo);
+            var result = (BadRequestObjectResult) await AttachmentProvider.UploadAttachmentAsync(attachmentInfo);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -109,10 +109,10 @@ namespace DamageAssesment.Api.Attachments.Test
             var mockResponse = await MockData.getOkResponse();
             var AttachmentResponse = await MockData.GetAttachmentInfo(1);
             var mockInputAttachment = await MockData.getInputAttachmentData();
-            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).Returns(mockResponse);
+            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
-            var result = (NoContentResult) AttachmentProvider.UpdateAttachmentAsync(AttachmentResponse);
+            var result = (NoContentResult) await AttachmentProvider.UpdateAttachmentAsync(AttachmentResponse);
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -124,11 +124,11 @@ namespace DamageAssesment.Api.Attachments.Test
             var mockUploadService = new Mock<IUploadService>();
             var mockInputAttachment = await MockData.getInputAttachmentData();
             var mockResponse = await MockData.getBadRequestResponse();
-            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).Returns(mockResponse);
+            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
             AttachmentInfo attachmentInfo = new AttachmentInfo();
-            var result = (BadRequestObjectResult) AttachmentProvider.UpdateAttachmentAsync(attachmentInfo);
+            var result = (BadRequestObjectResult) await AttachmentProvider.UpdateAttachmentAsync(attachmentInfo);
 
             Assert.Equal(400, result.StatusCode);
         }

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

@@ -83,15 +83,15 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// </summary>
 
         [HttpPost("Attachments"), DisableRequestSizeLimit]
-        public IActionResult UploadAttachmentAsync(AttachmentInfo attachmentInfo)
+        public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo)
         {
             try
             {
                 if (attachmentInfo.Answers.Count > 0)
                 {
-                    var Attachments =  this.AttachmentProvider.GetAttachmentCounter();
+                    var Attachments =  await this.AttachmentProvider.GetAttachmentCounter();
                     List<Models.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
-                    var result =  this.AttachmentProvider.PostAttachmentAsync(attachments);
+                    var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments);
                     if (result.IsSuccess)
                     {
                         return Ok(result.Attachments);
@@ -110,17 +110,17 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// </summary>
 
         [HttpPut("Attachments"), DisableRequestSizeLimit]
-        public  IActionResult UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
+        public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
         {
             try
             {
                 if (attachmentInfo.Answers.Count > 0)
                 {
-                    var res =  this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
+                    var res =  await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
                     if (res.IsSuccess)
                     {
                         List<Models.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
-                        var result = this.AttachmentProvider.PutAttachmentAsync(attachments);
+                        var result = await this.AttachmentProvider.PutAttachmentAsync(attachments);
                         if (result.IsSuccess)
                         {
                             return Ok(result.Attachments);

DamageAssesmentApi/DamageAssesment.Api.Attachments/Interfaces/IAttachmentsProvider.cs

@@ -6,12 +6,12 @@ namespace DamageAssesment.Api.Attachments.Interfaces
     {
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync();
         Task<(bool IsSuccess, Models.Attachment Attachment, string ErrorMessage)> GetAttachmentByIdAsync(int Id);
-        (bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage) PostAttachmentAsync(List<Models.Attachment> Attachments);
-        (bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage) PutAttachmentAsync(List<Models.Attachment> Attachments);
+        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments);
+        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments);
         Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> DeleteAttachmentAsync(int Id);
         Task<(bool IsSuccess, int counter, string Path)> DeleteAttachmentsAsync(int responseId, int answerId);
         Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds);
-        (bool IsSuccess, int counter, string message) GetAttachmentCounter();
-        (bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage) GetAttachmentInfo(List<AnswerInfo> answers);
+        Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter();
+        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentInfo(List<AnswerInfo> answers);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Providers/AttachmentsProvider.cs

@@ -21,7 +21,7 @@ namespace DamageAssesment.Api.Attachments.Providers
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-            SeedData();
+           // SeedData();
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
         {
@@ -65,14 +65,14 @@ namespace DamageAssesment.Api.Attachments.Providers
                 return (false, null, ex.Message);
             }
         }
-        public (bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage) PostAttachmentAsync(List<Models.Attachment> Attachments)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments)
         {
             try
             {
                 logger?.LogInformation("Query Attachment");
                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
                 AttachmentDbContext.Attachments.AddRange(attachments);
-                AttachmentDbContext.SaveChanges();
+                await AttachmentDbContext.SaveChangesAsync();
                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
@@ -83,14 +83,14 @@ namespace DamageAssesment.Api.Attachments.Providers
             }
         }
 
-        public (bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage) PutAttachmentAsync(List<Models.Attachment> Attachments)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments)
         {
             try
             {
                 logger?.LogInformation("Query Attachment");
                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
                 AttachmentDbContext.Attachments.UpdateRange(attachments);
-                AttachmentDbContext.SaveChanges();
+                await AttachmentDbContext.SaveChangesAsync();
                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
@@ -110,7 +110,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachments.Count > 0)
                 {
                     AttachmentDbContext.Attachments.RemoveRange(Attachments);
-                    AttachmentDbContext.SaveChanges();
+                    await AttachmentDbContext.SaveChangesAsync();
                 }
                 return (true, AttachmentId, "");
             }
@@ -121,7 +121,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 return (false, AttachmentId, "");
             }
         }
-        public (bool IsSuccess,int counter,string message) GetAttachmentCounter()
+        public async Task<(bool IsSuccess,int counter,string message)> GetAttachmentCounter()
         {
             try
             {
@@ -143,7 +143,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachments.Count > 0)
                 {
                     AttachmentDbContext.Attachments.RemoveRange(Attachments);
-                    AttachmentDbContext.SaveChanges();
+                    await AttachmentDbContext.SaveChangesAsync();
                 }
                 return (true, AttachmentId, "");
             }
@@ -154,7 +154,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 return (false, AttachmentId, "");
             }
         }
-        public (bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage) GetAttachmentInfo(List<AnswerInfo> answers)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentInfo(List<AnswerInfo> answers)
         {
             try
             {
@@ -183,7 +183,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 }
                 Attachment.IsDeleted = true;
                 AttachmentDbContext.Attachments.Update(Attachment);
-                AttachmentDbContext.SaveChanges();
+                await AttachmentDbContext.SaveChangesAsync();
                 return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id} is deleted");
             }
             catch (Exception ex)

DamageAssesmentApi/DamageAssesment.Api.Documents.Test/DamageAssesment.Api.Documents.Test.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DamageAssesment.Api.Documents\DamageAssesment.Api.Documents.csproj" />
+  </ItemGroup>
+
+</Project>

DamageAssesmentApi/DamageAssesment.Api.Documents.Test/DocumentsServiceTest.cs

@@ -0,0 +1,331 @@
+using DamageAssesment.Api.Documents.Controllers;
+using DamageAssesment.Api.Documents.Interfaces;
+using DamageAssesment.Api.Documents.Models;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using Xunit;
+
+namespace DamageAssesment.Api.Documents.Test
+{
+
+    public class DocumentServiceTest
+    {
+
+        [Fact(DisplayName = "Get Documents - NoContent Case")]
+        public async Task GetDocumentsLanguageAsync_ShouldReturnStatusCode204()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNoContentResponse();
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsbyFormsandLanguageAsync("", "");
+
+            Assert.Equal(204, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Documents - NoContent Case")]
+        public async Task GetDocumentsLinkTypeAsync_ShouldReturnStatusCode204()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNoContentResponse();
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsbyFormsandLanguageAsync("", "");
+
+            Assert.Equal(204, result.StatusCode);
+        }
+        [Fact(DisplayName = "Get Documents - Ok case")]
+        public async Task GetDocumentsAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponse();
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync();
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Documents - NoContent Case")]
+        public async Task GetDocumentsAsync_ShouldReturnStatusCode204()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNoContentResponse();
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync();
+
+            Assert.Equal(204, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Document by Id - Ok case")]
+        public async Task GetDocumentAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponse(1);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(1)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Document by Id - NotFound case")]
+        public async Task GetDocumentAsync_ShouldReturnStatusCode404()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNotFoundResponse();
+            mockDocumentService.Setup(service => service.GetDocumentAsync(99)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundResult)await DocumentProvider.GetDocumentAsync(99);
+            Assert.Equal(404, result.StatusCode);
+        }
+        [Fact(DisplayName = "Post Document - Ok case")]
+        public async Task PostDocumentAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponse(1);
+            var mockInputDocument = await MockData.getInputDocumentData();
+            var DocumentResponse = await MockData.GetDocumentsInfo(0);
+            mockDocumentService.Setup(service => service.PostDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NoContentResult)await DocumentProvider.CreateDocument(DocumentResponse);
+
+            Assert.Equal(204, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Post Document - BadRequest case")]
+        public async Task PostDocumentAsync_ShouldReturnStatusCode400()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockInputDocument = await MockData.getInputDocumentData();
+            var mockResponse = await MockData.getBadRequestResponse();
+            DocumentInfo documentInfo = null;
+            mockDocumentService.Setup(service => service.PostDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (BadRequestObjectResult)await DocumentProvider.CreateDocument(documentInfo);
+
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Document - Ok case")]
+        public async Task PutDocumentAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponse(1);
+            var mockInputDocument = await MockData.getInputDocumentData();
+            var DocumentResponse = await MockData.GetDocumentsInfo(1);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NoContentResult)await DocumentProvider.UpdateDocument(DocumentResponse);
+
+            Assert.Equal(204, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Document - BadRequest case")]
+        public async Task PutDocumentAsync_ShouldReturnStatusCode400()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getBadRequestResponse();
+            var mockInputDocument = await MockData.getInputDocumentData();
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(null);
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Delete Document - Ok case")]
+        public async Task DeleteDocumentAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponse(1);
+            mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.DeleteDocument(1);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+        [Fact(DisplayName = "Delete Document - NotFound case")]
+        public async Task DeleteDocumentAsync_ShouldReturnStatusCode404()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNotFoundResponse();
+            mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1);
+            Assert.Equal(404, result.StatusCode);
+        }
+
+
+        // Link Type Test cases
+
+
+        [Fact(DisplayName = "Get Link types - Ok case")]
+        public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getOkResponse();
+            mockDocumentService.Setup(service => service.GetLinkTypesAsync()).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetLinkTypesAsync();
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Link types - NoContent Case")]
+        public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode204()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getNoContentResponse();
+            mockDocumentService.Setup(service => service.GetLinkTypesAsync()).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NoContentResult)await DocumentProvider.GetLinkTypesAsync();
+
+            Assert.Equal(204, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Link Type by Id - Ok case")]
+        public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getOkResponse(1);
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Link Type by Id - NotFound case")]
+        public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode404()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getNotFoundResponse();
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(99)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundResult)await DocumentProvider.GetLinkTypeAsync(99);
+            Assert.Equal(404, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Post Link Type - Ok case")]
+        public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getOkResponse(1);
+            var mockInputDocument = await LinkTypeMockData.getInputLinkData(0);
+            mockDocumentService.Setup(service => service.PostLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.CreateLinkType(mockInputDocument);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Post Link Type - BadRequest case")]
+        public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode400()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
+            var mockResponse = await LinkTypeMockData.getBadRequestResponse();
+            mockDocumentService.Setup(service => service.PostLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (BadRequestObjectResult)await DocumentProvider.CreateLinkType(mockInputDocument);
+
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Document - Ok case")]
+        public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getOkResponse(1);
+            var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(mockInputDocument);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Document - NotFound case")]
+        public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode404()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getNotFoundResponse();
+            var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(mockInputDocument);
+
+            Assert.Equal(404, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Document - BadRequest case")]
+        public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode400()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getBadRequestResponse();
+            var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(mockInputDocument);
+
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Delete Document - Ok case")]
+        public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getOkResponse(1);
+
+            mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.DeleteLinkType(1);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+        [Fact(DisplayName = "Delete Document - NotFound case")]
+        public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode404()
+        {
+            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getNotFoundResponse();
+            mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundResult)await DocumentProvider.DeleteLinkType(99);
+
+            Assert.Equal(404, result.StatusCode);
+        }
+
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents.Test/LinkTypeMockData.cs

@@ -0,0 +1,61 @@
+using DamageAssesment.Api.Documents.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DamageAssesment.Api.Documents.Test
+{
+    public class LinkTypeMockData
+    {
+
+        public static async Task<(bool, List<Documents.Models.LinkType>, string)> getOkResponse()
+        {
+            List<Documents.Models.LinkType> list = new List<Documents.Models.LinkType>();
+
+            for (int i = 1; i < 4; i++)
+            {
+                list.Add(new Documents.Models.LinkType()
+                {
+                    Id = i,
+                    TypeText = "sample"+i,
+                    IsActive = true
+                });
+            }
+            return (true, list, null);
+        }
+        public static async Task<(bool, Documents.Models.LinkType, string)> getOkResponse(int Id)
+        {
+            var Documents = await getOkResponse();
+            var Document = Documents.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, Document, null);
+        }
+        public static async Task<(bool, Documents.Models.LinkType, string)> getBadRequestResponse()
+        {
+            return (false, null, "Bad Request");
+        }
+
+        public static async Task<(bool, Documents.Models.LinkType, string)> getNotFoundResponse()
+        {
+            return (false, null, "Not Found");
+        }
+        public static async Task<(bool, IEnumerable<Documents.Models.LinkType>, string)> getNoContentResponse()
+        {
+            IEnumerable<Documents.Models.LinkType> list = new List<Documents.Models.LinkType>();
+            return (false, list, null);
+        }
+
+        public static async Task<Documents.Models.LinkType> getInputLinkData(int id)
+        {
+            return new Models.LinkType
+            {
+                Id = id,
+                TypeText = "sample",
+                IsActive = true
+            };
+        }
+
+    }
+}

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

@@ -0,0 +1,117 @@
+using DamageAssesment.Api.Documents.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DamageAssesment.Api.Documents.Test
+{
+    public class MockData
+    {
+
+        public static async Task<(bool, List<Documents.Models.Document>, string)> getOkResponse()
+        {
+            List<Documents.Models.Document> list = new List<Documents.Models.Document>();
+            
+            for (int i = 1; i < 4; i++)
+            {
+                List<Documents.Models.DocumentsTranslation> documentsTranslations = new List<DocumentsTranslation>();
+                documentsTranslations.Add(new DocumentsTranslation()
+                {
+                    Language = "en",
+                    title = "tel"+i,
+                    description = "Sample"+i
+                });
+                list.Add(new Documents.Models.Document()
+                {
+
+                    Id = i,
+                    linkTypeId = i,
+                    docName = "sample"+i,
+                    url = "testurl" + i,
+                    Path = "testpath" + i,
+                    IsActive = true,
+                    documentsTranslations= documentsTranslations,
+                    dateCreated = DateTime.Now,
+                    dateUpdated = DateTime.Now
+                });
+            }
+            return (true, list, null);
+        }
+        public static async Task<(bool, Documents.Models.Document, string)> getOkResponse(int Id)
+        {
+            var Documents = await getOkResponse();
+            var Document = Documents.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, Document, null);
+        }
+
+        public static async Task<(bool, Documents.Models.Document, string)> getBadRequestResponse()
+        {
+            return (false, null, "Bad Request");
+        }
+
+        public static async Task<(bool, Documents.Models.Document, string)> getNotFoundResponse()
+        {
+            return (false, null, "Not Found");
+        }
+        public static async Task<(bool, IEnumerable<Documents.Models.Document>, string)> getNoContentResponse()
+        {
+            IEnumerable<Documents.Models.Document> list = new List<Documents.Models.Document>();
+            return (false, list, null);
+        }
+        public static async Task<Documents.Models.DocumentInfo> GetDocumentsInfo(int id)
+        {
+            FileModel fileModel = new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt" };
+            return new DocumentInfo() { Id=id, linkTypeId = 1, url = "Sample", File = fileModel };
+        }
+        public static async Task<Documents.Models.Document> getInputDocumentData()
+        {
+            List<Documents.Models.DocumentsTranslation> documentsTranslations = new List<DocumentsTranslation>();
+            documentsTranslations.Add(new DocumentsTranslation()
+            {
+                Language = "en",
+                title = "tel",
+                description = "Sample"
+            });
+            return new Models.Document
+            {
+                Id = 1,
+                linkTypeId = 1,
+                docName = "sample",
+                url = "testurl",
+                Path = "testpath",
+                IsActive = true,
+                documentsTranslations= documentsTranslations,
+                dateCreated = DateTime.Now,
+                dateUpdated = DateTime.Now
+            };
+        }
+        public static async Task<List<Documents.Models.Document>> getInputDocumentsData()
+        {
+            List<Documents.Models.DocumentsTranslation> documentsTranslations = new List<DocumentsTranslation>();
+            documentsTranslations.Add(new DocumentsTranslation()
+            {
+                Language = "en",
+                title = "tel",
+                description="Sample"
+            });
+            List<Documents.Models.Document> Documents = new List<Models.Document>();
+            Documents.Add(new Models.Document
+            {
+                Id = 1,
+                linkTypeId = 1,
+                docName = "sample",
+                url = "testurl",
+                Path = "testpath",
+                IsActive = true,
+                documentsTranslations= documentsTranslations,
+                dateCreated = DateTime.Now,
+                dateUpdated = DateTime.Now
+            });
+            return Documents;
+        }
+
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Controllers/DocumentsController.cs

@@ -0,0 +1,222 @@
+using DamageAssesment.Api.Documents.Db;
+using DamageAssesment.Api.Documents.Interfaces;
+using DamageAssesment.Api.Documents.Models;
+using DamageAssesment.Api.Documents.Providers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DamageAssesment.Api.Documents.Controllers
+{
+    [Route("api")]
+    [ApiController]
+    public class DocumentsController : ControllerBase
+    {
+        private readonly IDocumentsProvider documentsProvider;
+        private readonly IUploadService uploadService;
+
+        public DocumentsController(IDocumentsProvider documentsProvider,IUploadService uploadService)
+        {
+
+            this.documentsProvider = documentsProvider;
+            this.uploadService = uploadService; 
+
+        }
+
+        /// <summary>
+        /// Get all documnets.
+        /// </summary>
+        [HttpGet("{language}/{LinkType}/documents")]
+        public async Task<IActionResult> GetDocumentsbyFormsandLanguageAsync(string language,string LinkType)
+        {
+            var result = await this.documentsProvider.GetDocumnetsByLinkAsync(language, LinkType);
+            if (result.IsSuccess)
+            {
+                return Ok(result.documents);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get all documnets.
+        /// </summary>
+        [HttpGet("{LinkType}/documents")]
+        public async Task<IActionResult> GetDocumentsbyFormAsync(string LinkType)
+        {
+            var result = await this.documentsProvider.GetDocumnetsByLinkAsync(null, LinkType);
+            if (result.IsSuccess)
+            {
+                return Ok(result.documents);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get all documnets.
+        /// </summary>
+        [HttpGet("documents")]
+        public async Task<IActionResult> GetDocumentsAsync()
+        {
+            var result = await this.documentsProvider.GetDocumnetsAsync();
+            if (result.IsSuccess)
+            {
+                return Ok(result.documents);
+            }
+            return NoContent();
+        }
+
+        /// <summary>
+        /// Get a documnet by id.
+        /// </summary>
+        [HttpGet("documents/{id}")]
+        public async Task<IActionResult> GetDocumentAsync(int id)
+        {
+            var result = await this.documentsProvider.GetDocumentAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.Document);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// Upload new document.
+        /// </summary>
+        [HttpPut("documents")]
+        public async Task<IActionResult> UpdateDocument(DocumentInfo documentInfo)
+        {
+            if (documentInfo != null)
+            {
+                var dbdoc = await this.documentsProvider.GetDocumentAsync(documentInfo.Id);
+                if (dbdoc.IsSuccess)
+                {
+                    Models.Document document = uploadService.UpdateDocuments(dbdoc.Document, documentInfo);
+                    var result = await this.documentsProvider.UpdateDocumentAsync(document);
+                    if (result.IsSuccess)
+                    {
+                        return Ok(result.Document);
+                    }
+                    return NoContent();
+                }
+                return NoContent();
+            }
+            return BadRequest(documentInfo);
+        }
+        /// <summary>
+        /// update existing document.
+        /// </summary>
+        [HttpPost("documents")]
+        public async Task<IActionResult> CreateDocument(DocumentInfo documentInfo)
+        {
+            try
+            {
+                if (documentInfo != null)
+                {
+                    var documents = await this.documentsProvider.GetDocumentCounter();
+                    Models.Document document = uploadService.UploadDocument(documents.counter, documentInfo);
+                    var result = await this.documentsProvider.PostDocumentAsync(document);
+                    if (result.IsSuccess)
+                    {
+                        return Ok(result.Document);
+                    }
+                    return NoContent();
+                }
+                return BadRequest(documentInfo);
+            }
+            catch (Exception ex)
+            {
+                return BadRequest($"Internal server error: {ex}");
+            }
+        }
+        /// <summary>
+        /// Delete documnet by id.
+        /// </summary>
+        [HttpDelete("documents/{id}")]
+        public async Task<IActionResult> DeleteDocument(int id)
+        {
+            // database soft delete
+            var result = await this.documentsProvider.DeleteDocumentAsync(id);
+            if (result.IsSuccess)
+            {
+                // deleting file from folder
+                uploadService.Movefile(result.Document.Path);
+                return Ok(result.Document);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// Get all document link type.
+        /// </summary>
+        [HttpGet("LinkTypes")]
+        public async Task<IActionResult> GetLinkTypesAsync()
+        {
+            var result = await this.documentsProvider.GetLinkTypesAsync();
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkTypes);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get a document link type by id.
+        /// </summary>
+        [HttpGet("LinkTypes/{id}")]
+        public async Task<IActionResult> GetLinkTypeAsync(int id)
+        {
+            var result = await this.documentsProvider.GetLinkTypeAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkType);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// Update a existing document link type.
+        /// </summary>
+        [HttpPut("LinkTypes")]
+        public async Task<IActionResult> UpdateLinkType(Models.LinkType linkType)
+        {
+            if (linkType != null)
+            {
+                var result = await this.documentsProvider.UpdateLinkTypeAsync(linkType);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.LinkType);
+                }
+                if (result.ErrorMessage == "Not Found")
+                    return NotFound(result.ErrorMessage);
+
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
+        }
+        /// <summary>
+        /// Create a new document link type.
+        /// </summary>
+        [HttpPost("LinkTypes")]
+        public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
+        {
+            if (linkType != null)
+            {
+                var result = await this.documentsProvider.PostLinkTypeAsync(linkType);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.LinkType);
+                }
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
+        }
+        /// <summary>
+        /// Delete a  existing document link type by id.
+        /// </summary>
+        [HttpDelete("LinkTypes/{id}")]
+        public async Task<IActionResult> DeleteLinkType(int id)
+        {
+            var result = await this.documentsProvider.DeleteLinkTypeAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkType);
+            }
+            return NotFound();
+        }
+
+
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/DamageAssesment.Api.Documents.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="DASA_Documents\" />
+  </ItemGroup>
+
+</Project>

DamageAssesmentApi/DamageAssesment.Api.Documents/Db/Document.cs

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.Documents.Db
+{
+    public class Document
+    {
+        [Key]
+        public int Id { get; set; }
+        [ForeignKey("LinkType")]
+        public int linkTypeId { get; set; }
+        public string docName { get; set; }
+
+        public string url { get; set; }
+        public string Path { get; set; }
+        public bool IsActive { get; set; }
+        public DateTime dateCreated { get; set; }
+        public DateTime dateUpdated { get; set; }
+
+
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Db/DocumentDbContext.cs

@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Documents.Db
+{
+    public class DocumentDbContext : DbContext
+    {
+        public DocumentDbContext(DbContextOptions options) : base(options)
+        {
+        }
+        public DbSet<Db.Document> Documents { get; set; }
+        public DbSet<Db.LinkType> LinkTypes { get; set; }
+        public DbSet<Db.DocumentsTranslation> DocumentsTranslations { get; set; }
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<Document>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<LinkType>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<DocumentsTranslation>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Db/DocumentsTranslation.cs

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.Documents.Db
+{
+    public class DocumentsTranslation
+    {
+        [Key]
+        public int Id { get; set; }
+        [ForeignKey("Document")]
+        public int DocumentId { get; set; }
+        public string title { get; set; }
+        public string description { get; set; }
+        public string Language { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Db/LinkType.cs

@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Documents.Db
+{
+    public class LinkType
+    {
+        [Key]
+        public int Id { get; set; }
+        public string TypeText { get; set; }
+        public bool IsActive { get; set; }
+        public bool IsAttachment { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Interfaces/IAzureBlobService.cs

@@ -0,0 +1,10 @@
+using Azure.Storage.Blobs.Models;
+
+namespace DamageAssesment.Api.Documents.Interfaces
+{
+    public interface IAzureBlobService
+    {
+        Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files);
+        void DeleteFile(string path);
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Interfaces/IDocumentTypeProvider.cs

@@ -0,0 +1,11 @@
+namespace DamageAssesment.Api.Documents.Interfaces
+{
+    public interface ILinkTypesProvider
+    {
+        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int Id);
+        Task<(bool IsSuccess, IEnumerable<Models.LinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync();
+        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> PostLinkTypeAsync(Models.LinkType LinkType);
+        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(Models.LinkType LinkType);
+        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> DeleteLinkTypeAsync(int Id);
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Interfaces/IDocumentsProvider.cs

@@ -0,0 +1,17 @@
+using DamageAssesment.Api.Documents.Models;
+
+namespace DamageAssesment.Api.Documents.Interfaces
+{
+    public interface IDocumentsProvider : ILinkTypesProvider
+    {
+        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> GetDocumentAsync(int Id);
+        Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsAsync();
+        Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsByLinkAsync(string Language,string LinkType);
+        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> PostDocumentAsync(Models.Document Document);
+        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> UpdateDocumentAsync(Models.Document Document);
+        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> DeleteDocumentAsync(int Id);
+        Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
+
+
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Interfaces/IUploadService.cs

@@ -0,0 +1,12 @@
+using DamageAssesment.Api.Documents.Models;
+
+namespace DamageAssesment.Api.Documents.Interfaces
+{
+    public interface IUploadService
+    {
+        Models.Document UploadDocument( int counter, DocumentInfo documentInfo);
+        public Models.Document UpdateDocuments( Models.Document document, DocumentInfo documentInfo);
+        void Deletefile(string path);
+        void Movefile(string path);
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Migrations/20230828165655_InitialDocumentCreate.Designer.cs

@@ -0,0 +1,95 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Documents.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Documents.Migrations
+{
+    [DbContext(typeof(DocumentDbContext))]
+    [Migration("20230828165655_InitialDocumentCreate")]
+    partial class InitialDocumentCreate
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("dateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("dateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("docName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("linkTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("url")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinkTypes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Migrations/20230828165655_InitialDocumentCreate.cs

@@ -0,0 +1,60 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Documents.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialDocumentCreate : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Documents",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    title = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    linkTypeId = table.Column<int>(type: "int", nullable: false),
+                    description = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    docName = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    url = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Path = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    IsActive = table.Column<bool>(type: "bit", nullable: false),
+                    dateCreated = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    dateUpdated = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Documents", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "LinkTypes",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    TypeText = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    IsActive = table.Column<bool>(type: "bit", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_LinkTypes", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Documents");
+
+            migrationBuilder.DropTable(
+                name: "LinkTypes");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Migrations/20230830200432_DocumentTranslation.Designer.cs

@@ -0,0 +1,118 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Documents.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Documents.Migrations
+{
+    [DbContext(typeof(DocumentDbContext))]
+    [Migration("20230830200432_DocumentTranslation")]
+    partial class DocumentTranslation
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("dateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("dateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("docName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("linkTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("url")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.DocumentsTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocumentsTranslations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsAttachment")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinkTypes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Migrations/20230830200432_DocumentTranslation.cs

@@ -0,0 +1,70 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Documents.Migrations
+{
+    /// <inheritdoc />
+    public partial class DocumentTranslation : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "description",
+                table: "Documents");
+
+            migrationBuilder.DropColumn(
+                name: "title",
+                table: "Documents");
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsAttachment",
+                table: "LinkTypes",
+                type: "bit",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.CreateTable(
+                name: "DocumentsTranslations",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    DocumentId = table.Column<int>(type: "int", nullable: false),
+                    title = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    description = table.Column<string>(type: "nvarchar(max)", nullable: false),
+                    Language = table.Column<string>(type: "nvarchar(max)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_DocumentsTranslations", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "DocumentsTranslations");
+
+            migrationBuilder.DropColumn(
+                name: "IsAttachment",
+                table: "LinkTypes");
+
+            migrationBuilder.AddColumn<string>(
+                name: "description",
+                table: "Documents",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "");
+
+            migrationBuilder.AddColumn<string>(
+                name: "title",
+                table: "Documents",
+                type: "nvarchar(max)",
+                nullable: false,
+                defaultValue: "");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Migrations/DocumentDbContextModelSnapshot.cs

@@ -0,0 +1,115 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.Documents.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.Documents.Migrations
+{
+    [DbContext(typeof(DocumentDbContext))]
+    partial class DocumentDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("Path")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("dateCreated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<DateTime>("dateUpdated")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("docName")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("linkTypeId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("url")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.DocumentsTranslation", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("DocumentId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Language")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("description")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("title")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DocumentsTranslations");
+                });
+
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("bit");
+
+                    b.Property<bool>("IsAttachment")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("TypeText")
+                        .IsRequired()
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("LinkTypes");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/Document.cs

@@ -0,0 +1,19 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Documents.Models
+{
+    public class Document
+    {
+        public int Id { get; set; }
+
+        public int linkTypeId { get; set; }
+        public string docName { get; set; }
+
+        public string url { get; set; }
+        public string Path { get; set; }
+        public bool IsActive { get; set; }
+        public DateTime dateCreated { get; set; }
+        public DateTime dateUpdated { get; set; }
+        public List<DocumentsTranslation> documentsTranslations { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/DocumentInfo.cs

@@ -0,0 +1,19 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.Documents.Models
+{
+    public class DocumentInfo
+    {
+        public int Id { get; set; }
+        public int linkTypeId { get; set; }
+        public string url { get; set; }
+        public List<DocumentsTranslation> documentsTranslations { get; set; }
+        public FileModel? File { get; set; }
+    }
+    public class FileModel
+    {
+        public string? FileName { get; set; }
+        public string? FileContent { get; set; }
+        public string? FileExtension { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/DocumentsTranslation.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.Documents.Models
+{
+    public class DocumentsTranslation
+    {
+        public string title { get; set; }
+        public string description { get; set; }
+        public string Language { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/LinkType.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Documents.Models
+{
+    public class LinkType
+    {
+        public int Id { get; set; }
+        public string TypeText { get; set; }
+        public bool IsActive { get; set; }
+        public bool IsAttachment { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Profiles/DocumentProfile.cs

@@ -0,0 +1,17 @@
+using AutoMapper;
+
+namespace DamageAssesment.Api.Documents.Profiles
+{
+    public class DocumentProfile : AutoMapper.Profile
+    {
+        public DocumentProfile()
+        {
+            CreateMap<Db.Document, Models.Document>();
+            CreateMap<Models.Document, Db.Document>();
+            CreateMap<Db.LinkType, Models.LinkType>();
+            CreateMap<Models.LinkType, Db.LinkType>();
+            CreateMap<Db.DocumentsTranslation, Models.DocumentsTranslation>();
+            CreateMap<Models.DocumentsTranslation, Db.DocumentsTranslation>();
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Program.cs

@@ -0,0 +1,35 @@
+using DamageAssesment.Api.Documents.Db;
+using DamageAssesment.Api.Documents.Interfaces;
+using DamageAssesment.Api.Documents.Providers;
+using Microsoft.EntityFrameworkCore;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+builder.Services.AddControllers();
+// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+builder.Services.AddScoped<IDocumentsProvider, documentsProvider>();
+builder.Services.AddScoped<IUploadService, UploadService>();
+builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
+builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
+builder.Services.AddDbContext<DocumentDbContext>(option =>
+{
+    option.UseInMemoryDatabase("DocumentConnection");
+});
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.Run();

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

@@ -4,17 +4,17 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:28382",
+      "applicationUrl": "http://localhost:60754",
       "sslPort": 0
     }
   },
   "profiles": {
-    "DamageAssesment.Api.Users": {
+    "DamageAssesment.Api.Questions": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5027",
+      "applicationUrl": "http://localhost:5133",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

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

@@ -0,0 +1,44 @@
+
+using Azure.Storage.Blobs;
+using Azure.Storage.Blobs.Models;
+using Azure.Storage.Blobs.Specialized;
+using DamageAssesment.Api.Documents.Interfaces;
+
+namespace DamageAssesment.Api.Documents.Providers
+{
+    public class AzureBlobService: IAzureBlobService
+    {
+        BlobServiceClient _blobClient;
+        BlobContainerClient _containerClient;
+        string azureConnectionString = "<Primary Connection String>";
+        public AzureBlobService()
+        {
+            _blobClient = new BlobServiceClient(azureConnectionString);
+            _containerClient = _blobClient.GetBlobContainerClient("apiimages");
+        }
+
+        public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
+        {
+
+            var azureResponse = new List<Azure.Response<BlobContentInfo>>();
+            foreach (var file in files)
+            {
+                string fileName = file.FileName;
+                using (var memoryStream = new MemoryStream())
+                {
+                    file.CopyTo(memoryStream);
+                    memoryStream.Position = 0;
+                    var client = await _containerClient.UploadBlobAsync(fileName, memoryStream, default);
+                    azureResponse.Add(client);
+                }
+            };
+
+            return azureResponse;
+        }
+        public void DeleteFile(string url)
+        {
+            var blob = _containerClient.GetBlockBlobClient(url);
+            blob.DeleteIfExists();
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/Providers/DocumentsProvider.cs

@@ -0,0 +1,363 @@
+using AutoMapper;
+using DamageAssesment.Api.Documents.Db;
+using DamageAssesment.Api.Documents.Interfaces;
+using DamageAssesment.Api.Documents.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System;
+using System.Diagnostics.Eventing.Reader;
+
+namespace DamageAssesment.Api.Documents.Providers
+{
+
+
+    public class documentsProvider : IDocumentsProvider
+    {
+        private DocumentDbContext DocumentDbContext;
+        private ILogger<documentsProvider> logger;
+        private IUploadService uploadservice;
+        private IMapper mapper;
+
+        public documentsProvider(DocumentDbContext DocumentDbContext, ILogger<documentsProvider> logger, IMapper mapper, IUploadService uploadservice)
+        {
+            this.DocumentDbContext = DocumentDbContext;
+            this.logger = logger;
+            this.mapper = mapper;
+            this.uploadservice = uploadservice;
+            SeedData();
+        }
+
+
+
+        private void SeedData()
+        {
+            if (!DocumentDbContext.LinkTypes.Any())
+            {
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() {TypeText = "Forms",IsActive=true, IsAttachment=true });
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() {TypeText = "Communiques",IsActive = true,IsAttachment=false });
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() {TypeText = "Memos",IsActive = true,IsAttachment=true });
+                DocumentDbContext.SaveChanges();
+            }
+            if (!DocumentDbContext.Documents.Any())
+            {
+                FileModel fileModel = new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt" };
+                DocumentInfo documentInfo = new DocumentInfo() { linkTypeId = 1, url = "Sample",  File = fileModel };
+                Models.Document document = uploadservice.UploadDocument(0, documentInfo);
+                DocumentDbContext.Documents.Add(mapper.Map<Models.Document, Db.Document>(document));
+                DocumentDbContext.SaveChanges();
+            }
+            if (!DocumentDbContext.DocumentsTranslations.Any())
+            {
+                Db.DocumentsTranslation documents = new Db.DocumentsTranslation { DocumentId = 1, title = "Test", description = "ss", Language = "en" };
+                DocumentDbContext.DocumentsTranslations.Add(documents);
+                DocumentDbContext.SaveChanges();
+            }
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsByLinkAsync(string Language, string LinkType)
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var documents=new List<Db.Document>();
+                if(String.IsNullOrEmpty(LinkType))
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive).ToListAsync();
+                else
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive &&
+                     q.linkTypeId == (DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.TypeText.ToLower() == LinkType.ToLower()).Select(a => a.Id).FirstOrDefault())).ToListAsync();
+                if (documents != null)
+                {
+                    var result = mapper.Map<IEnumerable<Db.Document>, IEnumerable<Models.Document>>(documents);
+                    foreach (var item in result)
+                    {
+                        if(!String.IsNullOrEmpty(Language))
+                            item.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
+                                    DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == item.Id && (a.Language.ToLower() == Language.ToLower())).ToList());
+                        else
+                        item.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
+                                DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == item.Id).ToList());
+                    }
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsAsync()
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive).ToListAsync();
+                if (documents != null)
+                {
+                    logger?.LogInformation($"{documents.Count} Document(s) found");
+                    var result = mapper.Map<IEnumerable<Db.Document>, IEnumerable<Models.Document>>(documents);
+                    foreach (var item in result)
+                    {
+                        item.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
+                                DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == item.Id).ToList());
+                    }
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+
+        }
+        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> GetDocumentAsync(int Id)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                var Document = await DocumentDbContext.Documents.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id && q.IsActive);
+                if (Document != null)
+                {
+                    logger?.LogInformation($"{Document} customer(s) found");
+                    var result = mapper.Map<Db.Document, Models.Document>(Document);
+                    result.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
+                            DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> PostDocumentAsync(Models.Document Document)
+        {
+            try
+            {
+                var document = mapper.Map<Models.Document, Db.Document>(Document);
+                DocumentDbContext.Documents.Add(document);
+                DocumentDbContext.SaveChanges();
+                var dbtranslation = mapper.Map<List<Models.DocumentsTranslation>, List<Db.DocumentsTranslation>>(Document.documentsTranslations);
+                dbtranslation.ForEach(i => i.DocumentId = document.Id);
+                DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
+                DocumentDbContext.SaveChanges();
+                Document.Id = document.Id;
+                return (true, Document, null);
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+
+        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> UpdateDocumentAsync(Models.Document Document)
+        {
+            try
+            {
+                if (Document != null)
+                {
+                    var existing = DocumentDbContext.Documents.AsNoTracking().FirstOrDefault(x => x.Id == Document.Id);
+                    if (existing != null)
+                    {
+                        var document = mapper.Map<Models.Document, Db.Document>(Document);
+                        DocumentDbContext.Documents.Update(document);
+                        DocumentDbContext.SaveChanges();
+                        var oldtranslations = DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == Document.Id).ToList();
+                        if (oldtranslations != null)
+                            DocumentDbContext.DocumentsTranslations.RemoveRange(oldtranslations);
+                        var dbtranslation = mapper.Map<List<Models.DocumentsTranslation>, List<Db.DocumentsTranslation>>(Document.documentsTranslations);
+                        dbtranslation.ForEach(i => i.DocumentId = Document.Id);
+                        return (true, Document, "Successful");
+                    }
+                    else
+                    {
+                        logger?.LogInformation($"{Document} Not found");
+                        return (false, null, "Not Found");
+                    }
+                }
+                else
+                {
+                    logger?.LogInformation($"{Document} Bad Request");
+                    return (false, null, "Bad request");
+                }
+
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> DeleteDocumentAsync(int Id)
+        {
+
+            try
+            {
+                Db.Document Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
+                if (Document == null)
+                {
+                    return (false, null, "Not Found");
+                }
+                Document.IsActive = false;
+                DocumentDbContext.Documents.Update(Document);
+                DocumentDbContext.SaveChanges();
+                return (true, mapper.Map<Db.Document, Models.Document>(Document), $"DocumentId {Id} deleted Successfuly");
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+
+        public async Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter()
+        {
+            try
+            {
+                int AttachmentId = DocumentDbContext.Documents.Max(a => a.Id);
+                return (true, AttachmentId, "");
+            }
+            catch (Exception ex)
+            {
+                return (false, 0, ex.Message);
+            }
+        }
+
+        //Link Type methods
+        public async Task<(bool IsSuccess, IEnumerable<Models.LinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync()
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var LinkType = await DocumentDbContext.LinkTypes.AsNoTracking().Where(q=>q.IsActive).ToListAsync();
+                if (LinkType != null)
+                {
+                    logger?.LogInformation($"{LinkType.Count} LinkTypes(s) found");
+                    var result = mapper.Map<IEnumerable<Db.LinkType>, IEnumerable<Models.LinkType>>(LinkType);
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+
+        }
+
+        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int Id)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                var LinkType = await DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id&&q.IsActive);
+                if (LinkType != null)
+                {
+                    logger?.LogInformation($"{LinkType} customer(s) found");
+                    var result = mapper.Map<Db.LinkType, Models.LinkType>(LinkType);
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> PostLinkTypeAsync(Models.LinkType LinkType)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                if (!LinkTypeExists(LinkType.Id))
+                {
+                    var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
+                    DocumentDbContext.LinkTypes.Add(dbLink);
+                    DocumentDbContext.SaveChanges();
+                    var result = mapper.Map<Db.LinkType, Models.LinkType>(dbLink);
+                    return (true, result, null);
+                }
+                return (false, null, "LinkType is already exits");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(Models.LinkType LinkType)
+        {
+            try
+            {
+                if (LinkType != null)
+                {
+                    var existing = DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefault(x => x.Id == LinkType.Id);
+                    if (existing != null)
+                    {
+                        var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
+                        DocumentDbContext.LinkTypes.Update(dbLink);
+                        DocumentDbContext.SaveChanges();
+                        return (true, mapper.Map<Db.LinkType, Models.LinkType>(dbLink), "Successful");
+                    }
+                    else
+                    {
+                        logger?.LogInformation($"{LinkType} Not found");
+                        return (false, null, "Not Found");
+                    }
+                }
+                else
+                {
+                    logger?.LogInformation($"{LinkType} Bad Request");
+                    return (false, null, "Bad request");
+                }
+
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> DeleteLinkTypeAsync(int Id)
+        {
+
+            try
+            {
+                Db.LinkType LinkType = DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
+                if (LinkType == null)
+                {
+                    return (false, null, "Not Found");
+                }
+                LinkType.IsActive = false;
+                DocumentDbContext.LinkTypes.Update(LinkType);
+                DocumentDbContext.SaveChanges();
+                return (true, mapper.Map<Db.LinkType, Models.LinkType>(LinkType), $"LinkTypeId {Id} deleted Successfuly");
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        private bool LinkTypeExists(int id)
+        {
+            return DocumentDbContext.LinkTypes.AsNoTracking().Count(e => e.Id == id) > 0;
+        }
+    }
+}

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

@@ -0,0 +1,123 @@
+using AutoMapper;
+using Azure;
+using DamageAssesment.Api.Documents.Db;
+using DamageAssesment.Api.Documents.Interfaces;
+using DamageAssesment.Api.Documents.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System.Diagnostics.Metrics;
+using System.Net.Http;
+using System.Security.AccessControl;
+using System.Security.Principal;
+
+namespace DamageAssesment.Api.Documents.Providers
+{
+    public class UploadService : IUploadService
+    {
+        private ILogger<UploadService> logger;
+        private IMapper mapper;
+        private string uploadpath = "";
+        private string Deletepath = "";
+        public UploadService(IConfiguration configuration, ILogger<UploadService> logger, IMapper mapper)
+        {
+            this.logger = logger;
+            this.mapper = mapper;
+            uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
+            Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
+        }
+
+        public Models.Document UploadDocument(int counter, DocumentInfo documentInfo)
+        {
+            Models.Document Documents = new Models.Document();
+            try 
+            {
+                string path = "", UserfileName="";
+                if (documentInfo.File != null)
+                {
+                    counter++;
+                    var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
+                    if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
+                        Directory.CreateDirectory(fullDirectoryPath);
+                    UserfileName = Path.GetFileName(documentInfo.File.FileName);
+                    var fileName = String.Format("Document_{0}{1}", counter, documentInfo.File.FileExtension);
+                    path = Path.Combine(fullDirectoryPath, fileName);
+                    File.WriteAllBytes(path, Convert.FromBase64String(documentInfo.File.FileContent));
+                }
+                Documents=new Models.Document (){ linkTypeId = documentInfo.linkTypeId,
+                    documentsTranslations = documentInfo.documentsTranslations,
+                    docName = UserfileName, 
+                    url = documentInfo.url, Path = path,IsActive =true,dateCreated=DateTime.Now,dateUpdated=DateTime.Now};
+            
+                return Documents;
+            }
+            catch (Exception ex) {
+                return new Models.Document();
+            }
+
+           
+        }
+        public Models.Document UpdateDocuments(Models.Document document, DocumentInfo documentInfo)
+        {
+            try
+            {
+                Deletefile(document.Path);
+                var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
+                if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
+                    Directory.CreateDirectory(fullDirectoryPath);
+
+                string path = "", UserfileName = "";
+                if (documentInfo.File != null)
+                {
+                    UserfileName = Path.GetFileName(documentInfo.File.FileName);
+                    var fileName = String.Format("Document_{0}{1}", documentInfo.Id, documentInfo.File.FileExtension);
+                    path = Path.Combine(fullDirectoryPath, fileName);
+                    File.WriteAllBytes(path, Convert.FromBase64String(documentInfo.File.FileContent));
+                }
+                Models.Document Documents = new Models.Document()
+                {
+                    Id = documentInfo.Id,
+                    linkTypeId = documentInfo.linkTypeId,
+                    documentsTranslations=documentInfo.documentsTranslations,
+                    docName = UserfileName,
+                    url = documentInfo.url,
+                    Path = path,
+                    IsActive = true,
+                    dateCreated = document.dateCreated,
+                    dateUpdated = DateTime.Now
+                };
+
+                return Documents;
+            }
+
+             catch (Exception ex) {
+                return new Models.Document();
+            }
+        }
+        public void Deletefile(string path)
+        {
+            if (path != "")
+            {
+                FileInfo file = new FileInfo(path);
+                if (file?.Exists??false)//check file exsit or not  
+                {
+                    file.Delete();
+                }
+            }
+        }
+        public void Movefile(string path)
+        {
+            if (path != "")
+            {
+                var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), Deletepath);
+                if (!Directory.Exists(pathToSave)) //Create deirectory if does not exist
+                    Directory.CreateDirectory(pathToSave);
+                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);
+                }
+            }
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Documents/appsettings.json

@@ -0,0 +1,13 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*",
+  "Fileupload": {
+    "folderpath": "DASA_Documents/Active",
+    "Deletepath": "DASA_Documents/Deleted"
+  }
+}

DamageAssesmentApi/DamageAssesment.Api.Employees.Test/EmployeeServiceTest.cs

@@ -98,10 +98,10 @@ namespace DamageAssesment.Api.Employees.Test
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getOkResponse("Emp1");
             var mockInputEmployee = await MockData.getInputEmployeeData();
-            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync("Emp1",mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.UpdateEmployee(mockInputEmployee);
+            var result = (OkObjectResult)await EmployeeProvider.UpdateEmployee("Emp1",mockInputEmployee);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -112,10 +112,10 @@ namespace DamageAssesment.Api.Employees.Test
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
             var mockInputEmployee = await MockData.getInputEmployeeData();
-            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync("Emp1", mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundObjectResult)await EmployeeProvider.UpdateEmployee(mockInputEmployee);
+            var result = (NotFoundObjectResult)await EmployeeProvider.UpdateEmployee("Emp1", mockInputEmployee);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -126,10 +126,10 @@ namespace DamageAssesment.Api.Employees.Test
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputEmployee = await MockData.getInputEmployeeData();
-            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync("Emp1", mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (BadRequestObjectResult)await EmployeeProvider.UpdateEmployee(mockInputEmployee);
+            var result = (BadRequestObjectResult)await EmployeeProvider.UpdateEmployee("Emp1", mockInputEmployee);
 
             Assert.Equal(400, result.StatusCode);
         }

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

@@ -33,19 +33,19 @@ namespace DamageAssesment.Api.Employees.Test
             return (false, null, "Bad Request");
         }
 
-        public static async Task<(bool, Employees.Models.Employee, string)> getNotFoundResponse()
+        public static async Task<(bool, Models.Employee, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Employees.Models.Employee>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Models.Employee>, string)> getNoContentResponse()
         {
             IEnumerable<Employees.Models.Employee> list = new List<Employees.Models.Employee>();
             return (false, list, null);
         }
 
-        public static async Task<Employees.Db.Employee> getInputEmployeeData()
+        public static async Task<Models.Employee> getInputEmployeeData()
         {
-            return new Employees.Db.Employee { Id = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" };
+            return new Models.Employee { Id = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" };
 
         }
 

DamageAssesmentApi/DamageAssesment.Api.Employees/Controllers/EmployeesController.cs

@@ -55,11 +55,11 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// </summary>
         /// <param name="Employee">The updated employee object.</param>
         [HttpPut("Employees")]
-        public async Task<IActionResult> UpdateEmployee(Db.Employee Employee)
+        public async Task<IActionResult> UpdateEmployee(string Id, Models.Employee Employee)
         {
             if (Employee != null)
             {
-                var result = await this.EmployeeProvider.UpdateEmployeeAsync(Employee);
+                var result = await this.EmployeeProvider.UpdateEmployeeAsync(Id,Employee);
                 if (result.IsSuccess)
                 {
                     return Ok(result.Employee);
@@ -77,7 +77,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// </summary>
         /// <param name="Employee">The employee information for creating a new employee.</param>
         [HttpPost("Employees")]
-        public async Task<IActionResult> CreateEmployee(Db.Employee Employee)
+        public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
         {
             if (Employee != null)
             {

DamageAssesmentApi/DamageAssesment.Api.Employees/Db/EmployeeDbContext.cs

@@ -7,8 +7,6 @@ namespace DamageAssesment.Api.Employees.Db
         public DbSet<Db.Employee> Employees { get; set; }
         public EmployeeDbContext(DbContextOptions options) : base(options)
         {
-
-
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/Interfaces/IEmployeesProvider.cs

@@ -4,8 +4,9 @@
     {
         Task<(bool IsSuccess, IEnumerable<Models.Employee> Employees, string ErrorMessage)> GetEmployeesAsync();
         Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(string Id);
-        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Db.Employee Employee);
-        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(Db.Employee Employee);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Models.Employee Employee);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(string Id, Models.Employee Employee);
         Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(string Id);
+        void SeedData();
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -34,6 +34,13 @@ if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
+
+    using (var serviceScope = app.Services.CreateScope())
+    {
+        var services = serviceScope.ServiceProvider;
+        var employeesProvider = services.GetRequiredService<IEmployeesProvider>();
+        employeesProvider.SeedData();
+    }
 }
 
 app.UseAuthorization();

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

@@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Providers
             this.EmployeeDbContext = EmployeeDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+           // SeedData();
         }
 
         public async Task<(bool IsSuccess, IEnumerable<Models.Employee> Employees, string ErrorMessage)> GetEmployeesAsync()
@@ -65,17 +65,18 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Db.Employee Employee)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Models.Employee Employee)
         {
             try
             {
+                Db.Employee _employee = mapper.Map<Models.Employee, Db.Employee>(Employee);
+
                 logger?.LogInformation("Query Employee");
                 if (!EmployeeExists(Employee.Id))
                 {
-                    EmployeeDbContext.Employees.Add(Employee);
+                    EmployeeDbContext.Employees.Add(_employee);
                     EmployeeDbContext.SaveChanges();
-                    var result = mapper.Map<Db.Employee, Models.Employee>(Employee);
-                    return (true, result, null);
+                    return (true, Employee, null);
                 }
                 return (false, null, "Employee is already exits");
             }
@@ -85,19 +86,20 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(Db.Employee Employee)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(string Id , Models.Employee Employee)
         {
             try
             {
                 if (Employee != null)
                 {
-                    var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id.ToLower() == Employee.Id.ToLower()).FirstOrDefaultAsync();
+                    var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id.ToLower() == Id.ToLower()).FirstOrDefaultAsync();
 
                     if (_employee != null)
                     {
-                        EmployeeDbContext.Employees.Update(Employee);
+                        Db.Employee vEmployee = mapper.Map<Models.Employee, Db.Employee>(Employee);
+                        EmployeeDbContext.Employees.Update(vEmployee);
                         EmployeeDbContext.SaveChanges();
-                        return (true, mapper.Map<Db.Employee, Models.Employee>(Employee), "Successful");
+                        return (true, Employee, "Successful");
                     }
                     else
                     {
@@ -143,7 +145,7 @@ namespace DamageAssesment.Api.Employees.Providers
             return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id.ToLower() == id.ToLower()) > 0;
         }
 
-        private void SeedData()
+        public void SeedData()
         {
             if (!EmployeeDbContext.Employees.Any())
             {

DamageAssesmentApi/DamageAssesment.Api.Locations.Test/LocationsServiceTest.cs

@@ -1,11 +1,6 @@
-using AutoMapper;
 using DamageAssesment.Api.Locations.Controllers;
-using DamageAssesment.Api.Locations.Db;
 using DamageAssesment.Api.Locations.Interfaces;
-using DamageAssesment.Api.Locations.Profiles;
-using DamageAssesment.Api.Locations.Providers;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Moq;
 using Xunit;
 
@@ -13,131 +8,144 @@ namespace DamageAssesment.Api.Locations.Test
 {
     public class LocationsServiceTest
     {
-
-        [Fact(DisplayName = "Get Location using Location ID")]
-        public async Task GetLocationsUsingLocationID()
+        //Test for locations
+        [Fact(DisplayName = "Get Locations - Ok case")]
+        public async Task GetLocationsAsync_ShouldReturnStatusCode200()
         {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
-            .Options;
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getOkResponseLocation();
+            mockLocationService.Setup(service => service.GetLocationsAsync()).ReturnsAsync(mockResponse);
 
-            var dbContext = new LocationDbContext(options);
-            CreateLocations(dbContext);
-            //Mapping 
-            var LocationsProfile = new LocationProfile();
-            var configuration = new MapperConfiguration(cfg => cfg.AddProfile(LocationsProfile));
-            var mapper = new Mapper(configuration);
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.GetLocationsAsync();
 
-            var LocationsProvider = new LocationsProvider(dbContext, null, mapper);
-            //Testmethode
-            var Location = await LocationsProvider.GetLocationByIdAsync("Loc3");
-
-            Assert.True(Location.IsSuccess);
-            Assert.Null(Location.ErrorMessage);
-        }
-        [Fact(DisplayName = "Get Locations")]
-        public async Task GetAllLocationsTest()
-        {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
-            .Options;
-
-            var dbContext = new LocationDbContext(options);
-            CreateLocations(dbContext);
-            //Mapping 
-            var LocationsProfile = new LocationProfile();
-            var configuration = new MapperConfiguration(cfg => cfg.AddProfile(LocationsProfile));
-            var mapper = new Mapper(configuration);
-
-            var LocationsProvider = new LocationsProvider(dbContext, null, mapper);
-            //Testmethode
-            var Location = await LocationsProvider.GetLocationsAsync();
-
-            Assert.True(Location.IsSuccess);
-            Assert.Null(Location.ErrorMessage);
+            Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Delete Location by Id")]
-        public async Task DeleteLocationTest()
+
+        [Fact(DisplayName = "Get Locations - NoContent Case")]
+        public async Task GetLocationsAsync_ShouldReturnStatusCode204()
         {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
-            .Options;
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getNotFoundResponseLocation();
+            mockLocationService.Setup(service => service.GetLocationsAsync()).ReturnsAsync(mockResponse);
 
-            var dbContext = new LocationDbContext(options);
-            CreateLocations(dbContext);
-            //Mapping 
-            var LocationsProfile = new LocationProfile();
-            var configuration = new MapperConfiguration(cfg => cfg.AddProfile(LocationsProfile));
-            var mapper = new Mapper(configuration);
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (NoContentResult)await locationProvider.GetLocationsAsync();
 
-            var LocationsProvider = new LocationsProvider(dbContext, null, mapper);
-            //Testmethode
-            var Location = await LocationsProvider.DeleteLocationAsync("Loc2");
-
-            Assert.True(Location.IsSuccess);
-            Assert.NotNull(Location.ErrorMessage);
+            Assert.Equal(204, result.StatusCode);
         }
-        [Fact(DisplayName = "Add Location")]
-        public async Task AddLocationTest()
-        {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
-            .Options;
 
-            var dbContext = new LocationDbContext(options);
-            CreateLocations(dbContext);
-            //Mapping 
-            var LocationsProfile = new LocationProfile();
-            var configuration = new MapperConfiguration(cfg => cfg.AddProfile(LocationsProfile));
-            var mapper = new Mapper(configuration);
-            var LocationsProvider = new LocationsProvider(dbContext, null, mapper);
-            //Testmethode
-            Db.Location newLocation = new Db.Location() { Id = "Loc9", RegionId = "1", Name = "Test 1", MaintenanceCenter = "1", SchoolType = "US" };
-            var Location = await LocationsProvider.PostLocationAsync(newLocation);
+        [Fact(DisplayName = "Get Locations by Id- Ok case")]
+        public async Task GetLocationsByIdAsync_ShouldReturnStatusCode200()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getOkResponseLocation("Loc1");
+            mockLocationService.Setup(service => service.GetLocationByIdAsync("Loc1")).ReturnsAsync(mockResponse);
 
-            Assert.True(Location.IsSuccess);
-            Assert.Null(Location.ErrorMessage);
-        }
-        [Fact(DisplayName = "Update Location")]
-        public async Task UpdateLocationTest()
-        {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
-            .Options;
-            var dbContext = new LocationDbContext(options);
-            CreateLocations(dbContext);
-            //Mapping 
-            var LocationsProfile = new LocationProfile();
-            var configuration = new MapperConfiguration(cfg => cfg.AddProfile(LocationsProfile));
-            var mapper = new Mapper(configuration);
-            var LocationsProvider = new LocationsProvider(dbContext, null, mapper);
-            //Testmethode
-            Db.Location updateLocation = new Db.Location() { Id = "Loc1", RegionId = "1", Name = "Tampa", MaintenanceCenter = "1", SchoolType = "NA" };
-            var Location = await LocationsProvider.UpdateLocationAsync(updateLocation);
-            var modified = dbContext.Locations.FirstOrDefault(a => a.Id == updateLocation.Id);
-            Assert.True(Location.IsSuccess);
-            Assert.NotNull(Location.ErrorMessage);
-        }
-        private static void CreateLocations(LocationDbContext dbContext)
-        {
-            //Create sample data for testing
-            if (dbContext.Locations.Count() == 0)
-            {
-                for (int i = 1; i < 6; i++)
-                {
-                    dbContext.Locations.Add(new Db.Location()
-                    {
-                        Id = "Loc"+i.ToString(),
-                        RegionId = i.ToString(),
-                        Name = "Test Location" + Guid.NewGuid().ToString(),
-                        MaintenanceCenter = i.ToString(),
-                        SchoolType = "US"
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.GetLocationByIdAsync("Loc1");
 
-                    });
+            Assert.Equal(200, result.StatusCode);
         }
-                dbContext.SaveChanges();
+
+
+        [Fact(DisplayName = "Get Locations By Id - NoFound Case")]
+        public async Task GetLocationsByIdAsync_ShouldReturnStatusCode404()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocationNotFoundResponse();
+            mockLocationService.Setup(service => service.GetLocationByIdAsync("Loc1")).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (NotFoundResult)await locationProvider.GetLocationByIdAsync("Loc1");
+
+            Assert.Equal(404, result.StatusCode);
         }
+
+
+        [Fact(DisplayName = "Post Location - Ok case")]
+        public async Task PostLocationAsync_ShouldReturnStatusCode200()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getOkResponseLocation("Loc1");
+            var mockInputLocation = new Models.Location { Id = "Loc1", RegionId = "R1", Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.PostLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.CreateLocation(mockInputLocation);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Post Location - BadRequest case")]
+        public async Task PostLocationAsync_ShouldReturnStatusCode400()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocationNotFoundResponse();
+            var mockInputLocation = new Models.Location { Id = "Loc1", RegionId = "R1", Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.PostLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (BadRequestResult)await locationProvider.CreateLocation(mockInputLocation);
+
+            Assert.Equal(400, result.StatusCode);
+        }
+
+
+        [Fact(DisplayName = "Put Location - Ok case")]
+        public async Task PutLocationAsync_ShouldReturnStatusCode200()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocation(true, "update success");
+            var mockInputLocation = new Models.Location { Id = "Loc1", RegionId = "R1", Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.UpdateLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.UpdateLocation(mockInputLocation);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Location - NotFound case")]
+        public async Task PutLocationAsync_ShouldReturnStatusCode404()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocation(false, null);
+            var mockInputLocation = new Models.Location { Id = "Loc1", RegionId = "R1", Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.UpdateLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (NotFoundResult)await locationProvider.UpdateLocation(mockInputLocation);
+
+            Assert.Equal(404, result.StatusCode);
+        }
+
+
+        [Fact(DisplayName = "Delete Location - Ok case")]
+        public async Task DeleteLocationAsync_ShouldReturnStatusCode200()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocation(true, "delete success");
+            mockLocationService.Setup(service => service.DeleteLocationAsync("Loc1")).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.DeleteLocation("Loc1");
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Delete Location - NotFound case")]
+        public async Task DeleteLocationAsync_ShouldReturnStatusCode404()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocation(false, null);
+            mockLocationService.Setup(service => service.DeleteLocationAsync("Loc1")).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (NotFoundResult)await locationProvider.DeleteLocation("Loc1");
+
+            Assert.Equal(404, result.StatusCode);
         }
 
         //Tests for regions
@@ -194,7 +202,7 @@ namespace DamageAssesment.Api.Locations.Test
         }
 
         [Fact(DisplayName = "Post Region - Ok case")]
-        public async Task PostSurveyAsync_ShouldReturnStatusCode200()
+        public async Task PostRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getOkResponse("1");
@@ -208,7 +216,7 @@ namespace DamageAssesment.Api.Locations.Test
         }
 
         [Fact(DisplayName = "Post Region - BadRequest case")]
-        public async Task PostSurveyAsync_ShouldReturnStatusCode400()
+        public async Task PostRegionAsync_ShouldReturnStatusCode400()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getBadRequestResponse();
@@ -236,7 +244,7 @@ namespace DamageAssesment.Api.Locations.Test
         }
 
         [Fact(DisplayName = "Put Region - NotFound case")]
-        public async Task PutSurveyAsync_ShouldReturnStatusCode404()
+        public async Task PutRegionAsync_ShouldReturnStatusCode404()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
@@ -250,7 +258,7 @@ namespace DamageAssesment.Api.Locations.Test
         }
 
         [Fact(DisplayName = "Put Region - BadRequest case")]
-        public async Task PutSurveyAsync_ShouldReturnStatusCode400()
+        public async Task PutRegionyAsync_ShouldReturnStatusCode400()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getBadRequestResponse();
@@ -264,7 +272,7 @@ namespace DamageAssesment.Api.Locations.Test
         }
 
         [Fact(DisplayName = "Delete Region - Ok case")]
-        public async Task DeleteSurveyAsync_ShouldReturnStatusCode200()
+        public async Task DeleteRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getOkResponse("1");
@@ -278,7 +286,7 @@ namespace DamageAssesment.Api.Locations.Test
         }
 
         [Fact(DisplayName = "Delete Region - NotFound case")]
-        public async Task DeleteSurveyAsync_ShouldReturnStatusCode404()
+        public async Task DeleteRegionAsync_ShouldReturnStatusCode404()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();

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

@@ -17,9 +17,43 @@ namespace DamageAssesment.Api.Locations.Test
 
         public static async Task<(bool, Locations.Models.Region, string)> getOkResponse(string Id)
         {
-            var surveys = await getOkResponse();
-            var survey = surveys.Item2.FirstOrDefault(s => s.Id == Id);
-            return (true, survey, null);
+            var regions = await getOkResponse();
+            var region = regions.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, region, null);
+        }
+
+
+        public static async Task<(bool, IEnumerable<Models.Location>, string)> getOkResponseLocation()
+        {
+            IEnumerable<Locations.Models.Location> list = new List<Models.Location>();
+
+            for (int i = 0; i < 10; i++)
+            {
+                list.Append(new Locations.Models.Location { Id = "Loc"+ i, RegionId = "R"+i,  Name ="Location"});
+            }
+            return (true, list, null);
+        }
+
+        public static async Task<(bool, IEnumerable<Models.Location>, string)> getNotFoundResponseLocation()
+        {
+            return (false, null, null);
+        }
+
+        public static async Task<(bool, Models.Location, string)> getOkResponseLocation(string Id)
+        {
+            var locations = await getOkResponseLocation();
+            var location = locations.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, location, null);
+        }
+
+        public static async Task<(bool, string)> getLocation(bool value,string message)
+        {
+            return (value,message);
+        }
+
+        public static async Task<(bool, Locations.Models.Location, string)> getLocationNotFoundResponse()
+        {
+            return (false, null, "Not Found");
         }
 
         public static async Task<(bool, Locations.Models.Region, string)> getBadRequestResponse()
@@ -41,6 +75,5 @@ namespace DamageAssesment.Api.Locations.Test
         {
             return new Locations.Models.Region { Id = "R99", Name = "Region 99", Abbreviation = "A99" };
         }
-
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Controllers/LocationsController.cs

@@ -27,7 +27,7 @@ namespace DamageAssesment.Api.Locations.Controllers
             {
                 return Ok(result.locations);
             }
-            return NotFound();
+            return NoContent();
 
         }
         /// <summary>
@@ -51,7 +51,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// </summary>
 
         [HttpPut("Locations")]
-        public async Task<IActionResult> UpdateLocation(Db.Location Location)
+        public async Task<IActionResult> UpdateLocation(Models.Location Location)
         {
             if (Location != null)
             {
@@ -69,7 +69,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// </summary>
 
         [HttpPost("Locations")]
-        public async Task<IActionResult> CreateLocation(Db.Location Location)
+        public async Task<IActionResult> CreateLocation(Models.Location Location)
         {
             if (Location != null)
             {
@@ -78,9 +78,9 @@ namespace DamageAssesment.Api.Locations.Controllers
                 {
                     return Ok(result.Question);
                 }
-                return NotFound();
+                return BadRequest();
             }
-            return CreatedAtRoute("DefaultApi", new { id = Location.Id }, Location);
+            return BadRequest();
         }
         /// <summary>
         /// Delete an existing location.

DamageAssesmentApi/DamageAssesment.Api.Locations/Controllers/RegionsController.cs

@@ -14,7 +14,7 @@ namespace DamageAssesment.Api.Locations.Controllers
             this.regionProvider = regionProvider;
         }
         /// <summary>
-        /// Get all regions.
+        /// Get all regions.2
         /// </summary>
 
         [HttpGet]

DamageAssesmentApi/DamageAssesment.Api.Locations/Interfaces/ILocationsProvider.cs

@@ -6,8 +6,9 @@ namespace DamageAssesment.Api.Locations.Interfaces
     {
         Task<(bool IsSuccess, IEnumerable<Models.Location> locations, string ErrorMessage)> GetLocationsAsync();
         Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> GetLocationByIdAsync(string Id);
-        Task<(bool IsSuccess, Models.Location Question, string ErrorMessage)> PostLocationAsync(Db.Location Location);
-        Task<(bool IsSuccess, string ErrorMessage)> UpdateLocationAsync(Db.Location Location);
+        Task<(bool IsSuccess, Models.Location Question, string ErrorMessage)> PostLocationAsync(Models.Location Location);
+        Task<(bool IsSuccess, string ErrorMessage)> UpdateLocationAsync(Models.Location Location);
         Task<(bool IsSuccess, string ErrorMessage)> DeleteLocationAsync(string Id);
+        void SeedData();
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Interfaces/IRegionsProvider.cs

@@ -7,5 +7,6 @@
         Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> PostRegionAsync(Models.Region region);
         Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> PutRegionAsync(Models.Region region);
         Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> DeleteRegionAsync(string Id);
+        void SeedData();
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -33,6 +33,15 @@ if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
+
+    using (var serviceScope = app.Services.CreateScope())
+    {
+        var services = serviceScope.ServiceProvider;
+        var locationProvider = services.GetRequiredService<ILocationsProvider>();
+        var regionProvider = services.GetRequiredService<IRegionsProvider>();
+        locationProvider.SeedData();
+        regionProvider.SeedData();
+    }
 }
 
 app.UseAuthorization();

DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/LocationsProvider.cs

@@ -17,7 +17,7 @@ namespace DamageAssesment.Api.Locations.Providers
             this.locationDbContext = locationDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+            //SeedData();
         }
 
         public async Task<(bool IsSuccess, IEnumerable<Models.Location> locations, string ErrorMessage)> GetLocationsAsync()
@@ -63,17 +63,17 @@ namespace DamageAssesment.Api.Locations.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Location Question, string ErrorMessage)> PostLocationAsync(Db.Location Location)
+        public async Task<(bool IsSuccess, Models.Location Question, string ErrorMessage)> PostLocationAsync(Models.Location Location)
         {
             try
             {
                 logger?.LogInformation("Query Location");
                 if (!LocationExists(Location.Id))
                 {
-                    locationDbContext.Locations.Add(Location);
+                    Db.Location _location = mapper.Map<Models.Location, Db.Location>(Location);
+                    locationDbContext.Locations.Add(_location);
                     locationDbContext.SaveChanges();
-                    var result = mapper.Map<Db.Location, Models.Location>(Location);
-                    return (true, result, null);
+                    return (true, Location, null);
                 }
                 else
                 {
@@ -86,11 +86,12 @@ namespace DamageAssesment.Api.Locations.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, string ErrorMessage)> UpdateLocationAsync(Db.Location Location)
+        public async Task<(bool IsSuccess, string ErrorMessage)> UpdateLocationAsync(Models.Location Location)
         {
             try
             {
-                locationDbContext.Entry(Location).State = EntityState.Modified;
+                Db.Location _location = mapper.Map<Models.Location, Db.Location>(Location);
+                locationDbContext.Entry(_location).State = EntityState.Modified;
                 locationDbContext.SaveChanges();
                 return (true, "Record updated successfully");
             }
@@ -126,7 +127,7 @@ namespace DamageAssesment.Api.Locations.Providers
         {
             return locationDbContext.Locations.AsNoTracking().Count(e => e.Id == id) > 0;
         }
-        private void SeedData()
+        public void SeedData()
         {
             if (!locationDbContext.Locations.Any())
             {

DamageAssesmentApi/DamageAssesment.Api.Locations/Providers/RegionsProvider.cs

@@ -1,7 +1,6 @@
 using AutoMapper;
 using DamageAssesment.Api.Locations.Db;
 using DamageAssesment.Api.Locations.Interfaces;
-using DamageAssesment.Api.Locations.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace DamageAssesment.Api.Locations.Providers
@@ -17,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Providers
             this.locationDbContext = regionDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+            //SeedData();
         }
 
         public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(string Id)
@@ -150,7 +149,7 @@ namespace DamageAssesment.Api.Locations.Providers
             }
         }
 
-        private void SeedData()
+        public void SeedData()
         {
             if (!locationDbContext.Regions.Any())
             {

DamageAssesmentApi/DamageAssesment.Api.Questions/Controllers/QuestionsController.cs

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class QuestionsController : ControllerBase
     {
@@ -21,12 +20,12 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// </summary>
 
         // get all questions
-        [Route("{Language}/Questions")]
         [Route("Questions")]
+        [Route("Questions/{language:alpha}")]
         [HttpGet]
-        public async Task<IActionResult> GetQuestionsAsync(string? Language)
+        public async Task<IActionResult> GetQuestionsAsync(string? language)
         {
-            var result = await this.questionsProvider.GetQuestionsAsync(Language);
+            var result = await this.questionsProvider.GetQuestionsAsync(language);
             if (result.IsSuccess)
             {
                 return Ok(result.Questions);
@@ -38,12 +37,12 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// GET request for retrieving a question by ID.
         /// </summary>
-        [Route("{Language}/Questions/{id}")]
-        [Route("Questions/{id}")]
+        [Route("Questions/{id}/{language:alpha}")]
+        [Route("Questions/{id:int}")]
         [HttpGet]
-        public async Task<IActionResult> GetQuestionAsync(int id, string? Language)
+        public async Task<IActionResult> GetQuestionByIdAsync(string? language,int id)
         {
-            var result = await this.questionsProvider.GetQuestionAsync(id,Language);
+            var result = await this.questionsProvider.GetQuestionAsync(id, language);
             if (result.IsSuccess)
             {
                 return Ok(result.Question);
@@ -56,12 +55,12 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving survey questions based on a survey ID.
         /// Uri: {Optional language}/GetSurveyQuestions/{surveyId} :Default returns question in all languages 
         /// </summary>
-        [Route("{Language}/GetSurveyQuestions/{surveyId}")]
-        [Route("GetSurveyQuestions/{surveyId}")]
+        [Route("Questions/BySurvey/{surveyId:int}")]
+        [Route("Questions/BySurvey/{surveyId:int}/{language:alpha}")]
         [HttpGet]
-        public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? Language)
+        public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? language)
         {
-            var result = await this.questionsProvider.GetSurveyQuestionAsync(surveyId, Language);
+            var result = await this.questionsProvider.GetSurveyQuestionAsync(surveyId, language);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyQuestions);
@@ -126,10 +125,11 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving question categories.
         /// </summary>
 
-        [HttpGet("QuestionCategories")]
-        public async Task<IActionResult> GetQuestionCategoriesAsync()
+        [HttpGet("Questions/Categories")]
+        [HttpGet("Questions/Categories/{language:alpha}")]
+        public async Task<IActionResult> GetQuestionCategoriesAsync(string? language)
         {
-            var result = await this.questionsProvider.GetQuestionCategoriesAsync();
+            var result = await this.questionsProvider.GetQuestionCategoriesAsync(language);
             if (result.IsSuccess)
             {
                 return Ok(result.QuestionCategories);
@@ -140,10 +140,11 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving a question category by ID.
         /// </summary>
 
-        [HttpGet("QuestionCategories/{id}")]
-        public async Task<IActionResult> GetQuestionCategoryAsync(int id)
+        [HttpGet("Questions/Categories/{id:int}")]
+        [HttpGet("Questions/Categories/{id:int}/{language:alpha}")]
+        public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language)
         {
-            var result = await this.questionsProvider.GetQuestionCategoryAsync(id);
+            var result = await this.questionsProvider.GetQuestionCategoryAsync(id, language);
             if (result.IsSuccess)
             {
                 return Ok(result.QuestionCategory);
@@ -156,7 +157,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// PUT request for updating a question category.
         /// </summary>
 
-        [HttpPut("QuestionCategories")]
+        [HttpPut("Questions/Categories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -177,7 +178,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question category.
         /// </summary>
 
-        [HttpPost("QuestionCategories")]
+        [HttpPost("Questions/Categories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -195,7 +196,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question category based on ID.
         /// </summary>
 
-        [HttpDelete("QuestionCategories/{id}")]
+        [HttpDelete("Questions/Categories/{id}")]
         public async Task<IActionResult> DeleteQuestionCategory(int id)
         {
             var result = await this.questionsProvider.DeleteQuestionCategoryAsync(id);

DamageAssesmentApi/DamageAssesment.Api.Questions/Db/CategoryTranslation.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Questions.Db
+{
+    public class CategoryTranslation
+    {
+        [Key]
+        public int Id { get; set; }
+        [ForeignKey("QuestionCategory")]
+        public int CategoryId { get; set; }
+        public string Title { get; set; }
+        public string Language { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionCategory.cs

@@ -7,8 +7,8 @@ namespace DamageAssesment.Api.Questions.Db
     {
         [Key]
         public int Id { get; set; }
-        public string CategoryName { get; set; }
-        public string CategoryImage { get; set; }
+        public string IconName { get; set; }
+        public string IconLibrary { get; set; }
 
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionDbContext.cs

@@ -10,6 +10,7 @@ namespace DamageAssesment.Api.Questions.Db
         public DbSet<Db.QuestionType> QuestionTypes { get; set; }
         public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; }
         public DbSet<Db.QuestionCategory> QuestionCategories { get; set; }
+        public DbSet<Db.CategoryTranslation> CategoryTranslations { get; set; }
         public QuestionDbContext(DbContextOptions options) : base(options)
         {
 
@@ -29,6 +30,9 @@ namespace DamageAssesment.Api.Questions.Db
             modelBuilder.Entity<QuestionCategory>()
                 .Property(item => item.Id)
                 .ValueGeneratedOnAdd();
+            modelBuilder.Entity<CategoryTranslation>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Interfaces/IQuestionsProvider.cs

@@ -4,18 +4,19 @@ namespace DamageAssesment.Api.Questions.Interfaces
 {
     public interface IQuestionsProvider : IQuestionTypesProvider
     {
-        Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> GetQuestionAsync(int Id, string Language);
-        Task<(bool IsSuccess, IEnumerable<Models.Question> Questions, string ErrorMessage)> GetQuestionsAsync(string Language);
-        Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string Language);
-        Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
-        Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
-        Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> DeleteQuestionAsync(int Id);
+        Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> GetQuestionAsync(int id, string language);
+        Task<(bool IsSuccess, IEnumerable<Models.MultiLanQuestion> Questions, string ErrorMessage)> GetQuestionsAsync(string language);
+        Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string language);
+        Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
+        Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
+        Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> DeleteQuestionAsync(int id);
 
 
-        Task<(bool IsSuccess, IEnumerable<Models.QuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync();
-        Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int Id);
-        Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory);
-        Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory);
-        Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id);
+        Task<(bool IsSuccess, IEnumerable<Models.MultiLanQuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync(string? language);
+        Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int id, string? language);
+        Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory);
+        Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory);
+        Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int id);
+        void SeedData();
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Models/CategoryTranslation.cs

@@ -0,0 +1,8 @@
+namespace DamageAssesment.Api.Questions.Models
+{
+    public class CategoryTranslation
+    {
+        public string Title { get; set; }
+        public string Language { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Questions/Models/Question.cs

@@ -2,11 +2,17 @@
 
 namespace DamageAssesment.Api.Questions.Models
 {
-    public class Question
+    public class MultiLanQuestion: BaseQuestion
+    {
+        public MultiLanguage Questions { get; set; }
+    }
+    public class Question: BaseQuestion
+    {
+        public List<QuestionsTranslation> Questions { get; set; }
+    }
+    public class BaseQuestion
     {
         public int Id { get; set; }
-        public List<QuestionsTranslation> Questions { get; set; }
-
         //public int QuestionTypeID { get; set; }
 
         public string TypeText { get; set; } = string.Empty;

DamageAssesmentApi/DamageAssesment.Api.Questions/Models/QuestionCategory.cs

@@ -1,9 +1,17 @@
 namespace DamageAssesment.Api.Questions.Models
 {
-    public class QuestionCategory
+    public class MultiLanQuestionCategory : BaseQuestionCategory
+    {
+        public object Titles { get; set; }
+    }
+    public class QuestionCategory : BaseQuestionCategory
+    {
+        public List<CategoryTranslation> Categories { get; set; }
+    }
+    public class BaseQuestionCategory
     {
         public int Id { get; set; }
-        public string CategoryName { get; set; }
-        public string CategoryImage { get; set; }
+        public string IconName { get; set; }
+        public string IconLibrary { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Models/QuestionsTranslation.cs

@@ -5,4 +5,8 @@
         public string QuestionText { get; set; }
         public string Language { get; set; } = "En";
     }
+    public class MultiLanguage
+    {
+        public object questionText { get; set; }
+    }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Models/SurveyQuestion.cs

@@ -3,8 +3,8 @@
     public class SurveyQuestions
     {
         public int CategoryId { get; set; }
-        public string CategoryName { get; set; }
-        public string CategoryImage { get; set; }
-        public List<Question> Questions { get; set; }
+        public string IconName { get; set; }
+        public string IconLibrary { get; set; }
+        public List<MultiLanQuestion> Questions { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Profiles/QuestionProfile.cs

@@ -8,11 +8,15 @@ namespace DamageAssesment.Api.Questions.Profiles
         {
             CreateMap<Db.Question, Models.Question>().ForMember(dest => dest.TypeText,
                 opt => opt.MapFrom(src => src.QuestionType.TypeText));
+            CreateMap<Db.Question, Models.MultiLanQuestion>().ForMember(dest => dest.TypeText,
+                opt => opt.MapFrom(src => src.QuestionType.TypeText));
             CreateMap<Models.QuestionCategory, Db.QuestionCategory>();
-            CreateMap<Db.QuestionCategory, Models.QuestionCategory>();
+            CreateMap<Db.QuestionCategory, Models.MultiLanQuestionCategory>();
             CreateMap<Models.Question, Db.Question>();
             CreateMap<Db.QuestionsTranslation, Models.QuestionsTranslation>();
             CreateMap<Models.QuestionsTranslation, Db.QuestionsTranslation>();
+            CreateMap<Db.CategoryTranslation, Models.CategoryTranslation>();
+            CreateMap<Models.CategoryTranslation, Db.CategoryTranslation>();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

@@ -37,6 +37,13 @@ if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
+
+    using (var serviceScope = app.Services.CreateScope())
+    {
+        var services = serviceScope.ServiceProvider;
+        var questionProvider = services.GetRequiredService<IQuestionsProvider>();
+        questionProvider.SeedData();
+    }
 }
 
 app.UseAuthorization();

DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs

@@ -5,6 +5,8 @@ using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace DamageAssesment.Api.Questions.Providers
 {
@@ -24,7 +26,7 @@ namespace DamageAssesment.Api.Questions.Providers
             SeedData();
         }
 
-        private void SeedData()
+        public void SeedData()
         {
 
             if (!questionDbContext.QuestionsTranslations.Any())
@@ -57,16 +59,89 @@ namespace DamageAssesment.Api.Questions.Providers
 
             if (!questionDbContext.QuestionCategories.Any())
             {
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 1, CategoryName = "Flooding", CategoryImage= "https://example.com/images/img1.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 2, CategoryName = "Electrical", CategoryImage = "https://example.com/images/img2.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 3, CategoryName = "Structural", CategoryImage = "https://example.com/images/img3.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 4, CategoryName = "Utility", CategoryImage = "https://example.com/images/img4.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory()   { Id = 5, CategoryName = "Debris", CategoryImage = "https://example.com/images/img5.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 1, IconName = "Flooding", IconLibrary= "https://example.com/images/img1.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 2, IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 3, IconName = "Structural", IconLibrary = "https://example.com/images/img3.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 4, IconName = "Utility", IconLibrary = "https://example.com/images/img4.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory()   { Id = 5, IconName = "Debris", IconLibrary = "https://example.com/images/img5.png" });
+                questionDbContext.SaveChanges();
+            }
+
+            if (!questionDbContext.CategoryTranslations.Any())
+            {
+
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 1, CategoryId = 1, Title = "Flooding", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 2, CategoryId = 2, Title = "Electrical", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 3, CategoryId = 3, Title = "Structural", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 4, CategoryId = 4, Title = "Utility", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 5, CategoryId = 5, Title = "Debris", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 6, CategoryId = 1, Title = "Inondation", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 7, CategoryId = 2, Title = "Électrique", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 8, CategoryId = 3, Title = "De construction", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 9, CategoryId = 4, Title = "Utilitaire", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 10, CategoryId = 5, Title = "Débris", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 11, CategoryId = 1, Title = "Inundación", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 12, CategoryId = 2, Title = "Eléctrica", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 13, CategoryId = 3, Title = "Estructural", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 14, CategoryId = 4, Title = "Utilidad", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 15, CategoryId = 5, Title = "Escombros", Language = "es" });
                 questionDbContext.SaveChanges();
             }
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Question> Questions, string ErrorMessage)> GetQuestionsAsync(string Language)
+        public List<Models.CategoryTranslation> GetCategoryTranslations(int id, string? language)
+        {
+            List<Models.CategoryTranslation> categoryTranslations = new List<Models.CategoryTranslation>();
+            if (string.IsNullOrEmpty(language))
+            {
+                categoryTranslations = mapper.Map<List<Db.CategoryTranslation>, List<Models.CategoryTranslation>>(
+                    questionDbContext.CategoryTranslations.AsNoTracking().Where(a => a.CategoryId == id).ToList());
+            }
+            else
+            {
+                categoryTranslations = mapper.Map<List<Db.CategoryTranslation>, List<Models.CategoryTranslation>>(
+                questionDbContext.CategoryTranslations.AsNoTracking().Where(a => a.CategoryId == id && a.Language == language).ToList());
+            }
+            return categoryTranslations;
+        }
+        public object CreateCategoryMultiLanguageObject(List<Models.CategoryTranslation> categoryTranslations)
+        {
+            object MultiLanguage = new object();
+            Dictionary<string, string> dict = new Dictionary<string, string>();
+            foreach (Models.CategoryTranslation item in categoryTranslations)
+            {
+                dict.Add(item.Language, item.Title);
+            }
+            MultiLanguage = dict;
+            return MultiLanguage;
+        }
+        public List<Models.QuestionsTranslation> GetQuestionsTranslations(int id, string? language)
+        {
+            List<Models.QuestionsTranslation> QuestionTranslations;
+            if (string.IsNullOrEmpty(language))
+            {
+                QuestionTranslations = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                    questionDbContext.QuestionsTranslations.AsNoTracking().Where(a => a.QuestionId == id).ToList());
+            }
+            else
+            {
+                QuestionTranslations = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                questionDbContext.QuestionsTranslations.AsNoTracking().Where(a => a.QuestionId == id && a.Language == language).ToList());
+            }
+            return QuestionTranslations;
+        }
+        public MultiLanguage CreateMultiLanguageObject(List<Models.QuestionsTranslation> questions)
+        {
+            MultiLanguage MultiLanguage = new MultiLanguage();
+            Dictionary<string, string> dict = new Dictionary<string, string>();
+            foreach (Models.QuestionsTranslation item in questions)
+            {
+                dict.Add(item.Language, item.QuestionText);
+            }
+            MultiLanguage.questionText = dict;
+            return MultiLanguage;
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanQuestion> Questions, string ErrorMessage)> GetQuestionsAsync(string language)
         {
             try
             {
@@ -76,21 +151,10 @@ namespace DamageAssesment.Api.Questions.Providers
                 {
 
                     //logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.Question>>(questions);
-
-
+                    var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.MultiLanQuestion>>(questions);
                     foreach (var question in result)
                     {
-                        if (string.IsNullOrEmpty(Language))
-                        {
-                            question.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                            questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == question.Id).ToList());
-                        }
-                        else
-                        {
-                            question.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                            questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == question.Id && a.Language == Language).ToList());
-                        }
+                        question.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(question.Id, language));
                     }
                     return (true, result, null);
                 }
@@ -102,27 +166,17 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> GetQuestionAsync(int Id, string Language)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> GetQuestionAsync(int id, string language)
         {
             try
             {
                 logger?.LogInformation("Query Question");
-                var question = await questionDbContext.Questions.Include("QuestionType").AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                var question = await questionDbContext.Questions.Include("QuestionType").AsNoTracking().FirstOrDefaultAsync(q => q.Id == id);
                 if (question != null)
                 {
                     logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<Db.Question, Models.Question>(question);
-
-                    if (string.IsNullOrEmpty(Language))
-                    {
-                        result.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                                questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == result.Id).ToList());
-                    }
-                    else
-                    {
-                        result.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                     questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == result.Id && a.Language == Language).ToList());
-                    }
+                    var result = mapper.Map<Db.Question, Models.MultiLanQuestion>(question);                    
+                    result.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(id, language));
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -133,27 +187,15 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public List<Models.Question> GetSurveyQuestion(List<Models.Question> questions, string Language)
-        {
-            if (string.IsNullOrEmpty(Language))
+        public List<Models.MultiLanQuestion> GetSurveyQuestion(List<Models.MultiLanQuestion> questions, string language)
         {
             foreach (var item in questions)
             {
-                    item.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                                questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == item.Id).ToList());
-                }
-            }
-            else
-            {
-                foreach (var item in questions)
-                {
-                    item.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                                questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == item.Id && a.Language == Language).ToList());
-                }
+                item.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(item.Id, language));
             }
             return questions;
         }
-        public async Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int SurveyId, string Language)
+        public async Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int SurveyId, string language)
         {
             try
             {
@@ -170,9 +212,9 @@ namespace DamageAssesment.Api.Questions.Providers
                         surveyQuestionsList.Add(new SurveyQuestions()
                         {
                             CategoryId = item.Id,
-                            CategoryImage = item.CategoryImage,
-                            CategoryName = item.CategoryName,
-                            Questions = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.Question>>(questions.Where(a => a.CategoryId == item.Id).ToList()), Language)
+                            IconLibrary = item.IconLibrary,
+                            IconName = item.IconName,
+                            Questions = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanQuestion>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language)
                         });
                     }
 
@@ -187,7 +229,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question)
         {
             try
             {
@@ -200,7 +242,9 @@ namespace DamageAssesment.Api.Questions.Providers
                 questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
                 questionDbContext.SaveChanges();
                 Question.Id = dbquestion.Id;
-                return (true, Question, null);
+                var result = mapper.Map<Db.Question, Models.MultiLanQuestion>(dbquestion);
+                result.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id,""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -208,7 +252,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
         {
             try
             {
@@ -222,7 +266,9 @@ namespace DamageAssesment.Api.Questions.Providers
                 dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
                 questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
                 questionDbContext.SaveChanges();
-                return (true, Question, null);
+                var result = mapper.Map<Db.Question, Models.MultiLanQuestion>(dbquestion);
+                result.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -231,21 +277,23 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> DeleteQuestionAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> DeleteQuestionAsync(int id)
         {
             try
             {
-                var question = await questionDbContext.Questions.Where(x => x.Id == Id).FirstOrDefaultAsync();
+                var question = await questionDbContext.Questions.Where(x => x.Id == id).FirstOrDefaultAsync();
 
                 if (question != null)
                 {
+                    var result = mapper.Map<Db.Question, Models.MultiLanQuestion>(question);
+                    result.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
                     questionDbContext.Questions.Remove(question);
                     questionDbContext.SaveChanges();
-                    return (true, mapper.Map<Db.Question, Models.Question>(question), $"QuestionID {Id} deleted Successfuly");
+                    return (true, result, $"QuestionID {id} deleted Successfuly");
                 }
                 else
                 {
-                    logger?.LogInformation($"QuestionID: {Id} Not found");
+                    logger?.LogInformation($"QuestionID: {id} Not found");
                     return (false, null, "Not Found");
                 }
             }
@@ -258,7 +306,7 @@ namespace DamageAssesment.Api.Questions.Providers
 
         //Question Category Logic
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.QuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync()
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanQuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync(string? language)
         {
             try
             {
@@ -267,7 +315,11 @@ namespace DamageAssesment.Api.Questions.Providers
                 if (questionCategories != null)
                 {
                     //logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<IEnumerable<Db.QuestionCategory>, IEnumerable<Models.QuestionCategory>>(questionCategories);
+                    var result = mapper.Map<IEnumerable<Db.QuestionCategory>, IEnumerable<Models.MultiLanQuestionCategory>>(questionCategories);
+                    foreach (var category in result)
+                    {
+                        category.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(category.Id, language));
+                    }
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -278,16 +330,17 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int id, string? language)
         {
             try
             {
                 logger?.LogInformation("Query Question");
-                var questioncategory = await questionDbContext.QuestionCategories.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                var questioncategory = await questionDbContext.QuestionCategories.AsNoTracking().FirstOrDefaultAsync(q => q.Id == id);
                 if (questioncategory != null)
                 {
                     logger?.LogInformation($"{questioncategory} customer(s) found");
-                    var result = mapper.Map<Db.QuestionCategory, Models.QuestionCategory>(questioncategory);
+                    var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(questioncategory);
+                    result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, language));
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -298,17 +351,23 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
         {
             try
             {
                 logger?.LogInformation("Query Question");
                 var dbQuestionCategory = mapper.Map<Models.QuestionCategory, Db.QuestionCategory>(QuestionCategory);
+                var dbCategorytranslations = mapper.Map<List<Models.CategoryTranslation>, List<Db.CategoryTranslation>>(QuestionCategory.Categories);
                 // Question.QuestionType = GetQuestionType(Question.QuestionTypeId);
                 questionDbContext.QuestionCategories.Add(dbQuestionCategory);
                 questionDbContext.SaveChanges();
                 QuestionCategory.Id = dbQuestionCategory.Id;
-                return (true, QuestionCategory, null);
+                dbCategorytranslations.ForEach(i => i.CategoryId = QuestionCategory.Id);
+                questionDbContext.CategoryTranslations.AddRange(dbCategorytranslations);
+                questionDbContext.SaveChanges();
+                var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(dbQuestionCategory);
+                result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -316,15 +375,23 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
         {
             try
             {
                 var dbQuestionCategory = mapper.Map<Models.QuestionCategory, Db.QuestionCategory>(QuestionCategory);
+                var dbCategorytranslations = mapper.Map<List<Models.CategoryTranslation>, List<Db.CategoryTranslation>>(QuestionCategory.Categories);
                 questionDbContext.Entry(dbQuestionCategory).State = EntityState.Modified;
-
+                QuestionCategory.Id = dbQuestionCategory.Id;
+                var oldcategories = questionDbContext.CategoryTranslations.Where(a => a.CategoryId == dbQuestionCategory.Id).ToList();
+                if (oldcategories != null)
+                    questionDbContext.CategoryTranslations.RemoveRange(oldcategories);
+                dbCategorytranslations.ForEach(i => i.CategoryId = QuestionCategory.Id);
+                questionDbContext.CategoryTranslations.AddRange(dbCategorytranslations);
                 questionDbContext.SaveChanges();
-                return (true, QuestionCategory, null);
+                var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(dbQuestionCategory);
+                result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -333,18 +400,20 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id)
         {
             try
             {
                 var questioncategory = await questionDbContext.QuestionCategories.Where(x => x.Id == Id).FirstOrDefaultAsync();
                 if (questioncategory != null)
                 {
+                    var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(questioncategory);
+                    result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
                     var question = await questionDbContext.Questions.Where(x => x.Id == Id).ToListAsync();
                     questionDbContext.Questions.RemoveRange(question);
                     questionDbContext.QuestionCategories.Remove(questioncategory);
                     questionDbContext.SaveChanges();
-                    return (true, mapper.Map<Db.QuestionCategory, Models.QuestionCategory>(questioncategory), $"QuestionID {Id} deleted Successfuly");
+                    return (true, result, $"QuestionID {Id} deleted Successfuly");
                 }
                 else
                 {

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/CategoryMockData.cs

@@ -8,42 +8,42 @@ namespace DamageAssesment.Api.Questions.Test
 {
     public class CategoryMockData
     {
-        public static async Task<(bool, IEnumerable<Questions.Models.QuestionCategory>, string)> getOkResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanQuestionCategory>, string)> getOkResponse()
         {
-            IEnumerable<Questions.Models.QuestionCategory> list = new List<Questions.Models.QuestionCategory>();
+            IEnumerable<Questions.Models.MultiLanQuestionCategory> list = new List<Questions.Models.MultiLanQuestionCategory>();
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Questions.Models.QuestionCategory { Id = i, CategoryImage = "img"+i,CategoryName="Category "+i  });
+                list.Append(new Questions.Models.MultiLanQuestionCategory { Id = i, IconLibrary = "img"+i,IconName="Category "+i  });
             }
             return (true, list, null);
         }
 
-        public static async Task<(bool, Questions.Models.QuestionCategory, string)> getOkResponse(int Id)
+        public static async Task<(bool, Questions.Models.MultiLanQuestionCategory, string)> getOkResponse(int Id)
         {
             var Questions = await getOkResponse();
             var Question = Questions.Item2.FirstOrDefault(s => s.Id == Id);
             return (true, Question, null);
         }
 
-        public static async Task<(bool, Questions.Models.QuestionCategory, string)> getBadRequestResponse()
+        public static async Task<(bool, Questions.Models.MultiLanQuestionCategory, string)> getBadRequestResponse()
         {
             return (false, null, "Bad Request");
         }
 
-        public static async Task<(bool, Questions.Models.QuestionCategory, string)> getNotFoundResponse()
+        public static async Task<(bool, Questions.Models.MultiLanQuestionCategory, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Questions.Models.QuestionCategory>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanQuestionCategory>, string)> getNoContentResponse()
         {
-            IEnumerable<Questions.Models.QuestionCategory> list = new List<Questions.Models.QuestionCategory>();
+            IEnumerable<Questions.Models.MultiLanQuestionCategory> list = new List<Questions.Models.MultiLanQuestionCategory>();
             return (false, list, null);
         }
 
         public static async Task<Questions.Models.QuestionCategory> getInputQuestionCategoryData()
         {
-            return new Questions.Models.QuestionCategory { Id = 1, CategoryName = "Category 1",CategoryImage="img 1" };
+            return new Questions.Models.QuestionCategory { Id = 1, IconName = "Category 1",IconLibrary="img 1" };
 
         }
     }

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

@@ -5,13 +5,13 @@ namespace DamageAssesment.Api.Questions.Test
     public class MockData
     {
 
-        public static async Task<(bool, IEnumerable<Questions.Models.Question>, string)> getOkResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanQuestion>, string)> getOkResponse()
         {
-            IEnumerable<Questions.Models.Question> list = new List<Questions.Models.Question>();
+            IEnumerable<Questions.Models.MultiLanQuestion> list = new List<Questions.Models.MultiLanQuestion>();
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Questions.Models.Question { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=i });
+                list.Append(new Questions.Models.MultiLanQuestion { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=i });
             }
             return (true, list, null);
         }
@@ -23,38 +23,38 @@ namespace DamageAssesment.Api.Questions.Test
 
             for (int i = 0; i < 10; i++)
             {
-                List<Models.Question> question = new List<Models.Question>();
-                question.Add(new Models.Question { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = i });
+                List<Models.MultiLanQuestion> question = new List<Models.MultiLanQuestion>();
+                question.Add(new Models.MultiLanQuestion { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = i });
                 list.Append(new Questions.Models.SurveyQuestions
                 {
                     CategoryId = i,
-                    CategoryImage = "img" + i,
-                    CategoryName = "Category " + i,
+                    IconLibrary = "img" + i,
+                    IconName = "Category " + i,
                     Questions = question
                 });
             }
             return (true, list, null);
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getOkResponse(int Id)
+        public static async Task<(bool, Questions.Models.MultiLanQuestion, string)> getOkResponse(int Id)
         {
             var Questions = await getOkResponse();
             var Question = Questions.Item2.FirstOrDefault(s => s.Id == Id);
             return (true, Question, null);
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getBadRequestResponse()
+        public static async Task<(bool, Questions.Models.MultiLanQuestion, string)> getBadRequestResponse()
         {
             return (false, null, "Bad Request");
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getNotFoundResponse()
+        public static async Task<(bool, Questions.Models.MultiLanQuestion, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Questions.Models.Question>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanQuestion>, string)> getNoContentResponse()
         {
-            IEnumerable<Questions.Models.Question> list = new List<Questions.Models.Question>();
+            IEnumerable<Questions.Models.MultiLanQuestion> list = new List<Questions.Models.MultiLanQuestion>();
             return (false, list, null);
         }
         public static async Task<(bool, List<Questions.Models.SurveyQuestions>, string)> getNoSurveyContentResponse()

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

@@ -42,7 +42,7 @@ namespace DamageAssesment.Api.Questions.Test
             mockQuestionService.Setup(service => service.GetQuestionAsync(1,null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionAsync(1,null);
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionByIdAsync(1,null);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -55,7 +55,7 @@ namespace DamageAssesment.Api.Questions.Test
             mockQuestionService.Setup(service => service.GetQuestionAsync(99,null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NotFoundResult)await QuestionProvider.GetQuestionAsync(99,null);
+            var result = (NotFoundResult)await QuestionProvider.GetQuestionByIdAsync(99,null);
             Assert.Equal(404, result.StatusCode);
         }
 
@@ -188,10 +188,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getOkResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync()).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync("en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoriesAsync();
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoriesAsync("en");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -201,10 +201,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getNoContentResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync()).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync("en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NoContentResult)await QuestionProvider.GetQuestionCategoriesAsync();
+            var result = (NoContentResult)await QuestionProvider.GetQuestionCategoriesAsync("en");
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -214,10 +214,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getOkResponse(1);
-            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(1)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(1, "en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoryAsync(1);
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoryAsync(1, "en");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -227,10 +227,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getNotFoundResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(99)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(99, "en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NotFoundResult)await QuestionProvider.GetQuestionCategoryAsync(99);
+            var result = (NotFoundResult)await QuestionProvider.GetQuestionCategoryAsync(99, "en");
             Assert.Equal(404, result.StatusCode);
         }
 

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Controllers/SurveyResponsesController.cs

@@ -118,10 +118,10 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// </summary>
         /// <param name="responseId">The ID of the survey response to be retrieved.</param>
 
-        [HttpGet("SurveyResponse/{responseId}")]
-        public async Task<ActionResult> GetSurveyResponseByIdAsync(int responseId)
+        [HttpGet("SurveyResponse/{Id}")]
+        public async Task<ActionResult> GetSurveyResponseByIdAsync(int Id)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(responseId);
+            var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(Id);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponse);
@@ -180,18 +180,12 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// <summary>
         /// POST request for submitting survey with multiple answers.
         /// </summary>
-        /// <param name="answers">The answers to be submitted for the survey.</param>
+        /// <param name="request">The answers to be submitted for the survey.</param>
 
         [HttpPost("SurveyResponses/Answers")]
-        public async Task<ActionResult> PostSurveyAnswersAsync(AnswerRequest answers)
+        public async Task<ActionResult> PostSurveyAnswersAsync(Request request)
         {
-            /* var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(surveyAnswers);
-             if (result.IsSuccess)
-             {
-                 return Ok(result.SurveyResponse);
-             }
-             return BadRequest(result.ErrorMessage);*/
-            var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(answers);
+            var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(request);
 
             if (result.IsSuccess)
                 return Ok(result.SurveyResponse);

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Db/SurveyResponse.cs

@@ -19,12 +19,15 @@ namespace DamageAssesment.Api.SurveyResponses.Db
         [ForeignKey("Employee")]
         public string EmployeeId { get; set; }
 
-        //public DateTime? CreatedDate { get; set; }
+        public DateTime? CreatedDate { get; set; } = DateTime.Now;
 
-        //[StringLength(50)]
-       // public string ClientDevice { get; set; }
+        [StringLength(50)]
+        public string? ClientDevice { get; set; }
+
+        [StringLength(250)]
+        public string? KeyAnswerResult { get; set; }
+        public double? Longitute { get; set; }
+        public double? Latitude { get; set; }
 
-       // [StringLength(250)]
-        //public string KeyAnswerResult { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Db/SurveyResponseDbContext.cs

@@ -10,5 +10,13 @@ namespace DamageAssesment.Api.SurveyResponses.Db
         {
 
         }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<SurveyResponse>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Interfaces/IHttpUtil.cs

@@ -0,0 +1,9 @@
+using DamageAssesment.Api.SurveyResponses.Models;
+
+namespace DamageAssesment.Api.SurveyResponses.Interfaces
+{
+    public interface IHttpUtil
+    {
+        Task<string> SendAsync(HttpMethod method, string url, string JsonInput);
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Interfaces/ISurveysResponse.cs

@@ -17,7 +17,7 @@ namespace DamageAssesment.Api.SurveyResponses.Interfaces
         Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId);
         Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer);
 
-        Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.AnswerRequest answers);
+        Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Request request);
 
     }
 }

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Models/AnswerRequest.cs

@@ -2,9 +2,9 @@
 {
     public class AnswerRequest
     {
-        public int SurveyId { get; set; }
-        public string LocationId { get; set; }
-        public string EmployeeId { get; set; }
-        public List<QuestionRequest> Answers { get; set; }
+        public int QuestionId { get; set; }
+        public string AnswerText { get; set; }
+        public string Comment { get; set; }
+        public List<FileModel> PostedFiles  { get; set; } = new List<FileModel>();
     }
 }

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Models/Question.cs

@@ -17,7 +17,7 @@ namespace DamageAssesment.Api.SurveyResponses.Models
 
         public bool Key { get; set; }
         public int? SurveyId { get; set; }
-        public string QuestionGroup { get; set; }
+        //public string QuestionGroup { get; set; }
         public int CategoryId { get; set; }
         // public int? Survey_SurveyID { get; set; }
     }

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Models/QuestionRequest.cs

@@ -1,10 +0,0 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
-{
-    public class QuestionRequest
-    {
-        public int QuestionId { get; set; }
-        public string AnswerText { get; set; }
-        public string Comment { get; set; }
-        public List<FileModel> PostedFiles  { get; set; } = new List<FileModel>();
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Models/Request.cs

@@ -0,0 +1,10 @@
+namespace DamageAssesment.Api.SurveyResponses.Models
+{
+    public class Request
+    {
+        public int SurveyId { get; set; }
+        public string LocationId { get; set; }
+        public string EmployeeId { get; set; }
+        public List<AnswerRequest> Answers { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Models/SurveyResponse.cs

@@ -5,24 +5,14 @@ namespace DamageAssesment.Api.SurveyResponses.Models
 {
     public class SurveyResponse
     {
-        [Key]
         public int Id { get; set; }
-
-        [ForeignKey("Survey")]
         public int SurveyId { get; set; }
-
-        [ForeignKey("Location")]
         public string LocationId { get; set; }
-
-        [ForeignKey("Employee")]
         public string EmployeeId { get; set; }
-
-        //public DateTime? CreatedDate { get; set; }
-
-        //[StringLength(50)]
-        //public string ClientDevice { get; set; }
-
-        //[StringLength(250)]
-        //public string KeyAnswerResult { get; set; }
+        public DateTime? CreatedDate { get; set; }
+        public string? ClientDevice { get; set; }
+        public string? KeyAnswerResult { get; set; }
+        public double? Longitute { get; set; }
+        public double? Latitude { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Program.cs

@@ -1,7 +1,7 @@
 using DamageAssesment.Api.SurveyResponses.Db;
 using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Services;
 using DamageAssesment.Api.SurveyResponses.Providers;
-using Microsoft.AspNetCore.DataProtection.XmlEncryption;
 using Microsoft.EntityFrameworkCore;
 using Polly;
 using System.Reflection;
@@ -19,35 +19,18 @@ builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 
 builder.Services.AddScoped<ISurveysResponse, SurveyResponsesProvider>();
-//builder.Services.AddScoped<ILogger, Logger>();
+builder.Services.AddScoped<IAnswerServiceProvider, AnswerServiceProvider>();
+builder.Services.AddScoped<ILocationServiceProvider, LocationServiceProvider>();
+builder.Services.AddScoped<IRegionServiceProvider, RegionServiceProvider>();
+builder.Services.AddScoped<IQuestionServiceProvider, QuestionServiceProvider>();
+builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
+builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>();
+builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>();
 
-builder.Services.AddHttpClient<IAnswerServiceProvider, AnswerServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker) ));
-
-builder.Services.AddHttpClient<ILocationServiceProvider, LocationServiceProvider>().
+builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
     AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
     AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
 
-builder.Services.AddHttpClient<IRegionServiceProvider, RegionServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
-
-builder.Services.AddHttpClient<IQuestionServiceProvider, QuestionServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
-
-builder.Services.AddHttpClient<IEmployeeServiceProvider, EmployeeServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
-
-builder.Services.AddHttpClient<IAttachmentServiceProvider, AttachmentServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
-
-builder.Services.AddHttpClient<ISurveyServiceProvider, SurveyServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
 
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 builder.Services.AddEndpointsApiExplorer();

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Providers/AnswerServiceProvider.cs

@@ -1,87 +0,0 @@
-using DamageAssesment.Api.SurveyResponses.Bases;
-using DamageAssesment.Api.SurveyResponses.Db;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
-using Newtonsoft.Json;
-using System.Data.Common;
-using System.Security.Cryptography;
-using System.Text.Json.Nodes;
-using System.Text;
-
-namespace DamageAssesment.Api.SurveyResponses.Providers
-{
-    public class AnswerServiceProvider : ServiceProviderBase, IAnswerServiceProvider
-    {
-
-        public AnswerServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<AnswerServiceProvider> logger, IRegionServiceProvider regionServiceProvider, ILocationServiceProvider locationServiceProvider) : base(configuration, httpClient, logger, "/api/Answers", configuration.GetValue<string>("EndPointSettings:AnswerUrlBase"))
-        {
-        }
-        public async Task<List<Answer>> getAnswersAsync()
-        {
-            try
-            {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var response = await httpClient.GetAsync(ressource);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var answers = JsonConvert.DeserializeObject<List<Answer>>(responseString);
-
-                if (answers == null || !answers.Any())
-                    return null;
-                else return answers;
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.getAnswersAsync()");
-                return null;
-            }
-        }
-
-        public async Task<List<Answer>> GetAnswersByResponseIdAsync(int responseId)
-        {
-            try
-            {
-                httpClient.BaseAddress = new Uri(urlBase);
-                
-                var response = await httpClient.GetAsync("/api/AnswersByResponse/"+ responseId);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var answers = JsonConvert.DeserializeObject<List<Answer>>(responseString);
-
-                if (answers == null || !answers.Any())
-                    return null;
-                else return answers;
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.GetAnswersByResponseId()");
-                return null;
-            }
-        }
-
-        public async Task<Answer> PostAnswersAsync(Answer answer)
-        {
-            try
-            {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var jsonObject = JsonConvert.SerializeObject(answer);
-                var content = new StringContent(jsonObject.ToString(), Encoding.UTF8, "application/json");
-                var response = await httpClient.PostAsync(ressource,content);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var answers = JsonConvert.DeserializeObject<Answer>(responseString);
-
-                if (answers == null) {
-                    logger?.LogError($"Answer cannot be added - Ref: AnswerServiceProvider.PostAnswersAsync()");
-                    return null;
-                }       
-                else return answers;
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.PostAnswersAsync()");
-                return null;
-            }
-        }
-    }
-}

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

@@ -3,9 +3,6 @@ using DamageAssesment.Api.SurveyResponses.Db;
 using DamageAssesment.Api.SurveyResponses.Interfaces;
 using DamageAssesment.Api.SurveyResponses.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Internal;
-using System.Diagnostics;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
 
 namespace DamageAssesment.Api.SurveyResponses.Providers
 {
@@ -34,21 +31,19 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             this.questionServiceProvider = questionServiceProvider;
             this.surveyServiceProvider = surveyServiceProvider;
             this.mapper = mapper;
-
-            seedData();
+            //seedData();
         }
 
         private void seedData()
         {
             if (!surveyResponseDbContext.SurveyResponses.Any())
             {
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 1, SurveyId = 1, EmployeeId = "Emp1", LocationId = "Loc1" });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 2, SurveyId = 1, EmployeeId = "Emp2", LocationId = "Loc2" });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = "Emp4", LocationId = "Loc1" });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = "Emp1", LocationId = "Loc2" });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 5, SurveyId = 1, EmployeeId = "Emp3", LocationId = "Loc3" });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = "Emp4", LocationId = "Loc2" });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 7, SurveyId = 1, EmployeeId = "Emp4", LocationId = "Loc3" });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 1, SurveyId = 1, EmployeeId = "Emp1", LocationId = "Loc1", ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 2, SurveyId = 1, EmployeeId = "Emp2", LocationId = "Loc2", ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = "Emp4", LocationId = "Loc1", ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = "Emp1", LocationId = "Loc2", ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = "Emp4", LocationId = "Loc2", ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 7, SurveyId = 1, EmployeeId = "Emp4", LocationId = "Loc3", ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "", CreatedDate = DateTime.Now });
                 surveyResponseDbContext.SaveChanges();
             }
         }
@@ -251,7 +246,6 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                     answers = new List<Models.SurveyResponse>();
                     return (true, answers, "Empty object returned");
                 }
-
             }
             catch (Exception ex)
             {
@@ -266,16 +260,16 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             {
                 if (surveyResponse != null)
                 {
-                    var surveyResponses = await surveyResponseDbContext.SurveyResponses.ToListAsync();
-                    surveyResponse.Id = surveyResponses.Count + 1;
-                    surveyResponseDbContext.SurveyResponses.Add(mapper.Map<Models.SurveyResponse, Db.SurveyResponse>(surveyResponse));
-                    surveyResponseDbContext.SaveChanges();
+                    var _surveyResponse = mapper.Map<Models.SurveyResponse, Db.SurveyResponse>(surveyResponse);
+                    surveyResponseDbContext.SurveyResponses.Add(_surveyResponse);
+                    await surveyResponseDbContext.SaveChangesAsync();
+                    surveyResponse.Id = _surveyResponse.Id;
                     return (true, surveyResponse, "Request Successful");
                 }
                 else
                 {
-                    logger?.LogInformation($"SurveyResponseID={surveyResponse.Id} cannot be added");
-                    return (false, null, "Survey cannot be added");
+                    logger?.LogInformation($"SurveyResponse cannot be added");
+                    return (false, null, "SurveyResponse cannot be added");
                 }
             }
             catch (Exception ex)
@@ -299,7 +293,11 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                         _SurveyResponse.SurveyId = SurveyResponse.SurveyId;
                         _SurveyResponse.EmployeeId = SurveyResponse.EmployeeId;
                         _SurveyResponse.LocationId = SurveyResponse.LocationId;
-                        surveyResponseDbContext.SaveChanges();
+                        _SurveyResponse.ClientDevice = SurveyResponse.ClientDevice;
+                        _SurveyResponse.KeyAnswerResult = SurveyResponse.KeyAnswerResult;
+                        _SurveyResponse.Longitute = SurveyResponse.Longitute;
+                        _SurveyResponse.Latitude = SurveyResponse.Latitude;
+                        await surveyResponseDbContext.SaveChangesAsync();
                         return (true, mapper.Map<Db.SurveyResponse, Models.SurveyResponse>(_SurveyResponse), "Successful");
                     }
                     else
@@ -331,7 +329,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                 if (_SurveyResponse != null)
                 {
                     surveyResponseDbContext.Remove(_SurveyResponse);
-                    surveyResponseDbContext.SaveChanges();
+                    await surveyResponseDbContext.SaveChangesAsync();
                     return (true, mapper.Map<Db.SurveyResponse, Models.SurveyResponse>(_SurveyResponse), "Successful");
                 }
                 else
@@ -339,7 +337,6 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                     logger?.LogInformation($"SurveyReponseId = {Id} Not found");
                     return (false, null, "Not Found");
                 }
-
             }
             catch (Exception ex)
             {
@@ -434,22 +431,22 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                var surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.Id == surveyResponse.Id).ToListAsync();
-                //var surveyResponse = surveyResonses.SingleOrDefault();
                 var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId);
                 var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id);
                 var allQuestions = await questionServiceProvider.getQuestionsAsync();
-                var questions = allQuestions.Where(s=> s.SurveyId == surveyResponse.Id);
+                var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
-
-                var result = from r in surveyResonses
-                             select new
+                var result = new
                 {
-                                 r.Id,
-                                 r.SurveyId,
-                                 r.LocationId,
-                                 r.EmployeeId,
+                    surveyResponse.Id,
+                    surveyResponse.SurveyId,
+                    surveyResponse.LocationId,
+                    surveyResponse.EmployeeId,
+                    surveyResponse.ClientDevice,
+                    surveyResponse.KeyAnswerResult,
+                    surveyResponse.Longitute,
+                    surveyResponse.Latitude,
                     Employee = employee,
                     answers = from ans in answers
                               select new
@@ -458,11 +455,11 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                                   ans.Id,
                                   ans.AnswerText,
                                   ans.Comment,
-                                               Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.QuestionGroup, q.Questions }).SingleOrDefault(),
+                                  Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Questions }).SingleOrDefault(),
                                   Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
                               }
                 };
-                return result.SingleOrDefault();
+                return result;
             }
             catch (Exception ex)
             {
@@ -494,6 +491,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                                  r.SurveyId,
                                  r.LocationId,
                                  r.EmployeeId,
+                                 r.ClientDevice,
+                                 r.KeyAnswerResult,
+                                 r.Longitute,
+                                 r.Latitude,
                                  Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
@@ -503,7 +504,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                                                ans.QuestionId,
                                                ans.AnswerText,
                                                ans.Comment,
-                                               Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.QuestionGroup, q.Questions }).SingleOrDefault(),
+                                               Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Questions }).SingleOrDefault(),
                                                Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
 
                                            }
@@ -530,6 +531,8 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                 var questions = await questionServiceProvider.getQuestionsAsync();
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
+
+
                 var result = from r in surveyResonses
                              select new
                              {
@@ -537,6 +540,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                                  r.SurveyId,
                                  r.LocationId,
                                  r.EmployeeId,
+                                 r.ClientDevice,
+                                 r.KeyAnswerResult,
+                                 r.Longitute,
+                                 r.Latitude,
                                  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
@@ -546,7 +553,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                                                ans.QuestionId,
                                                ans.AnswerText,
                                                ans.Comment,
-                                               Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.QuestionGroup, q.Questions }).SingleOrDefault(),
+                                               Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Questions }).SingleOrDefault(),
                                                Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
                                            }
                              };
@@ -640,6 +647,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                                  r.SurveyId,
                                  r.LocationId,
                                  r.EmployeeId,
+                                 r.ClientDevice,
+                                 r.KeyAnswerResult,
+                                 r.Longitute,
+                                 r.Latitude,
                                  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
@@ -650,7 +661,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                                                ans.Id,
                                                ans.AnswerText,
                                                ans.Comment,
-                                               Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.QuestionGroup, q.Questions }).SingleOrDefault(),
+                                               Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Questions }).SingleOrDefault(),
                                                Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
                                            }
                              };
@@ -670,8 +681,6 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             try
             {
                 var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync();
-                //var questions = await questionServiceProvider.getQuestionsAsync();
-              
                 var answers = await answerServiceProvider.getAnswersAsync();
                 var employees = await employeeServiceProvider.getEmployeesAsync();
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();
@@ -683,6 +692,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                                  r.SurveyId,
                                  r.LocationId,
                                  r.EmployeeId,
+                                 r.ClientDevice,
+                                 r.KeyAnswerResult,
+                                 r.Longitute,
+                                 r.Latitude,
                                  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
@@ -709,67 +722,50 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         }
 
 
-        bool ProcessAnswers(QuestionRequest questionRequest, int surveyResponseId)
+        async Task<bool> ProcessAnswers(AnswerRequest answerRequest, int surveyResponseId)
         {
-            if (questionRequest != null)
+            if (answerRequest != null)
             {
-                var answer = answerServiceProvider.PostAnswersAsync(new Answer {QuestionId = questionRequest.QuestionId, AnswerText = questionRequest.AnswerText, Comment = questionRequest.Comment, SurveyResponseId = surveyResponseId });
+                var answer = await answerServiceProvider.PostAnswersAsync(new Models.Answer { QuestionId = answerRequest.QuestionId, AnswerText = answerRequest.AnswerText, Comment = answerRequest.Comment, SurveyResponseId = surveyResponseId });
                 if (answer != null)
                 {
                     List<AnswerInfo> listAnswerInfo = new List<AnswerInfo>();
-                    listAnswerInfo.Add(new AnswerInfo { AnswerId = answer.Id, postedFiles = questionRequest.PostedFiles });
+                    listAnswerInfo.Add(new AnswerInfo { AnswerId = answer.Id, postedFiles = answerRequest.PostedFiles });
                     var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo });
 
-                    string message = $"Answer for question {questionRequest.QuestionId} saved to the database";
+                    string message = $"Answer for question {answerRequest.QuestionId} saved to the database";
                     logger?.LogInformation(message);
                     return (true);
                 }
                 else
                 {
-                    string message = $"Answer for question {questionRequest.QuestionId} cannot be saved to the database";
+                    string message = $"Answer for question {answerRequest.QuestionId} cannot be saved to the database";
                     logger?.LogInformation(message);
                     return (false);
                 }
             }
             else
             {
-                var message = $"Answer for question {questionRequest.QuestionId} cannot be saved to the database - questionRequest object is null";
+                var message = $"Answer for question {answerRequest.QuestionId} cannot be saved to the database - answerRequest object is null";
                 logger?.LogInformation(message);
                 return (false);
             }
         }
 
 
-        public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.AnswerRequest answers)
+        public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.Request request)
         {
             try
             {
-                if (answers != null)
+                if (request != null)
                 {
-                    var response = await PostSurveyResponseAsync(new Models.SurveyResponse { Id = 0, SurveyId = answers.SurveyId, EmployeeId = answers.EmployeeId, LocationId = answers.LocationId });
+                    var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId });
 
                     if (response.IsSuccess)
                     {
                         var surveyResponse = response.SurveyResponse;
-
-                        var answerTasks = new List<Task>(); //new List<string>();
-
-                        //var tasks = answers.Answers.Select(x =>  ProcessAnswers(x,surveyResponse.SurveyResponseID));
-                        foreach (QuestionRequest ans in answers.Answers)
-                        {
-                            ProcessAnswers(ans, surveyResponse.Id);
-                            //var stopwatch = new Stopwatch();
-                            //stopwatch.Start();
-                            // var task = Task.Run(() => ProcessAnswers(ans, surveyResponse.Id));
-
-                            //var task = await ProcessAnswers(ans, surveyResponse.Id);
-                            //answerTasks.Add(task);
-
-
-                            //stopwatch.Stop();
-                            //answerTasks.Add(ProcessAnswers(ans, surveyResponse.Id));
-                        }
-                        //await Task.WhenAll(answerTasks);
+                        var tasks = request.Answers.Select(x => ProcessAnswers(x, surveyResponse.Id));
+                        await Task.WhenAll(tasks);
                         return (true, surveyResponse, null);
                     }
                     else

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Services/AnswerServiceProvider.cs

@@ -0,0 +1,74 @@
+using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Models;
+using Newtonsoft.Json;
+
+
+namespace DamageAssesment.Api.SurveyResponses.Services
+{
+    public class AnswerServiceProvider : ServiceProviderBase, IAnswerServiceProvider
+    {
+        public AnswerServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<AnswerServiceProvider> logger) : base(configuration, httpUtil, logger, "/api/Answers", configuration.GetValue<string>("EndPointSettings:AnswerUrlBase"))
+        {
+        }
+        public async Task<List<Answer>> getAnswersAsync()
+        {
+            try
+            {
+                var url = urlBase + ressource;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var answers = JsonConvert.DeserializeObject<List<Answer>>(responseJsonString);
+
+                if (answers == null || !answers.Any())
+                    return new List<Answer>();
+                else return answers;
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.getAnswersAsync()");
+                return new List<Answer>();
+            }
+        }
+
+        public async Task<List<Answer>> GetAnswersByResponseIdAsync(int responseId)
+        {
+            try
+            {
+                var url = urlBase + "/api/AnswersByResponse/" + responseId;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var answers = JsonConvert.DeserializeObject<List<Answer>>(responseJsonString);
+
+                if (answers == null || !answers.Any())
+                    return new List<Answer>();
+                else return answers;
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.GetAnswersByResponseId()");
+                return new List<Answer>();
+            }
+        }
+
+        public async Task<Answer> PostAnswersAsync(Answer answer)
+        {
+            try
+            {
+                var url = urlBase + ressource;
+                var requestJsonString = JsonConvert.SerializeObject(answer);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString);
+                var answers = JsonConvert.DeserializeObject<Answer>(responseJsonString);
+
+                if (answers == null)
+                {
+                    logger?.LogError($"Answers cannot be added - Ref: AnswerServiceProvider.PostAnswersAsync()");
+                    return null;
+                }
+                else return answers;
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError($"Exception Found : {ex.Message} - Ref: AnswerServiceProvider.PostAnswersAsync()");
+                return null;
+            }
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Services/AttachmentServiceProvider.cs

@@ -1,17 +1,12 @@
-using DamageAssesment.Api.SurveyResponses.Bases;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
 using DamageAssesment.Api.SurveyResponses.Models;
-using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using System.Net.Http;
-using System.Runtime.Intrinsics.Arm;
-using System.Text;
 
-namespace DamageAssesment.Api.SurveyResponses.Providers
+namespace DamageAssesment.Api.SurveyResponses.Services
 {
     public class AttachmentServiceProvider : ServiceProviderBase, IAttachmentServiceProvider
     {
-        public AttachmentServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<AttachmentServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Attachments", configuration.GetValue<string>("EndPointSettings:AttachmentUrlBase"))
+        public AttachmentServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<AttachmentServiceProvider> logger) : base(configuration, httpUtil, logger, "/api/Attachments", configuration.GetValue<string>("EndPointSettings:AttachmentUrlBase"))
         {
         }
 
@@ -19,20 +14,18 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var response = await httpClient.GetAsync(ressource);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var attachments = JsonConvert.DeserializeObject<List<Attachment>>(responseString);
+                var url = urlBase + ressource;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var attachments = JsonConvert.DeserializeObject<List<Attachment>>(responseJsonString);
 
                 if (attachments == null || !attachments.Any())
-                    return null;
+                    return new List<Attachment>();
                 else return attachments;
             }
             catch (Exception ex)
             {
                 logger?.LogError($"Exception Found : {ex.Message} - Ref: AttachmentServiceProvider.getAttachmentsAsync()");
-                return null;
+                return new List<Attachment>();
             }
         }
 
@@ -40,13 +33,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var jsonObject = JsonConvert.SerializeObject(attachmentInfo);
-                var content = new StringContent(jsonObject.ToString(), Encoding.UTF8, "application/json");
-                var response = await httpClient.PostAsync(ressource, content);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var attachments = JsonConvert.DeserializeObject<IEnumerable<Attachment>>(responseString);
+                var url = urlBase + ressource;
+                var requestJsonString = JsonConvert.SerializeObject(attachmentInfo);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString);
+                var attachments = JsonConvert.DeserializeObject<IEnumerable<Attachment>>(responseJsonString);
 
                 if (attachments == null)
                 {

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Services/EmployeeServiceProvider.cs

@@ -1,14 +1,12 @@
-using DamageAssesment.Api.SurveyResponses.Bases;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
 using DamageAssesment.Api.SurveyResponses.Models;
 using Newtonsoft.Json;
-using System.Reflection;
 
-namespace DamageAssesment.Api.SurveyResponses.Providers
+namespace DamageAssesment.Api.SurveyResponses.Services
 {
     public class EmployeeServiceProvider :ServiceProviderBase, IEmployeeServiceProvider
     {
-        public EmployeeServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Employees", configuration.GetValue<string>("EndPointSettings:EmployeeUrlBase"))
+        public EmployeeServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpUtil, logger, "/api/Employees", configuration.GetValue<string>("EndPointSettings:EmployeeUrlBase"))
         {
         }
 
@@ -16,33 +14,28 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var response = await httpClient.GetAsync(ressource);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var employees = JsonConvert.DeserializeObject<List<Employee>>(responseString);
+                var url = urlBase + ressource;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString);
 
                 if (employees == null || !employees.Any())
-                    return null;
+                    return new List<Employee>();
                 else return employees;
             }
             catch (Exception ex)
             {
                 logger?.LogError($"Exception Found : {ex.Message} - Ref: EmployeeServiceProvider.getEmployeesAsync()");
-                return null;
+                return new List<Employee>();
             }
         }
 
-        public async Task<Employee> getEmployeeAsync(string employeeID)
+        public async Task<Employee> getEmployeeAsync(string employeeId)
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                //ressource = ressource + "/" + employeeID;
-                var response = await httpClient.GetAsync("/api/Employees/"+ employeeID);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var employee = JsonConvert.DeserializeObject<Employee>(responseString);
+                var url = urlBase + "/api/Employees/" + employeeId;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString);
 
                 if (employee == null )
                     return null;

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Services/HttpUtil.cs

@@ -0,0 +1,43 @@
+using DamageAssesment.Api.SurveyResponses.Interfaces;
+using System.Net.Http.Headers;
+using System.Text;
+
+namespace DamageAssesment.Api.SurveyResponses.Services
+{
+    public class HttpUtil : IHttpUtil
+    {
+        private readonly HttpClient httpClient;
+        private readonly ILogger<HttpUtil> logger;
+
+        public HttpUtil(HttpClient httpClient, ILogger<HttpUtil> logger)
+        {
+            this.httpClient = httpClient;
+            this.logger = logger;
+        }
+        public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput)
+        {
+            try
+            {
+                var request = new HttpRequestMessage(method, url);
+                request.Headers.Accept.Clear();
+                request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+                //request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
+                if (method == HttpMethod.Post)
+                {
+                    request.Content = new StringContent(JsonInput, Encoding.UTF8, "application/json");
+                }
+
+                var response = await httpClient.SendAsync(request, CancellationToken.None);
+                response.EnsureSuccessStatusCode();
+                var responseString = await response.Content.ReadAsStringAsync();
+                return responseString;
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError($"Exception Message : {ex.Message} - Ref: HttpUtil.SendAsync()");
+                return null;
+            }
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Services/LocationServiceProvider.cs

@@ -1,13 +1,12 @@
-using DamageAssesment.Api.SurveyResponses.Bases;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
 using DamageAssesment.Api.SurveyResponses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Providers
+namespace DamageAssesment.Api.SurveyResponses.Services
 {
     public class LocationServiceProvider :ServiceProviderBase, ILocationServiceProvider
     {
-        public LocationServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<LocationServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Locations", configuration.GetValue<string>("EndPointSettings:LocationUrlBase"))
+        public LocationServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<LocationServiceProvider> logger) : base(configuration, httpUtil, logger, "/api/Locations", configuration.GetValue<string>("EndPointSettings:LocationUrlBase"))
         {
         }
 
@@ -15,20 +14,18 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var response = await httpClient.GetAsync(ressource);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var locations = JsonConvert.DeserializeObject<List<Location>>(responseString);
+                var url = urlBase + ressource;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var locations = JsonConvert.DeserializeObject<List<Location>>(responseJsonString);
 
                 if (locations == null || !locations.Any())
-                    return null;
+                    return new List<Location>();
                 else return locations;
             }
             catch (Exception ex)
             {
                 logger?.LogError($"Exception Found : {ex.Message} - Ref: LocationServiceProvider.getLocationsAsync()");
-                return null;
+                return new List<Location>();
             }
         }
     }

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Services/QuestionServiceProvider.cs

@@ -1,15 +1,12 @@
-using DamageAssesment.Api.SurveyResponses.Bases;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
 using DamageAssesment.Api.SurveyResponses.Models;
 using Newtonsoft.Json;
 
-
-
-namespace DamageAssesment.Api.SurveyResponses.Providers
+namespace DamageAssesment.Api.SurveyResponses.Services
 {
     public class QuestionServiceProvider : ServiceProviderBase, IQuestionServiceProvider
     {
-        public QuestionServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<QuestionServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Questions", configuration.GetValue<string>("EndPointSettings:QuestionUrlBase"))
+        public QuestionServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<QuestionServiceProvider> logger) : base(configuration, httpUtil, logger, "/api/Questions", configuration.GetValue<string>("EndPointSettings:QuestionUrlBase"))
         {
         }
 
@@ -17,20 +14,18 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var response = await httpClient.GetAsync(ressource);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var questions = JsonConvert.DeserializeObject<List<Question>>(responseString);
+                var url = urlBase + ressource;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var questions = JsonConvert.DeserializeObject<List<Question>>(responseJsonString);
 
                 if (questions == null || !questions.Any())
-                    return null;
+                    return new List<Question>();
                 else return questions;
             }
             catch (Exception ex)
             {
                 logger?.LogError($"Exception Found : {ex.Message} - Ref: QuestionServiceProvider.getQuestionsAsync()");
-                return null;
+                return new List<Question>();
             }
         }
 
@@ -38,20 +33,18 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var response = await httpClient.GetAsync("/api/GetSurveyQuestions/" + surveyId);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var questions = JsonConvert.DeserializeObject<List<SurveyQuestions>>(responseString);
+                var url = urlBase + "/api/GetSurveyQuestions/" + surveyId;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var questions = JsonConvert.DeserializeObject<List<SurveyQuestions>>(responseJsonString);
 
                 if (questions == null || !questions.Any())
-                    return null;
+                    return new List<SurveyQuestions>() ;
                 else return questions;
             }
             catch (Exception ex)
             {
                 logger?.LogError($"Exception Found : {ex.Message} - Ref: QuestionServiceProvider.getSurveyQuestionsAsync()");
-                return null;
+                return new List<SurveyQuestions>();
             }
         }
 
@@ -60,11 +53,9 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var response = await httpClient.GetAsync("/api/Questions/" + questionId);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var question = JsonConvert.DeserializeObject<Question>(responseString);
+                var url = urlBase + "/api/Questions/" + questionId;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var question = JsonConvert.DeserializeObject<Question>(responseJsonString);
 
                 if (question == null)
                     return null;

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Services/RegionServiceProvider.cs

@@ -1,33 +1,30 @@
-using DamageAssesment.Api.SurveyResponses.Bases;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
 using DamageAssesment.Api.SurveyResponses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Providers
+namespace DamageAssesment.Api.SurveyResponses.Services
 {
     public class RegionServiceProvider : ServiceProviderBase, IRegionServiceProvider
     {
-        public RegionServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<RegionServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Regions", configuration.GetValue<string>("EndPointSettings:LocationUrlBase"))
+        public RegionServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<RegionServiceProvider> logger) : base(configuration, httpUtil, logger, "/api/Regions", configuration.GetValue<string>("EndPointSettings:LocationUrlBase"))
         {
         }
         public async Task<List<Region>> getRegionsAsync()
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var response = await httpClient.GetAsync(ressource);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var regions = JsonConvert.DeserializeObject<List<Region>>(responseString);
+                var url = urlBase + ressource;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var regions = JsonConvert.DeserializeObject<List<Region>>(responseJsonString);
 
                 if (regions == null || !regions.Any())
-                    return null;
+                    return new List<Region>();
                 else return regions;
             }
             catch (Exception ex)
             {
                 logger?.LogError($"Exception Found : {ex.Message} - Ref: RegionServiceProvider.getRegionsAsync()");
-                return null;
+                return new List<Region>();
             }
         }
     }

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Services/ServiceProviderBase.cs

@@ -1,18 +1,20 @@
-namespace DamageAssesment.Api.SurveyResponses.Bases
+using DamageAssesment.Api.SurveyResponses.Interfaces;
+
+namespace DamageAssesment.Api.SurveyResponses.Services
 {
     public class ServiceProviderBase
     {
         protected readonly IConfiguration configuration;
-        protected readonly HttpClient httpClient;
-        protected private readonly ILogger<ServiceProviderBase> logger;
+        protected readonly IHttpUtil httpUtil;
+        protected readonly ILogger<ServiceProviderBase> logger;
         protected string ressource;
         protected string urlBase;
         
 
-        public ServiceProviderBase(IConfiguration configuration, HttpClient httpClient, ILogger<ServiceProviderBase> logger, string ressource, string urlBase)
+        public ServiceProviderBase(IConfiguration configuration, IHttpUtil httpUtil, ILogger<ServiceProviderBase> logger, string ressource, string urlBase)
         {
             this.configuration = configuration;
-            this.httpClient = httpClient;
+            this.httpUtil = httpUtil;
             this.logger = logger;
             this.ressource = ressource;
             this.urlBase = urlBase;

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Services/SurveyServiceProvider.cs

@@ -1,14 +1,12 @@
-using DamageAssesment.Api.SurveyResponses.Bases;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
 using DamageAssesment.Api.SurveyResponses.Models;
 using Newtonsoft.Json;
-using System.Reflection;
 
-namespace DamageAssesment.Api.SurveyResponses.Providers
+namespace DamageAssesment.Api.SurveyResponses.Services
 {
     public class SurveyServiceProvider :ServiceProviderBase, ISurveyServiceProvider
     {
-        public SurveyServiceProvider(IConfiguration configuration, HttpClient httpClient, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpClient, logger, "/api/Surveys", configuration.GetValue<string>("EndPointSettings:SurveyUrlBase"))
+        public SurveyServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpUtil, logger, "/api/Surveys", configuration.GetValue<string>("EndPointSettings:SurveyUrlBase"))
         {
         }
 
@@ -16,20 +14,19 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var response = await httpClient.GetAsync(ressource);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var surveys = JsonConvert.DeserializeObject<List<Survey>>(responseString);
+
+                var url = urlBase + ressource;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var surveys = JsonConvert.DeserializeObject<List<Survey>>(responseJsonString);
 
                 if (surveys == null || !surveys.Any())
-                    return null;
+                    return new List<Survey>();
                 else return surveys;
             }
             catch (Exception ex)
             {
                 logger?.LogError($"Exception Found : {ex.Message} - Ref: SurveyServiceProvider.getSurveysAsync()");
-                return null;
+                return new List<Survey>();
             }
         }
 
@@ -37,11 +34,9 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                httpClient.BaseAddress = new Uri(urlBase);
-                var response = await httpClient.GetAsync(ressource+"/"+ surveyId);
-                response.EnsureSuccessStatusCode();
-                var responseString = await response.Content.ReadAsStringAsync();
-                var survey = JsonConvert.DeserializeObject<Survey>(responseString);
+                var url = urlBase + ressource + "/" + surveyId;
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var survey = JsonConvert.DeserializeObject<Survey>(responseJsonString);
 
                 if (survey == null )
                     return null;
@@ -53,7 +48,5 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                 return null;
             }
         }
-
-
     }
 }

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

@@ -9,37 +9,37 @@ namespace DamageAssesment.Api.Survey.Test
 {
     public class MockData
     {
-        public static async Task<(bool, IEnumerable<Surveys.Models.Survey>, string)> getOkResponse()
+        public static async Task<(bool, IEnumerable<Surveys.Models.MultiLanSurvey>, string)> getOkResponse()
         {
-            IEnumerable<Surveys.Models.Survey> list = new List<Surveys.Models.Survey>();
+            IEnumerable<Surveys.Models.MultiLanSurvey> list = new List<Surveys.Models.MultiLanSurvey>();
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Surveys.Models.Survey { Id = i, /*Title = "Survey Title - " + i */});
+                list.Append(new Surveys.Models.MultiLanSurvey { Id = i, /*Title = "Survey Title - " + i */});
             }
             return (true, list, null);
         }
 
 
-        public static async Task<(bool, Surveys.Models.Survey, string)> getOkResponse( int Id)
+        public static async Task<(bool, Surveys.Models.MultiLanSurvey, string)> getOkResponse( int Id)
         {
             var surveys = await getOkResponse();
             var survey = surveys.Item2.FirstOrDefault(s => s.Id == Id);
             return (true, survey, null);
         }
 
-        public static async Task<(bool, Surveys.Models.Survey, string)> getBadRequestResponse()
+        public static async Task<(bool, Surveys.Models.MultiLanSurvey, string)> getBadRequestResponse()
         {
             return (false, null,"Bad Request");
         }
 
-        public static async Task<(bool, Surveys.Models.Survey, string)> getNotFoundResponse()
+        public static async Task<(bool, Surveys.Models.MultiLanSurvey, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Surveys.Models.Survey>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Surveys.Models.MultiLanSurvey>, string)> getNoContentResponse()
         {
-            IEnumerable<Surveys.Models.Survey> list = new List<Surveys.Models.Survey>();
+            IEnumerable<Surveys.Models.MultiLanSurvey> list = new List<Surveys.Models.MultiLanSurvey>();
             return (false, list, null);
         }
 

DamageAssesmentApi/DamageAssesment.Api.Surveys/Controllers/SurveysController.cs

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Surveys.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class SurveysController : ControllerBase
     {
@@ -18,11 +17,11 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// </summary>
 
         [Route("Surveys")]
-        [Route("{Language}/Surveys")]
+        [Route("Surveys/{language:alpha}")]
         [HttpGet]
-        public async Task<ActionResult> GetSurveysAsync(string? Language)
+        public async Task<ActionResult> GetSurveysAsync(string? language)
         {
-            var result = await this.surveyProvider.GetSurveysAsync(Language);
+            var result = await this.surveyProvider.GetSurveysAsync(language);
             if (result.IsSuccess)
             {
                 return Ok(result.Surveys);
@@ -33,12 +32,12 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// GET request for retrieving surveys by ID.
         /// </summary>
-        [Route("Surveys/{Id}")]
-        [Route("{Language}/Surveys/{Id}")]
+        [Route("Surveys/{id:int}")]
+        [Route("Surveys/{id:int}/{language:alpha}")]
         [HttpGet]
-        public async Task<ActionResult> GetSurveysAsync(int Id, string? Language)
+        public async Task<ActionResult> GetSurveysAsync(int id, string? language)
         {
-            var result = await this.surveyProvider.GetSurveysAsync(Id, Language);
+            var result = await this.surveyProvider.GetSurveysAsync(id, language);
             if (result.IsSuccess)
             {
                 return Ok(result.Surveys);
@@ -64,10 +63,10 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// </summary>
 
 
-        [HttpPut("Surveys/{Id}")]
-        public async Task<ActionResult> PutSurveysAsync(int Id, Models.Survey survey)
+        [HttpPut("Surveys/{id}")]
+        public async Task<ActionResult> PutSurveysAsync(int id, Models.Survey survey)
         {
-            var result = await this.surveyProvider.PutSurveyAsync(Id, survey);
+            var result = await this.surveyProvider.PutSurveyAsync(id, survey);
             if (result.IsSuccess)
             {
                 return Ok(result.Survey);
@@ -81,10 +80,10 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// DELETE request for deleting a survey by ID.
         /// </summary>
-        [HttpDelete("Surveys/{Id}")]
-        public async Task<ActionResult> DeleteSurveysAsync(int Id)
+        [HttpDelete("Surveys/{id}")]
+        public async Task<ActionResult> DeleteSurveysAsync(int id)
         {
-            var result = await this.surveyProvider.DeleteSurveyAsync(Id);
+            var result = await this.surveyProvider.DeleteSurveyAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Survey);

DamageAssesmentApi/DamageAssesment.Api.Surveys/Interfaces/ISurveyProvider.cs

@@ -2,11 +2,12 @@
 {
     public interface ISurveyProvider
     {
-       Task<(bool IsSuccess, IEnumerable< Models.Survey> Surveys, string ErrorMessage)> GetSurveysAsync(string Language);
-       Task<(bool IsSuccess, Models.Survey Surveys, string ErrorMessage)> GetSurveysAsync(int Id, string Language);
-       Task<(bool IsSuccess, Models.Survey Survey, string ErrorMessage)> PostSurveyAsync(Models.Survey Survey);
-       Task<(bool IsSuccess, Models.Survey Survey, string ErrorMessage)> PutSurveyAsync(int Id,Models.Survey Survey);
-       Task<(bool IsSuccess, Models.Survey Survey, string ErrorMessage)> DeleteSurveyAsync(int Id);
+       Task<(bool IsSuccess, IEnumerable< Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language);
+       Task<(bool IsSuccess, Models.MultiLanSurvey Surveys, string ErrorMessage)> GetSurveysAsync(int id, string language);
+       Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PostSurveyAsync(Models.Survey Survey);
+       Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PutSurveyAsync(int id, Models.Survey Survey);
+       Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> DeleteSurveyAsync(int id);
+        void seedData();
 
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Surveys/Models/Survey.cs

@@ -2,13 +2,21 @@
 
 namespace DamageAssesment.Api.Surveys.Models
 {
-    public class Survey
+    public class MultiLanSurvey : BaseSurvey
+    {
+        public object Titles { get; set; }
+    }
+    public class Survey : BaseSurvey
+    {
+        public IEnumerable<SurveyTranslation> Titles { get; set; }
+
+    }
+    public class BaseSurvey
     {
         public int Id { get; set; }
         public bool IsEnabled { get; set; }
         public DateTime StartDate { get; set; }
         public DateTime EndDate { get; set; }
         public DateTime CreatedDate { get; set; }
-        public IEnumerable<SurveyTranslation> Titles { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Surveys/Profiles/SurveysProfile.cs

@@ -3,8 +3,10 @@
     public class SurveysProfile:AutoMapper.Profile
     {
         public SurveysProfile() {
-            CreateMap<Db.Survey, Models.Survey>();
+            CreateMap<Db.Survey, Models.MultiLanSurvey>();
             CreateMap<Models.Survey, Db.Survey>();
+            CreateMap<Db.SurveyTranslation, Models.SurveyTranslation>();
+            CreateMap<Models.SurveyTranslation, Db.SurveyTranslation>();
         }
     }
 }