Set up CI with Azure Pipelines for run Shellscript

[skip ci]

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

@@ -5,7 +5,6 @@ using Microsoft.OpenApi.Any;
 
 namespace DamageAssesment.Api.Answers.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class AnswersController: ControllerBase
     {
@@ -18,7 +17,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Get all answers
         /// </summary>
         
-        [HttpGet("Answers")]
+        [HttpGet("answers")]
         public async Task<ActionResult> GetAnswersAsync() {
         
             var result = await answerProvider.GetAnswersAsync();
@@ -34,11 +33,11 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// </summary>
 
 
-        [HttpGet("Answers/{Id}")]
-        public async Task<ActionResult> GetAnswerByIdAsync(int Id)
+        [HttpGet("answers/{id}")]
+        public async Task<ActionResult> GetAnswerByIdAsync(int id)
         {
 
-            var result = await answerProvider.GetAnswerByIdAsync(Id);
+            var result = await answerProvider.GetAnswerByIdAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Answer);
@@ -49,10 +48,10 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers based on responseId.
         /// </summary>
-        [HttpGet("AnswersByResponse/{ResponseId}")]
-        public async Task<IActionResult> GetAnswersByResponseId(int ResponseId)
+        [HttpGet("answers/byresponse/{responseid}")]
+        public async Task<IActionResult> GetAnswersByResponseId(int responseid)
         {
-            var result = await this.answerProvider.GetAnswersAsync(ResponseId);
+            var result = await this.answerProvider.GetAnswersAsync(responseid);
             if(result.IsSuccess)
             {
                 return Ok(result.Answers);
@@ -63,10 +62,10 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Get all answers based on questionId.
         /// </summary>
 
-        [HttpGet("AnswersByQuestion/{QuestionId}")]
-        public async Task<IActionResult> AnswersByQuestionId(int QuestionId)
+        [HttpGet("answers/byquestion/{questionid}")]
+        public async Task<IActionResult> AnswersByQuestionId(int questionid)
         {
-            var result = await this.answerProvider.GetAnswersByQuestionAsync(QuestionId);
+            var result = await this.answerProvider.GetAnswersByQuestionAsync(questionid);
             if (result.IsSuccess)
             {
                 return Ok(result.Answers);
@@ -77,12 +76,12 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Update an existing answer.
         /// </summary>
 
-        [HttpPut("Answers")]
-        public IActionResult UpdateAnswer(Models.Answer answer)
+        [HttpPut("answers")]
+        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);
@@ -98,12 +97,12 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Save a new answer.
         /// </summary>
 
-        [HttpPost("Answers")]
-        public IActionResult CreateAnswer(Models.Answer answer)
+        [HttpPost("answers")]
+        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);
@@ -116,7 +115,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         ///  Delete an existing answer.
         /// </summary>
 
-        [HttpDelete("Answers/{id}")]
+        [HttpDelete("answers/{id}")]
         public async Task<IActionResult> DeleteAnswer(int id)
         {
             var result = await this.answerProvider.DeleteAnswerAsync(id);

DamageAssesmentApi/DamageAssesment.Api.Answers/Db/Answer.cs

@@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Answers.Db
 {
+    [Table("Answers")]
     public class Answer
     {
         [Key]

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

@@ -8,22 +8,22 @@ namespace DamageAssesment.Api.Answers.Providers
 {
     public class AnswersProvider : IAnswersProvider
     {
-
         private AnswerDbContext answerDbContext;
         private ILogger<AnswersProvider> logger;
         private IMapper mapper;
 
+        // Constructor with dependency injection and data seeding
         public AnswersProvider(AnswerDbContext answerDbContext, ILogger<AnswersProvider> logger, IMapper mapper)
         {
             this.answerDbContext = answerDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+            SeedData(); // Seed initial data if the table is empty
         }
 
+        // Get all answers
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync()
         {
-
             try
             {
                 logger?.LogInformation("Query Question");
@@ -41,9 +41,9 @@ namespace DamageAssesment.Api.Answers.Providers
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
-
         }
 
+        // Get an answer by its ID
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> GetAnswerByIdAsync(int Id)
         {
             try
@@ -64,6 +64,8 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
+
+        // Get answers by survey response ID
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync(int surveyResponseId)
         {
             try
@@ -75,17 +77,17 @@ namespace DamageAssesment.Api.Answers.Providers
                 {
                     var result = mapper.Map<IEnumerable<Db.Answer>, IEnumerable<Models.Answer>>(respAnswers);
                     return (true, result, null);
-
                 }
                 return (false, null, "Not Found");
             }
             catch (Exception ex)
             {
-
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
         }
+
+        // Get answers by question ID
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersByQuestionAsync(int questionId)
         {
             try
@@ -97,18 +99,18 @@ namespace DamageAssesment.Api.Answers.Providers
                 {
                     var result = mapper.Map<IEnumerable<Db.Answer>, IEnumerable<Models.Answer>>(respAnswers);
                     return (true, result, null);
-
                 }
                 return (false, null, "Not Found");
             }
             catch (Exception ex)
             {
-
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
         }
-        public (bool IsSuccess, Models.Answer Answer, string ErrorMessage) PostAnswerAsync(Models.Answer Answer)
+
+        // Create a new answer
+        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer)
         {
             try
             {
@@ -117,11 +119,11 @@ 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);
                 }
-                return (false, null, "Answer is already exits");
+                return (false, null, "Answer is already exists");
             }
             catch (Exception ex)
             {
@@ -129,7 +131,9 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
-        public (bool IsSuccess, Models.Answer Answer, string ErrorMessage) UpdateAnswerAsync(Models.Answer Answer)
+
+        // Update an existing answer
+        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer)
         {
             try
             {
@@ -140,7 +144,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,18 +158,17 @@ namespace DamageAssesment.Api.Answers.Providers
                     logger?.LogInformation($"{Answer} Bad Request");
                     return (false, null, "Bad request");
                 }
-
             }
             catch (Exception ex)
             {
-
                 logger?.LogError(ex.ToString());
-                return (false,null, ex.Message);
+                return (false, null, ex.Message);
             }
         }
+
+        // Delete an answer by its ID
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> DeleteAnswerAsync(int Id)
         {
-
             try
             {
                 Db.Answer answer = answerDbContext.Answers.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
@@ -175,36 +178,35 @@ namespace DamageAssesment.Api.Answers.Providers
                 }
                 answerDbContext.Answers.Remove(answer);
                 answerDbContext.SaveChanges();
-                return (true, mapper.Map<Db.Answer, Models.Answer>(answer), $"AnswerId {Id} deleted Successfuly");
+                return (true, mapper.Map<Db.Answer, Models.Answer>(answer), $"AnswerId {Id} deleted successfully");
             }
             catch (Exception ex)
             {
-
                 logger?.LogError(ex.ToString());
-                return (false,null, ex.Message);
+                return (false, null, ex.Message);
             }
         }
+
+        // Check if an answer with a specific ID exists
         private bool AnswerExists(int id)
         {
             return answerDbContext.Answers.AsNoTracking().Count(e => e.Id == id) > 0;
         }
 
-        private void SeedData()
+        // Seed initial data if the table is empty
+        public void SeedData()
         {
             if (!answerDbContext.Answers.Any())
             {
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "Yes", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 });
+                // Uncomment the lines below to add more initial data if needed
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
                 answerDbContext.SaveChanges();
             }
-
         }
-
-
-
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

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

@@ -7,7 +7,6 @@ using System.Net.Http.Headers;
 
 namespace DamageAssesment.Api.Attachments.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class AttachmentsController : ControllerBase
     {
@@ -23,7 +22,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// Get all attachments.
         /// </summary>
 
-        [HttpGet("Attachments")]
+        [HttpGet("attachments")]
         public async Task<ActionResult> GetAttachmentsAsync()
         {
 
@@ -38,7 +37,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Get all attachments by attachmentId.
         /// </summary>
-        [HttpGet("Attachments/{id}")]
+        [HttpGet("attachments/{id}")]
         public async Task<ActionResult> GetAttachmentbyIdAsync(int id)
         {
 
@@ -82,16 +81,16 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// Save new Attachment(s)
         /// </summary>
 
-        [HttpPost("Attachments"), DisableRequestSizeLimit]
-        public IActionResult UploadAttachmentAsync(AttachmentInfo attachmentInfo)
+        [HttpPost("attachments"), DisableRequestSizeLimit]
+        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);
@@ -109,18 +108,18 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// Modify an new attachment.
         /// </summary>
 
-        [HttpPut("Attachments"), DisableRequestSizeLimit]
-        public  IActionResult UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
+        [HttpPut("attachments"), DisableRequestSizeLimit]
+        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);
@@ -139,11 +138,11 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Delete an existing attachment.
         /// </summary>
-        [HttpDelete("Delete")]
-        public async Task<IActionResult> DeleteAttachment(int Id)
+        [HttpDelete("attachments/{id}")]
+        public async Task<IActionResult> DeleteAttachment(int id)
         {
             // database soft delete
-            var result = await this.AttachmentProvider.DeleteAttachmentAsync(Id);
+            var result = await this.AttachmentProvider.DeleteAttachmentAsync(id);
             if (result.IsSuccess)
             {
                 // deleting file from folder

DamageAssesmentApi/DamageAssesment.Api.Attachments/DMS_Attachments/Active/Response-1/Answer-1/Attachment_1.txt

@@ -1 +0,0 @@
-sample

DamageAssesmentApi/DamageAssesment.Api.Attachments/Db/Attachment.cs

@@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Attachments.Db
 {
+    [Table("AnswerAttachments")]
     public class Attachment
     {
         [Key]

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

@@ -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.Attachments/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment - Backup.Api.DocuLinks.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.DocuLinks\DamageAssesment.Api.DocuLinks.csproj" />
+  </ItemGroup>
+
+</Project>

DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.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.DocuLinks\DamageAssesment.Api.DocuLinks.csproj" />
+  </ItemGroup>
+
+</Project>

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

@@ -0,0 +1,356 @@
+using DamageAssesment.Api.DocuLinks.Controllers;
+using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.DocuLinks.Models;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using Xunit;
+
+namespace DamageAssesment.Api.DocuLinks.Test
+{
+
+    public class DocumentServiceTest
+    {
+
+        [Fact(DisplayName = "Get Documents - NoContent Case")]
+        public async Task GetDocumentsLanguageAsync_ShouldReturnStatusCode204()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNoContentResponses();
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en",null)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "", null);
+
+            Assert.Equal(204, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get active Documents - NoContent Case")]
+        public async Task GetDocumentsLinkTypeAsync_ShouldReturnStatusCode204()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNoContentResponses();
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsByActiveAsync("", "");
+
+            Assert.Equal(204, result.StatusCode);
+        }
+        [Fact(DisplayName = "Get Documents - Ok case")]
+        public async Task GetDocumentsAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponses();
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en", null)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms","en", null);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+        [Fact(DisplayName = "Get active Documents - Ok case")]
+        public async Task GetActiveDocumentsAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponses();
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsByActiveAsync("forms", "en");
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get active Documents by linktypeid - Ok case")]
+        public async Task GetActiveDocumentsLinkTypeIdAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponses();
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsByActiveLinkTypeIdAsync(null, "en");
+
+            Assert.Equal(200, result.StatusCode);
+        }
+        [Fact(DisplayName = "Get active Documents by linktypeid  - NoContent Case")]
+        public async Task GetDocumentsLinkTypeIdAsync_ShouldReturnStatusCode204()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNoContentResponses();
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsByActiveLinkTypeIdAsync(null, "");
+
+            Assert.Equal(204, result.StatusCode);
+        }
+        [Fact(DisplayName = "Get Document by Id - Ok case")]
+        public async Task GetDocumentAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponse(1);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(1,"forms","en")).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1, "forms", "en");
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Document by Id - NotFound case")]
+        public async Task GetDocumentAsync_ShouldReturnStatusCode404()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNotFoundResponse();
+            mockDocumentService.Setup(service => service.GetDocumentAsync(99, "forms", "en")).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundResult)await DocumentProvider.GetDocumentAsync(99, "forms", "en");
+            Assert.Equal(404, result.StatusCode);
+        }
+        [Fact(DisplayName = "Post Document - Ok case")]
+        public async Task PostDocumentAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponse(1);
+            var mockInputDocument = await MockData.getInputDocumentData();
+            var DocumentResponse = await MockData.GetDocuLinksInfo(0);
+            mockDocumentService.Setup(service => service.PostDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(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<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockInputDocument = await MockData.getInputDocumentData();
+            var mockResponse = await MockData.getBadRequestResponse();
+            ReqDoculink documentInfo = null;
+            mockDocumentService.Setup(service => service.PostDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(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<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponse(1);
+            var mockInputDocument = await MockData.getInputDocumentData();
+            var DocumentResponse = await MockData.GetDocuLinksInfo(1);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1,DocumentResponse);
+
+            Assert.Equal(404, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Document - BadRequest case")]
+        public async Task PutDocumentAsync_ShouldReturnStatusCode400()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getBadRequestResponse();
+            var mockInputDocument = await MockData.getInputDocumentData();
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99,null);
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Delete Document - Ok case")]
+        public async Task DeleteDocumentAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponse(1);
+            mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(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<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNotFoundResponse();
+            mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(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<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getOkResponse();
+            mockDocumentService.Setup(service => service.GetLinkTypesAsync("en")).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetLinkTypesAsync("en");
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Link types - NoContent Case")]
+        public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode204()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getNoContentResponse();
+            mockDocumentService.Setup(service => service.GetLinkTypesAsync("en")).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NoContentResult)await DocumentProvider.GetLinkTypesAsync("en");
+
+            Assert.Equal(204, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Link Type by Id - Ok case")]
+        public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getOkResponse(1);
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1,"en")).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1, "en");
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Link Type by Id - NotFound case")]
+        public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode404()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getNotFoundResponse();
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(99, "en")).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundResult)await DocumentProvider.GetLinkTypeAsync(99, "en");
+            Assert.Equal(404, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Post Link Type - Ok case")]
+        public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            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 DoculinkController(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<IDoculinkProvider>();
+            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 DoculinkController(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<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getOkResponse(1);
+            var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1,mockInputDocument);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Document - NotFound case")]
+        public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode404()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getNotFoundResponse();
+            var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99,mockInputDocument);
+
+            Assert.Equal(404, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Document - BadRequest case")]
+        public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode400()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getBadRequestResponse();
+            var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument);
+
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Delete Document - Ok case")]
+        public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getOkResponse(1);
+
+            mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(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<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await LinkTypeMockData.getNotFoundResponse();
+            mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundResult)await DocumentProvider.DeleteLinkType(99);
+
+            Assert.Equal(404, result.StatusCode);
+        }
+
+    }
+}

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

@@ -0,0 +1,71 @@
+using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.DocuLinks.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DamageAssesment.Api.DocuLinks.Test
+{
+    public class LinkTypeMockData
+    {
+
+        public static async Task<(bool, List<DocuLinks.Models.ResLinkType>, string)> getOkResponse()
+        {
+            List<DocuLinks.Models.ResLinkType> list = new List<DocuLinks.Models.ResLinkType>();
+            Dictionary<string, string> dictdesc = new Dictionary<string, string>();
+            dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester");
+            for (int i = 1; i < 4; i++)
+            {
+                list.Add(new DocuLinks.Models.ResLinkType()
+                {
+                    Id = i,
+                    titles= dictdesc,
+                    CustomOrder=i,
+                    IsActive = true
+                });
+            }
+            return (true, list, null);
+        }
+        public static async Task<(bool, DocuLinks.Models.ResLinkType, string)> getOkResponse(int Id)
+        {
+            var DocuLinks = await getOkResponse();
+            var Document = DocuLinks.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, Document, null);
+        }
+        public static async Task<(bool, DocuLinks.Models.ResLinkType, string)> getBadRequestResponse()
+        {
+            return (false, null, "Bad Request");
+        }
+
+        public static async Task<(bool, DocuLinks.Models.ResLinkType, string)> getNotFoundResponse()
+        {
+            return (false, null, "Not Found");
+        }
+        public static async Task<(bool, IEnumerable<DocuLinks.Models.ResLinkType>, string)> getNoContentResponse()
+        {
+            IEnumerable<DocuLinks.Models.ResLinkType> list = new List<DocuLinks.Models.ResLinkType>();
+            return (false, list, null);
+        }
+
+        public static async Task<DocuLinks.Models.LinkType> getInputLinkData(int id)
+        {
+            List<Models.LinksTranslation> DocuLinksTranslations = new List<Models.LinksTranslation>();
+            DocuLinksTranslations.Add(new Models.LinksTranslation()
+            {
+                Language = "en",
+                TypeText = "tel"
+            });
+            return new Models.LinkType
+            {
+                Id = id,
+                linksTranslations = DocuLinksTranslations,
+                CustomOrder=1,
+                IsActive = true
+            };
+        }
+
+    }
+}

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

@@ -0,0 +1,184 @@
+using DamageAssesment.Api.DocuLinks.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DamageAssesment.Api.DocuLinks.Test
+{
+    public class MockData
+    {
+
+        public static async Task<(bool, List<DocuLinks.Models.ResDoculinks>, string)> getOkResponses()
+        {
+            List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
+            
+            for (int i = 1; i < 4; i++)
+            {
+                Dictionary<string, string> dicttitle = new Dictionary<string, string>();
+                Dictionary<string, string> dictdesc = new Dictionary<string, string>(); 
+                dicttitle.Add("en", "test"); dicttitle.Add("fr", "tester");
+                dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester"); 
+                List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
+                DocuLinksTranslations.Add(new DoculinkTranslation()
+                {
+                    Language = "en",
+                    title = "tel"+i,
+                    description = "Sample"+i
+                });
+                List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
+                doclinksAttachments.Add(new DoculinkAttachments()
+                {
+                    docName = "",Path="www.google.com",
+                    IsAttachments=false,CustomOrder=1
+                });
+                list.Add(new DocuLinks.Models.ResDoculink()
+                {
+
+                    Id = i,
+                    linkTypeId = i,
+                    IsActive = true,
+                    titles= dicttitle,
+                    description=dictdesc,
+                    CustomOrder=i,
+                    doclinksAttachments= doclinksAttachments
+                });
+            }
+            List<ResDoculinks> doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
+            return (true, doculinks, null);
+        }
+
+
+        public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponse()
+        {
+            List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
+
+            for (int i = 1; i < 4; i++)
+            {
+                Dictionary<string, string> dicttitle = new Dictionary<string, string>();
+                Dictionary<string, string> dictdesc = new Dictionary<string, string>();
+                dicttitle.Add("en", "test"); dicttitle.Add("fr", "tester");
+                dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester");
+                List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
+                DocuLinksTranslations.Add(new DoculinkTranslation()
+                {
+                    Language = "en",
+                    title = "tel" + i,
+                    description = "Sample" + i
+                });
+                List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
+                doclinksAttachments.Add(new DoculinkAttachments()
+                {
+                    docName = "",
+                    Path = "www.google.com",
+                    IsAttachments = false,
+                    CustomOrder = 1
+                });
+                list.Add(new DocuLinks.Models.ResDoculink()
+                {
+
+                    Id = i,
+                    linkTypeId = i,
+                    IsActive = true,
+                    titles = dicttitle,
+                    description = dictdesc,
+                    CustomOrder = i,
+                    doclinksAttachments = doclinksAttachments
+                });
+            }
+            return (true, list, null);
+        }
+        public static async Task<(bool, DocuLinks.Models.ResDoculink, string)> getOkResponse(int Id)
+        {
+            var DocuLinks = await getOkResponse();
+            var Document = DocuLinks.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, Document, null);
+        }
+
+        public static async Task<(bool, DocuLinks.Models.ResDoculink, string)> getBadRequestResponse()
+        {
+            return (false, null, "Bad Request");
+        }
+
+        public static async Task<(bool, DocuLinks.Models.ResDoculink, string)> getNotFoundResponse()
+        {
+            return (false, null, "Not Found");
+        }
+        public static async Task<(bool, IEnumerable<DocuLinks.Models.ResDoculinks>, string)> getNoContentResponses()
+        {
+            IEnumerable<DocuLinks.Models.ResDoculinks> list = new List<DocuLinks.Models.ResDoculinks>();
+            return (false, list, null);
+        }
+        public static async Task<(bool, IEnumerable<DocuLinks.Models.ResDoculink>, string)> getNoContentResponse()
+        {
+            IEnumerable<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
+            return (false, list, null);
+        }
+        public static async Task<DocuLinks.Models.ReqDoculink> GetDocuLinksInfo(int id)
+        {
+
+            List<FileModel> fileModels = new List<FileModel>();
+            fileModels.Add( new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt",IsAttachments=true,CustomOrder=1 });
+            return new ReqDoculink() { Id=id, linkTypeId = 1, CustomOrder = 1, Files = fileModels };
+        }
+        public static async Task<DocuLinks.Models.Doculink> getInputDocumentData()
+        {
+            List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
+            DocuLinksTranslations.Add(new DoculinkTranslation()
+            {
+                Language = "en",
+                title = "tel",
+                description = "Sample"
+            }); 
+            List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
+            doclinksAttachments.Add(new DoculinkAttachments()
+            {
+                docName = "",
+                Path = "www.google.com",
+                IsAttachments = false,
+                CustomOrder = 1
+            });
+            return new Models.Doculink
+            {
+                Id = 1,
+                linkTypeId = 1,
+                IsActive = true,
+                CustomOrder=1,
+                documentsTranslations = DocuLinksTranslations,
+                doclinksAttachments= doclinksAttachments
+            };
+        }
+        public static async Task<List<DocuLinks.Models.Doculink>> getInputDocuLinksData()
+        {
+            List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
+            DocuLinksTranslations.Add(new DoculinkTranslation()
+            {
+                Language = "en",
+                title = "tel",
+                description = "Sample"
+            });
+            List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
+            doclinksAttachments.Add(new DoculinkAttachments()
+            {
+                docName = "",
+                Path = "www.google.com",
+                IsAttachments = false,
+                CustomOrder = 1
+            });
+            List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();
+            DocuLinks.Add(new Models.Doculink
+            {
+                Id = 1,
+                linkTypeId = 1,
+                IsActive = true,
+                CustomOrder = 1,
+                documentsTranslations = DocuLinksTranslations,
+                doclinksAttachments = doclinksAttachments
+            });
+            return DocuLinks;
+        }
+
+    }
+}

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

@@ -0,0 +1,244 @@
+using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.DocuLinks.Models;
+using DamageAssesment.Api.DocuLinks.Providers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DamageAssesment.Api.DocuLinks.Controllers
+{
+    [ApiController]
+    public class DoculinkController : ControllerBase
+    {
+        private readonly IDoculinkProvider documentsProvider;
+        private readonly IUploadService uploadService;
+
+        public DoculinkController(IDoculinkProvider documentsProvider,IUploadService uploadService)
+        {
+
+            this.documentsProvider = documentsProvider;
+            this.uploadService = uploadService; 
+
+        }
+        /// <summary>
+        /// Get all Doculink type.
+        /// </summary>
+        [HttpGet]
+        [Route("doculinks/types")]
+        [Route("doculinks/types/{language:alpha}")]
+        public async Task<IActionResult> GetLinkTypesAsync(string? language)
+        {
+            var result = await this.documentsProvider.GetLinkTypesAsync(language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkTypes);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get a Doculink type by id.
+        /// </summary>
+        [HttpGet]
+        [Route("doculinks/types/{id}")]
+        [Route("doculinks/types/{id}/{language:alpha}")]
+        public async Task<IActionResult> GetLinkTypeAsync(int id,string? language)
+        {
+            var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkType);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// Update a existing Doculink type.
+        /// </summary>
+        [HttpPut]
+        [Route("doculinks/types/{id}")]
+        public async Task<IActionResult> UpdateLinkType(int id,Models.LinkType linkType)
+        {
+            if (linkType != null)
+            {
+                var result = await this.documentsProvider.UpdateLinkTypeAsync(id,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 Doculink type.
+        /// </summary>
+        [HttpPost]
+        [Route("doculinks/types")]
+        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 Doculink type by id.
+        /// </summary>
+        [HttpDelete]
+        [Route("doculinks/types/{id}")]
+        public async Task<IActionResult> DeleteLinkType(int id)
+        {
+            var result = await this.documentsProvider.DeleteLinkTypeAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkType);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// Get all Doculink.
+        /// </summary>
+        /// 
+        [Route("doculinks")]
+        [Route("doculinks/{linktype:alpha}")]
+        [Route("doculinks/{linktype:alpha}/{language:alpha}")]
+        [HttpGet]
+        public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language,bool? isactive)
+        {
+            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive);
+            if (result.IsSuccess)
+            {
+                return Ok(result.documents);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get all active Doculink.
+        /// </summary>
+        [Route("doculinks/active")]
+        [Route("doculinks/active/{linktype:alpha}")]
+        [Route("doculinks/active/{linktype:alpha}/{language:alpha}")]
+        [HttpGet]
+        public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
+        {
+            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language,true);
+            if (result.IsSuccess)
+            {
+                return Ok(result.documents);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get all active Doculink.
+        /// </summary>
+        [Route("doculinks/active/{linktypeid:int}")]
+        [Route("doculinks/active/{linktypeid:int}/{language:alpha}")]
+        [HttpGet]
+        public async Task<IActionResult> GetDocumentsByActiveLinkTypeIdAsync(int? linktypeid, string? language)
+        {
+            var result = await this.documentsProvider.GetdocumentsByLinkTypeIdAsync(linktypeid, language, true);
+            if (result.IsSuccess)
+            {
+                return Ok(result.documents);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get a Doculink by id.
+        /// </summary>
+        [HttpGet]
+        [Route("doculinks/{id}")]
+        [Route("doculinks/{id}/{linktype:alpha}")]
+        [Route("doculinks/{id}/{linktype:alpha}/{language:alpha}")]
+        public async Task<IActionResult> GetDocumentAsync(int id,string? linktype, string? language)
+        {
+            var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.Document);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// update existing doclink.
+        /// </summary>
+        [HttpPut]
+        [Route("doculinks/{id}")]
+        public async Task<IActionResult> UpdateDocument(int id,ReqDoculink documentInfo)
+        {
+            if (documentInfo != null)
+            {
+                var dbdoc = await this.documentsProvider.GetDocumentByidAsync(id);
+                if (dbdoc.IsSuccess)
+                {
+                    var documents = await this.documentsProvider.GetDocumentCounter();
+                    Models.Doculink DocuLink= uploadService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
+                    var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
+                    if (result.IsSuccess)
+                    {
+                        return Ok(result.Document);
+                    }
+                    return NoContent();
+                }
+                return NotFound();
+            }
+            return BadRequest(documentInfo);
+        }
+        /// <summary>
+        /// Create new doclink.
+        /// </summary>
+        [HttpPost]
+        [Route("doculinks")]
+        public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo)
+        {
+            try
+            {
+                if (documentInfo != null)
+                {
+                    var documents = await this.documentsProvider.GetDocumentCounter();
+                    Models.Doculink DocuLink= uploadService.UploadDocument(documents.counter, documentInfo);
+                    var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
+                    if (result.IsSuccess)
+                    {
+                        return Ok(result.Document);
+                    }
+                    return NoContent();
+                }
+                return BadRequest(documentInfo);
+            }
+            catch (Exception ex)
+            {
+                return BadRequest($"Internal server error: {ex}");
+            }
+        }
+        /// <summary>
+        /// Delete Doculink by id.
+        /// </summary>
+        [HttpDelete]
+        [Route("doculinks/{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
+                foreach (var item in result.Document.doclinksAttachments)
+                {
+                    uploadService.Movefile(item.Path);
+                }
+                return Ok(result.Document);
+            }
+            return NotFound();
+        }
+        
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj

@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
+  </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>
+
+</Project>

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

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.DocuLinks.Db
+{
+    [Table("Doculinks")]
+    public class Doculink
+    {
+        [Key]
+        public int Id { get; set; }
+        [ForeignKey("LinkType")]
+        public int linkTypeId { get; set; }
+        public bool IsActive { get; set; }
+        public bool IsDeleted { get; set; }
+        public int CustomOrder { get; set; }
+        //public bool IsAttachments { get; set; }
+        //public bool IsUrl { get; set; }
+        public DateTime dateCreated { get; set; }
+        public DateTime dateUpdated { get; set; }
+
+    }
+}

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

@@ -0,0 +1,19 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Db
+{
+    [Table("DoculinkAttachments")]
+    public class DoculinkAttachments
+    {
+
+        [Key]
+        public int Id { get; set; }
+        [ForeignKey("Document")]
+        public int DocumentId { get; set; }
+        public string docName { get; set; }
+        public string Path { get; set; }
+        public bool IsAttachments { get; set; }
+        public int CustomOrder { get; set; }
+    }
+}

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

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

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

@@ -0,0 +1,17 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.DocuLinks.Db
+{
+    [Table("DoculinkTrans")]
+    public class DoculinkTranslation
+    {
+        [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.DocuLinks/Db/LinkType.cs

@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.DocuLinks.Db
+{
+    [Table("DoculinkTypes")]
+    public class LinkType
+    {
+        [Key]
+        public int Id { get; set; }
+        public bool IsActive { get; set; }
+        public int CustomOrder { get; set; }
+    }
+}

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

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Db
+{
+    [Table("DoculinkTypeTrans")]
+    public class LinksTranslation
+    {
+        [Key]
+        public int Id { get; set; }
+        [ForeignKey("LinkType")]
+        public int LinkTypeId { get; set; }
+        public string TypeText { get; set; }
+        public string Language { get; set; }
+    }
+}

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

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

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Interfaces/IDoculinkProvider.cs

@@ -0,0 +1,19 @@
+using DamageAssesment.Api.DocuLinks.Models;
+
+namespace DamageAssesment.Api.DocuLinks.Interfaces
+{
+    public interface IDoculinkProvider : ILinkTypesProvider
+    {
+        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> GetDocumentAsync(int id, string? linktype, string? language);
+        Task<(bool IsSuccess, Models.Doculink Document, string ErrorMessage)> GetDocumentByidAsync(int id);
+       // Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language);
+        Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive);
+        Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
+        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document);
+        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id,Models.Doculink Document);
+        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
+        Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
+
+
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Interfaces/ILinkTypeProvider.cs

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

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

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

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

@@ -0,0 +1,95 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.DocuLinks.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.DocuLinks.Migrations
+{
+    [DbContext(typeof(DoculinkDbContext))]
+    [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.DocuLinks.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.DocuLinks.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.DocuLinks/Migrations/20230828165655_InitialDocumentCreate.cs

@@ -0,0 +1,60 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.DocuLinks.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.DocuLinks/Migrations/20230830200432_DocumentTranslation.Designer.cs

@@ -0,0 +1,118 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.DocuLinks.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.DocuLinks.Migrations
+{
+    [DbContext(typeof(DoculinkDbContext))]
+    [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.DocuLinks.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.DocuLinks.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.DocuLinks.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.DocuLinks/Migrations/20230830200432_DocumentTranslation.cs

@@ -0,0 +1,70 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.DocuLinks.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.DocuLinks/Migrations/DocumentDbContextModelSnapshot.cs

@@ -0,0 +1,115 @@
+// <auto-generated />
+using System;
+using DamageAssesment.Api.DocuLinks.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.DocuLinks.Migrations
+{
+    [DbContext(typeof(DoculinkDbContext))]
+    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.DocuLinks.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.DocuLinks.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.DocuLinks.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.DocuLinks/Models/Doculink.cs

@@ -0,0 +1,30 @@
+using DamageAssesment.Api.DocuLinks.Models;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Models
+{
+    public class Doculink : BaseDoculink
+    {
+        public List<DoculinkTranslation> documentsTranslations { get; set; }
+    }
+    public class ResDoculinks
+    {
+        public int linkTypeId { get; set; }
+        public List<ResDoculink> doculinks { get; set; }   
+    }
+    public class ResDoculink:BaseDoculink
+    {
+        public object titles { get; set; }
+        public object description { get; set; }
+        public object linktypes { get; set; }
+    }
+    public class BaseDoculink
+    {
+        public int Id { get; set; }
+        public int linkTypeId { get; set; }
+        public bool IsActive { get; set; }
+        public bool IsDeleted { get; set; }
+        public List<DoculinkAttachments> doclinksAttachments { get; set; }
+        public int CustomOrder { get; set; }
+    }
+}

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

@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Models
+{
+    public class DoculinkAttachments
+    {
+        public string docName { get; set; }
+        public string Path { get; set; }
+        public bool IsAttachments { get; set; }
+        public int CustomOrder { get; set; }
+    }
+}

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

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

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

@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Models
+{
+    public class LinkType : BaseLinkType
+    {
+        public List<LinksTranslation> linksTranslations { get; set; }
+    }
+    public class BaseLinkType
+    {
+        public int Id { get; set; }
+        public bool IsActive { get; set; }
+        public int CustomOrder { get; set; }
+    }
+
+    public class ResLinkType : BaseLinkType
+    {
+        public object titles { get; set; }
+    }
+}

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

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Models
+{
+    public class LinksTranslation
+    {
+        public string TypeText { get; set; }
+        public string Language { get; set; }
+    }
+}

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

@@ -0,0 +1,22 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.DocuLinks.Models
+{
+    public class ReqDoculink
+    {
+        public int Id { get; set; }
+        public int linkTypeId { get; set; }
+        public List<DoculinkTranslation> documentsTranslations { get; set; }
+        public int CustomOrder { get; set; }
+        public List<FileModel>? Files { get; set; }
+    }
+    public class FileModel
+    {
+        public string? FileName { get; set; }
+        public string? FileContent { get; set; }
+        public string? FileExtension { get; set; }
+        public int CustomOrder { get; set; }
+        public string url { get;set; }
+        public bool IsAttachments { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Profiles/DoculinkProfile.cs

@@ -0,0 +1,22 @@
+using AutoMapper;
+
+namespace DamageAssesment.Api.DocuLinks.Profiles
+{
+    public class DoculinkProfile : AutoMapper.Profile
+    {
+        public DoculinkProfile()
+        {
+            CreateMap<Db.Doculink, Models.ResDoculink>() ;
+            CreateMap<Db.Doculink, Models.Doculink>();
+            CreateMap<Models.Doculink, Db.Doculink>();
+            CreateMap<Db.LinkType, Models.ResLinkType>();
+            CreateMap<Models.LinkType, Db.LinkType>();
+            CreateMap<Db.DoculinkTranslation, Models.DoculinkTranslation>();
+            CreateMap<Models.DoculinkTranslation, Db.DoculinkTranslation>();
+            CreateMap<Db.LinksTranslation, Models.LinksTranslation>();
+            CreateMap<Models.LinksTranslation, Db.LinksTranslation>();
+            CreateMap<Db.DoculinkAttachments, Models.DoculinkAttachments>();
+            CreateMap<Models.DoculinkAttachments, Db.DoculinkAttachments>();
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -0,0 +1,43 @@
+using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.DocuLinks.Providers;
+using Microsoft.EntityFrameworkCore;
+using System.Reflection;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+builder.Services.AddControllers();
+builder.Services.AddSwaggerGen(c =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    c.IncludeXmlComments(xmlPath);
+});
+// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>();
+builder.Services.AddScoped<IUploadService, UploadService>();
+builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
+builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
+builder.Services.AddDbContext<DoculinkDbContext>(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.DocuLinks/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.DocuLinks/Providers/AzureBlobService.cs

@@ -0,0 +1,44 @@
+
+using Azure.Storage.Blobs;
+using Azure.Storage.Blobs.Models;
+using Azure.Storage.Blobs.Specialized;
+using DamageAssesment.Api.DocuLinks.Interfaces;
+
+namespace DamageAssesment.Api.DocuLinks.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.DocuLinks/Providers/DoculinkProvider.cs

@@ -0,0 +1,606 @@
+using AutoMapper;
+using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.DocuLinks.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System;
+using System.Collections.Immutable;
+using System.Diagnostics.Eventing.Reader;
+using System.Reflection.Metadata;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace DamageAssesment.Api.DocuLinks.Providers
+{
+
+
+    public class DoculinkProvider : IDoculinkProvider
+    {
+        private DoculinkDbContext DocumentDbContext;
+        private ILogger<DoculinkProvider> logger;
+        private IUploadService uploadservice;
+        private IMapper mapper;
+
+        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> 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() { IsActive = true, CustomOrder = 1 });
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 2 });
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 3 });
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 4 });
+                DocumentDbContext.SaveChanges();
+            }
+            if (!DocumentDbContext.LinksTranslations.Any())
+            {
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Forms", Language = "en", LinkTypeId = 1 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Communiques", Language = "en", LinkTypeId = 2 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Memos", Language = "en", LinkTypeId = 3 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Trainings", Language = "en", LinkTypeId = 4 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Formularios", Language = "es", LinkTypeId = 1 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Comunicados", Language = "es", LinkTypeId = 2 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "notas", Language = "es", LinkTypeId = 3 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Entrenamientos", Language = "es", LinkTypeId = 4 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Formes", Language = "fr", LinkTypeId = 1 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Communiqués", Language = "fr", LinkTypeId = 2 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Mémos", Language = "fr", LinkTypeId = 3 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Formations", Language = "fr", LinkTypeId = 4 });
+                DocumentDbContext.SaveChanges();
+            }
+            if (!DocumentDbContext.Documents.Any())
+            {
+                int counter = 0;
+                for (int i = 1; i <= 4; i++)
+                {
+                    int linkTypeId = 2;
+                    FileModel fileModel = new FileModel();
+                    if (i < 3)
+                    {
+                        linkTypeId = 1;
+
+                        fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 };
+                    }
+                    else
+                        fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
+                    ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
+                    Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
+                    DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
+                    DocumentDbContext.SaveChanges();
+                    var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(document.doclinksAttachments);
+                    dbattachments.ForEach(a => a.DocumentId = i);
+                    DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
+                    DocumentDbContext.SaveChanges();
+                    counter++;
+                }
+            }
+            if (!DocumentDbContext.DocumentsTranslations.Any())
+            {
+                string[] titles = {
+                         "Mobile App Damage Assessment Instructions",
+                         "PC Damage Assessment Instructions",
+                         "Emergency Evacuation centers",
+                         "Mobile App Damage Assessment Instructions" };
+                string[] esTranslations = {
+                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil",
+                         "Instrucciones de Evaluación de Daños del PC",
+                         "Centros de Evacuación de Emergencia",
+                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil"  };
+                string[] frTranslations = {
+                      "Instructions d'Évaluation des Dommages de l'Application Mobile",
+                      "Instructions d'Évaluation des Dommages du PC",
+                       "Centres d'Évacuation d'Urgence",
+                       "Instructions d'Évaluation des Dommages de l'Application Mobile" };
+                List<Db.DoculinkTranslation> documents = new List<Db.DoculinkTranslation>();
+                for (int i = 0; i < 4; i++)
+                {
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = titles[i], description = titles[i], Language = "en" });
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = esTranslations[i], description = esTranslations[i], Language = "es" });
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = frTranslations[i], description = frTranslations[i], Language = "fr" });
+                }
+                DocumentDbContext.DocumentsTranslations.AddRange(documents);
+                DocumentDbContext.SaveChanges();
+            }
+
+        }
+        public List<Models.DoculinkTranslation> GetDocumentTranslations(int id, string? language)
+        {
+            List<Models.DoculinkTranslation> QuestionTranslations;
+            if (string.IsNullOrEmpty(language))
+            {
+                QuestionTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
+                    DocumentDbContext.DocumentsTranslations.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+            }
+            else
+            {
+                QuestionTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
+                DocumentDbContext.DocumentsTranslations.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList());
+            }
+            return QuestionTranslations;
+        }
+        public ResDoculink CreateMultiLanguageObject(List<Models.DoculinkTranslation> questions)
+        {
+            ResDoculink MultiLanguage = new ResDoculink();
+            Dictionary<string, string> dicttitle = new Dictionary<string, string>();
+            Dictionary<string, string> dictdesc = new Dictionary<string, string>();
+            foreach (Models.DoculinkTranslation item in questions)
+            {
+                dicttitle.Add(item.Language, item.title);
+                dictdesc.Add(item.Language, item.description);
+            }
+            MultiLanguage.titles = dicttitle;
+            MultiLanguage.description = dictdesc;
+            return MultiLanguage;
+        }
+        public List<Models.LinksTranslation> GetLinkTypeTranslations(int id, string? language)
+        {
+            List<Models.LinksTranslation> linksTranslations;
+            if (string.IsNullOrEmpty(language))
+            {
+                linksTranslations = mapper.Map<List<Db.LinksTranslation>, List<Models.LinksTranslation>>(
+                    DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.LinkTypeId == id).ToList());
+            }
+            else
+            {
+                linksTranslations = mapper.Map<List<Db.LinksTranslation>, List<Models.LinksTranslation>>(
+                DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.LinkTypeId == id && a.Language == language).ToList());
+            }
+            return linksTranslations;
+        }
+        public object CreateMultiLanguageLinkTypeObject(List<Models.LinksTranslation> links)
+        {
+            object MultiLanguage = new object();
+            Dictionary<string, string> dicttitle = new Dictionary<string, string>();
+            foreach (Models.LinksTranslation item in links)
+            {
+                dicttitle.Add(item.Language, item.TypeText);
+            }
+            MultiLanguage = dicttitle;
+            return MultiLanguage;
+        }
+
+        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var documents = new List<Db.Doculink>();
+                if (linkTypeId==null)
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
+                else
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
+                     q.linkTypeId == linkTypeId.Value).ToListAsync();
+                if (documents != null)
+                {
+                    var result = mapper.Map<List<Db.Doculink>, List<Models.ResDoculink>>(documents);
+                    foreach (var item in result)
+                    {
+                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
+                        item.titles = multilan.titles;
+                        item.description = multilan.description;
+                        item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
+                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
+                    }
+                    List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
+                    return (true, doculinks, 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.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var documents = new List<Db.Doculink>();
+                if (String.IsNullOrEmpty(linkType))
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
+                else
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
+                     q.linkTypeId == (DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.TypeText.ToLower() == linkType.ToLower()).Select(a => a.Id).FirstOrDefault())).ToListAsync();
+                if (documents != null)
+                {
+                    var result = mapper.Map<List<Db.Doculink>, List<Models.ResDoculink>>(documents);
+                    foreach (var item in result)
+                    {
+                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
+                        item.titles = multilan.titles;
+                        item.description = multilan.description;
+                        item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
+                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
+                    }
+                    List<ResDoculinks> doculinks =  result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
+                    return (true, doculinks, 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.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language)
+        //{
+
+        //    try
+        //    {
+        //        logger?.LogInformation("Query Question");
+        //        var documents = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive).ToListAsync();
+        //        if (documents != null)
+        //        {
+        //            logger?.LogInformation($"{documents.Count} Document(s) found");
+        //            var result = mapper.Map<List<Db.Document>, List<Models.ResDoculink>>(documents);
+        //            foreach (var item in result)
+        //            {
+        //                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
+        //                item.titles = multilan.titles;
+        //                item.description = multilan.description;
+        //            }
+        //            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.Doculink Document, string ErrorMessage)> GetDocumentByidAsync(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.Doculink, Models.Doculink>(Document);
+                    result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
+                            DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
+
+                    result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        //added linktype filter 
+        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> GetDocumentAsync(int id, string? linkType, string? language)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                //var Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().FirstOrDefaultAsync(q => q.Id == id && q.IsActive);
+                var Document = new Db.Doculink();
+                if (String.IsNullOrEmpty(linkType))
+                    Document = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive && q.Id == id).FirstOrDefaultAsync();
+                else
+                    Document = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive && q.Id == id &&
+                     q.linkTypeId == (DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.TypeText.ToLower() == linkType.ToLower()).Select(a => a.Id).FirstOrDefault())).FirstOrDefaultAsync();
+                if (Document != null)
+                {
+                    logger?.LogInformation($"{Document} customer(s) found");
+                    var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document);
+                    var multilan = CreateMultiLanguageObject(GetDocumentTranslations(result.Id, language));
+                    result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
+                    result.titles = multilan.titles;
+                    result.description = multilan.description;
+                    result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+                    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.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document)
+        {
+            try
+            {
+                var document = mapper.Map<Models.Doculink, Db.Doculink>(Document);
+                document.dateCreated = DateTime.Now; document.dateUpdated = DateTime.Now;
+                DocumentDbContext.Documents.Add(document);
+                DocumentDbContext.SaveChanges();
+                var dbtranslation = mapper.Map<List<Models.DoculinkTranslation>, List<Db.DoculinkTranslation>>(Document.documentsTranslations);
+                dbtranslation.ForEach(i => i.DocumentId = document.Id);
+                DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
+                var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(Document.doclinksAttachments);
+                dbattachments.ForEach(i => i.DocumentId = document.Id);
+                DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
+                DocumentDbContext.SaveChanges();
+                var result = mapper.Map<Db.Doculink, Models.ResDoculink>(document);
+                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(document.Id, ""));
+                result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, ""));
+                result.titles = multilan.titles;
+                result.description = multilan.description;
+                result.doclinksAttachments = Document.doclinksAttachments;
+                return (true, result, null);
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+
+        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document)
+        {
+            try
+            {
+                if (Document != null)
+                {
+                    var existing = DocumentDbContext.Documents.AsNoTracking().FirstOrDefault(x => x.Id == id);
+                    if (existing != null)
+                    {
+                        Document.Id = existing.Id;
+                        var document = mapper.Map<Models.Doculink, Db.Doculink>(Document);
+                        document.dateUpdated = DateTime.Now;
+                        DocumentDbContext.Documents.Update(document);
+                        DocumentDbContext.SaveChanges();
+                        var oldtranslations = DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == id).ToList();
+                        if (oldtranslations != null)
+                            DocumentDbContext.DocumentsTranslations.RemoveRange(oldtranslations);
+                        var oldattachments = DocumentDbContext.DoclinksAttachments.Where(a => a.DocumentId == id).ToList();
+                        if (oldattachments != null)
+                            DocumentDbContext.DoclinksAttachments.RemoveRange(oldattachments);
+                        var dbtranslation = mapper.Map<List<Models.DoculinkTranslation>, List<Db.DoculinkTranslation>>(Document.documentsTranslations);
+                        dbtranslation.ForEach(i => i.DocumentId = Document.Id);
+                        DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
+                        var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(Document.doclinksAttachments);
+                        dbattachments.ForEach(i => i.DocumentId = document.Id);
+                        DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
+                        DocumentDbContext.SaveChanges();
+                        var result = mapper.Map<Db.Doculink, Models.ResDoculink>(document);
+                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(document.Id, ""));
+                        result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, ""));
+                        result.titles = multilan.titles;
+                        result.description = multilan.description;
+                        result.doclinksAttachments = Document.doclinksAttachments;
+                        return (true, result, "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.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id)
+        {
+
+            try
+            {
+                Db.Doculink Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
+                if (Document == null)
+                {
+                    return (false, null, "Not Found");
+                }
+                var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document);
+                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(Document.Id, ""));
+                result.titles = multilan.titles;
+                result.description = multilan.description;
+                result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, ""));
+                result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                    DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+                Document.IsActive = false;
+                DocumentDbContext.Documents.Update(Document);
+                DocumentDbContext.SaveChanges();
+                return (true, result, $"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.DoclinksAttachments.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.ResLinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync(string? language)
+        {
+
+            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.ResLinkType>>(LinkType);
+                    foreach (var item in result)
+                    {
+                        item.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.Id, language));
+                    }
+                    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.ResLinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int Id, string? language)
+        {
+            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.ResLinkType>(LinkType);
+                    result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, language));
+                    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.ResLinkType 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 dbtranslation = mapper.Map<List<Models.LinksTranslation>, List<Db.LinksTranslation>>(LinkType.linksTranslations);
+                    dbtranslation.ForEach(i => i.LinkTypeId = dbLink.Id);
+                    DocumentDbContext.LinksTranslations.AddRange(dbtranslation);
+                    DocumentDbContext.SaveChanges();
+                    var result = mapper.Map<Db.LinkType, Models.ResLinkType>(dbLink);
+                    result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, ""));
+                    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.ResLinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(int id, Models.LinkType LinkType)
+        {
+            try
+            {
+                if (LinkType != null)
+                {
+                    var existing = DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefault(x => x.Id == id);
+                    if (existing != null)
+                    {
+                        var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
+                        DocumentDbContext.LinkTypes.Update(dbLink);
+                        DocumentDbContext.SaveChanges();
+                        var oldtranslations = DocumentDbContext.LinksTranslations.Where(a => a.LinkTypeId == id).ToList();
+                        if (oldtranslations != null)
+                            DocumentDbContext.LinksTranslations.RemoveRange(oldtranslations);
+                        var dbtranslation = mapper.Map<List<Models.LinksTranslation>, List<Db.LinksTranslation>>(LinkType.linksTranslations);
+                        dbtranslation.ForEach(i => i.LinkTypeId = dbLink.Id);
+                        DocumentDbContext.LinksTranslations.AddRange(dbtranslation);
+                        DocumentDbContext.SaveChanges();
+                        var result = mapper.Map<Db.LinkType, Models.ResLinkType>(dbLink);
+                        result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, ""));
+                        return (true, result, "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.ResLinkType 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;
+                var result = mapper.Map<Db.LinkType, Models.ResLinkType>(LinkType);
+                result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, ""));
+                DocumentDbContext.LinkTypes.Update(LinkType);
+                DocumentDbContext.SaveChanges();
+                return (true, result, $"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.DocuLinks/Providers/UploadService.cs

@@ -0,0 +1,142 @@
+using AutoMapper;
+using Azure;
+using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.DocuLinks.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.DocuLinks.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.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
+        {
+            Models.Doculink Documents = new Models.Doculink();
+            List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
+            try 
+            {
+                string path = "", UserfileName="";
+                var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
+                if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
+                    Directory.CreateDirectory(fullDirectoryPath);
+                if (documentInfo.Files != null)
+                {
+
+                    foreach (var item in documentInfo.Files)
+                    {
+                        counter++;
+                        if (item.IsAttachments)
+                        {
+                            UserfileName = Path.GetFileName(item.FileName);
+                            var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
+                            path = Path.Combine(fullDirectoryPath, fileName);
+                            File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
+                        }
+                        else
+                            path = item.url;
+                        attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
+                    }
+                }
+                Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
+                    documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
+                    IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true};
+            
+                return Documents;
+            }
+            catch (Exception ex) {
+                return new Models.Doculink();
+            }
+
+           
+        }
+        public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo)
+        {
+            try
+            {
+                foreach (var item in document.doclinksAttachments)
+                {
+                    Movefile(item.Path);
+                }
+                var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
+                if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
+                    Directory.CreateDirectory(fullDirectoryPath);
+
+                string path = "", UserfileName = "";
+                List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
+                foreach (var item in documentInfo.Files)
+                {
+                    counter++;
+                    if (item.IsAttachments)
+                    {
+                        UserfileName = Path.GetFileName(item.FileName);
+                        var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
+                        path = Path.Combine(fullDirectoryPath, fileName);
+                        File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
+                    }
+                    else
+                        path = item.url;
+                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
+                }
+                Models.Doculink Documents = new Models.Doculink()
+                {
+                    Id = documentInfo.Id,
+                    linkTypeId = documentInfo.linkTypeId,
+                    documentsTranslations=documentInfo.documentsTranslations,
+                    IsActive = true,
+                    IsDeleted=false,
+                    CustomOrder = documentInfo.CustomOrder,
+                    doclinksAttachments = attachments
+                };
+
+                return Documents;
+            }
+
+             catch (Exception ex) {
+                return new Models.Doculink();
+            }
+        }
+        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.DocuLinks/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

@@ -43,11 +43,11 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task GetEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse("Emp1");
-            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync("Emp1")).ReturnsAsync(mockResponse);
+            var mockResponse = await MockData.getOkResponse(1);
+            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync(1)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.GetEmployeeByIdAsync("Emp1");
+            var result = (OkObjectResult)await EmployeeProvider.GetEmployeeByIdAsync(1);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -57,10 +57,10 @@ namespace DamageAssesment.Api.Employees.Test
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync("Emp99")).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync(99999)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundResult)await EmployeeProvider.GetEmployeeByIdAsync("Emp99");
+            var result = (NotFoundResult)await EmployeeProvider.GetEmployeeByIdAsync(99999);
             Assert.Equal(404, result.StatusCode);
         }
 
@@ -68,7 +68,7 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task PostEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse("Emp1");
+            var mockResponse = await MockData.getOkResponse(1);
             var mockInputEmployee = await MockData.getInputEmployeeData();
             mockEmployeeService.Setup(service => service.PostEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
 
@@ -96,12 +96,12 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task PutEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse("Emp1");
+            var mockResponse = await MockData.getOkResponse(1);
             var mockInputEmployee = await MockData.getInputEmployeeData();
-            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(1,mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.UpdateEmployee(mockInputEmployee);
+            var result = (OkObjectResult)await EmployeeProvider.UpdateEmployee(1,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(1, mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundObjectResult)await EmployeeProvider.UpdateEmployee(mockInputEmployee);
+            var result = (NotFoundObjectResult)await EmployeeProvider.UpdateEmployee(1, 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(1, mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (BadRequestObjectResult)await EmployeeProvider.UpdateEmployee(mockInputEmployee);
+            var result = (BadRequestObjectResult)await EmployeeProvider.UpdateEmployee(1, mockInputEmployee);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -138,12 +138,12 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task DeleteEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse("Emp1");
+            var mockResponse = await MockData.getOkResponse(1);
 
-            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync("Emp1")).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync(1)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.DeleteEmployee("Emp1");
+            var result = (OkObjectResult)await EmployeeProvider.DeleteEmployee(1);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -153,10 +153,10 @@ namespace DamageAssesment.Api.Employees.Test
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync("Emp1")).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync(1)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundResult)await EmployeeProvider.DeleteEmployee("Emp1");
+            var result = (NotFoundResult)await EmployeeProvider.DeleteEmployee(1);
 
             Assert.Equal(404, result.StatusCode);
         }

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

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Text;
 
 namespace DamageAssesment.Api.Employees.Test
 {
@@ -15,13 +11,13 @@ namespace DamageAssesment.Api.Employees.Test
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Employees.Models.Employee { Id = "Emp"+i, Name = "Emoployee"+i, Email = "abc"+i+"@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18-i), IsActive = true, PreferredLanguage = "en" });
+                list.Append(new Employees.Models.Employee { Id = i, Name = "Emoployee"+i, Email = "abc"+i+"@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18-i), IsActive = true, PreferredLanguage = "en" });
             }
             return (true, list, null);
         }
 
 
-        public static async Task<(bool, Employees.Models.Employee, string)> getOkResponse(string Id)
+        public static async Task<(bool, Employees.Models.Employee, string)> getOkResponse(int Id)
         {
             var Employees = await getOkResponse();
             var Employee = Employees.Item2.FirstOrDefault(s => s.Id == Id);
@@ -33,19 +29,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 = 1, Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" };
 
         }
 

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

@@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Employees.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class EmployeesController : ControllerBase
     {
@@ -20,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// GET request for retrieving employees.
         /// </summary>
 
-        [HttpGet("Employees")]
+        [HttpGet("employees")]
         public async Task<ActionResult> GetEmployeesAsync()
         {
 
@@ -37,11 +36,11 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// GET request for retrieving an employee by ID.
         /// </summary>
         
-        [HttpGet("Employees/{Id}")]
-        public async Task<ActionResult> GetEmployeeByIdAsync(string Id)
+        [HttpGet("employees/{id}")]
+        public async Task<ActionResult> GetEmployeeByIdAsync(int id)
         {
 
-            var result = await EmployeeProvider.GetEmployeeByIdAsync(Id);
+            var result = await EmployeeProvider.GetEmployeeByIdAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Employee);
@@ -54,12 +53,12 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// PUT request for updating an existing employee.
         /// </summary>
         /// <param name="Employee">The updated employee object.</param>
-        [HttpPut("Employees")]
-        public async Task<IActionResult> UpdateEmployee(Db.Employee Employee)
+        [HttpPut("employees/{id}")]
+        public async Task<IActionResult> UpdateEmployee(int 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);
@@ -76,8 +75,8 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// POST request for creating a new employee.
         /// </summary>
         /// <param name="Employee">The employee information for creating a new employee.</param>
-        [HttpPost("Employees")]
-        public async Task<IActionResult> CreateEmployee(Db.Employee Employee)
+        [HttpPost("employees")]
+        public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
         {
             if (Employee != null)
             {
@@ -88,14 +87,14 @@ namespace DamageAssesment.Api.Employees.Controllers
                 }
                 return BadRequest(result.ErrorMessage);
             }
-            return CreatedAtRoute("DefaultApi", new { id = Employee.Id }, Employee);
+            return CreatedAtRoute("DefaultApi", new { Id = Employee.Id }, Employee);
         }
         /// <summary>
         /// DELETE request for deleting an existing employee.
         /// </summary>
         /// <param name="id">The ID of the employee to be deleted.</param>
-        [HttpDelete("Employees/{id}")]
-        public async Task<IActionResult> DeleteEmployee(string id)
+        [HttpDelete("employees/{id}")]
+        public async Task<IActionResult> DeleteEmployee(int id)
         {
             var result = await this.EmployeeProvider.DeleteEmployeeAsync(id);
             if (result.IsSuccess)

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

@@ -1,11 +1,15 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Employees.Db
 {
+    [Table("Employees")]
     public class Employee
     {
         [Key]
-        public string Id { get; set; }
+        public int Id { get; set; }
+        [StringLength(50)]
+        public string EmployeeCode { get; set; }
 
         [StringLength(50)]
         public string Name { get; set; }
@@ -17,7 +21,7 @@ namespace DamageAssesment.Api.Employees.Db
 
         [StringLength(50)]
         public string Email { get; set; }
-        public bool IsActive {get;set;}
+        public bool IsActive { get; set; }
         public string? PreferredLanguage { get; set; } = "en";
     }
 }

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

@@ -7,8 +7,15 @@ namespace DamageAssesment.Api.Employees.Db
         public DbSet<Db.Employee> Employees { get; set; }
         public EmployeeDbContext(DbContextOptions options) : base(options)
         {
+        }
 
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
 
+            modelBuilder.Entity<Employee>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
         }
     }
 }

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

@@ -3,9 +3,10 @@
     public interface IEmployeesProvider
     {
         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)> DeleteEmployeeAsync(string Id);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(int Id);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Models.Employee Employee);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(int Id, Models.Employee Employee);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(int Id);
+        void SeedData();
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/Models/Employee.cs

@@ -4,7 +4,8 @@ namespace DamageAssesment.Api.Employees.Models
 {
     public class Employee
     {
-        public string Id { get; set; }
+        public int Id { get; set; }
+        public string EmployeeCode { get; set; }
         public string Name { get; set; }
         public DateTime BirthDate { get; set; }
         public string OfficePhoneNumber { get; set; }

DamageAssesmentApi/DamageAssesment.Api.Employees/Profiles/EmployeesProfile.cs

@@ -7,6 +7,7 @@ namespace DamageAssesment.Api.Employees.Profiles
         public EmployeesProfile()
         {
             CreateMap<Db.Employee, Models.Employee>();
+            CreateMap<Models.Employee, Db.Employee>();
         }
     }
 }

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()
@@ -45,12 +45,12 @@ namespace DamageAssesment.Api.Employees.Providers
 
         }
 
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(string Id)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(int Id)
         {
             try
             {
                 logger?.LogInformation("Query Employee");
-                var Employee = await EmployeeDbContext.Employees.AsNoTracking().FirstOrDefaultAsync(q => q.Id.ToLower() == Id.ToLower());
+                var Employee = await EmployeeDbContext.Employees.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
                 if (Employee != null)
                 {
                     logger?.LogInformation($"{Employee} customer(s) found");
@@ -65,19 +65,21 @@ 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))
+                if (!EmployeeCodeExists(Employee.EmployeeCode))
                 {
-                    EmployeeDbContext.Employees.Add(Employee);
+                    EmployeeDbContext.Employees.Add(_employee);
+                    Employee.Id = _employee.Id;
                     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");
+                return (false, null, "Employee code is already exits");
             }
             catch (Exception ex)
             {
@@ -85,19 +87,21 @@ 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(int 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 == Id).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");
+                        Employee.Id = Id;
+                        return (true, Employee, "Successful");
                     }
                     else
                     {
@@ -118,11 +122,11 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(string Id)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(int Id)
         {
             try
             {
-                Db.Employee Employee = EmployeeDbContext.Employees.AsNoTracking().Where(a => a.Id.ToLower() == Id.ToLower()).FirstOrDefault();
+                Db.Employee Employee = EmployeeDbContext.Employees.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
                 if (Employee == null)
                 {
                     return (false, null, "Not Found");
@@ -135,24 +139,29 @@ namespace DamageAssesment.Api.Employees.Providers
             {
 
                 logger?.LogError(ex.ToString());
-                return (false,null, ex.Message);
+                return (false, null, ex.Message);
             }
         }
-        private bool EmployeeExists(string id)
+        private bool EmployeeExists(int id)
         {
-            return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id.ToLower() == id.ToLower()) > 0;
+            return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id == id) > 0;
         }
 
-        private void SeedData()
+        private bool EmployeeCodeExists(string employeeCode)
+        {
+            return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.EmployeeCode.ToLower() == employeeCode.ToLower()) > 0;
+        }
+
+        public void SeedData()
         {
             if (!EmployeeDbContext.Employees.Any())
             {
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678",BirthDate=DateTime.Now.AddYears(-18), IsActive = true,PreferredLanguage="en" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30) ,IsActive = true, PreferredLanguage = "fr" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20) ,IsActive = true, PreferredLanguage = "en" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23) ,IsActive = true, PreferredLanguage = "es" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32) ,IsActive = true, PreferredLanguage = "es" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "10101", Name = "David", Email = "david@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "20202", Name = "Smith", Email = "smith@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
+                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 3, EmployeeCode = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30), IsActive = true, PreferredLanguage = "fr" });
+                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 4, EmployeeCode = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20), IsActive = true, PreferredLanguage = "en" });
+                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" });
+                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 6, EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), IsActive = true, PreferredLanguage = "es" });
                 EmployeeDbContext.SaveChanges();
             }
 

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

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()
+
+        [Fact(DisplayName = "Get Locations by Id- Ok case")]
+        public async Task GetLocationsByIdAsync_ShouldReturnStatusCode200()
         {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
-            .Options;
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getOkResponseLocation(1);
+            mockLocationService.Setup(service => service.GetLocationByIdAsync(1)).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 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);
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.GetLocationByIdAsync(1);
 
-            Assert.True(Location.IsSuccess);
-            Assert.Null(Location.ErrorMessage);
+            Assert.Equal(200, result.StatusCode);
         }
-        [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"
 
-                    });
-                }
-                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(1)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (NotFoundResult)await locationProvider.GetLocationByIdAsync(1);
+
+            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(1);
+            var mockInputLocation = new Models.Location { Id = 1, RegionId = 1, 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 = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.PostLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (BadRequestObjectResult)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 = 1, LocationCode ="Loc1", RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.UpdateLocationAsync(1,mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.UpdateLocation(1,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 = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.UpdateLocationAsync(1,mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (NotFoundResult)await locationProvider.UpdateLocation(1,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(1)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.DeleteLocation(1);
+
+            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(1)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (NotFoundResult)await locationProvider.DeleteLocation(1);
+
+            Assert.Equal(404, result.StatusCode);
         }
 
         //Tests for regions
@@ -172,11 +180,11 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task GetRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse("1");
-            mockRegionService.Setup(service => service.GetRegionByIdAsync("1")).ReturnsAsync(mockResponse);
+            var mockResponse = await MockData.getOkResponse(1);
+            mockRegionService.Setup(service => service.GetRegionByIdAsync(1)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.GetRegionAsync("1");
+            var result = (OkObjectResult)await regionProvider.GetRegionAsync(1);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -186,18 +194,18 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockRegionService.Setup(service => service.GetRegionByIdAsync("99")).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.GetRegionByIdAsync(99999)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundResult)await regionProvider.GetRegionAsync("99");
+            var result = (NotFoundResult)await regionProvider.GetRegionAsync(99);
             Assert.Equal(404, result.StatusCode);
         }
 
         [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");
+            var mockResponse = await MockData.getOkResponse(1);
             var mockInputRegion = await MockData.getInputRegionData();
             mockRegionService.Setup(service => service.PostRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
 
@@ -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();
@@ -225,68 +233,68 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task PutRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse("1");
+            var mockResponse = await MockData.getOkResponse(1);
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(1,mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
+            var result = (OkObjectResult)await regionProvider.PutRegionAsync(1,mockInputRegion);
 
             Assert.Equal(200, result.StatusCode);
         }
 
         [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();
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(1, mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
+            var result = (NotFoundObjectResult)await regionProvider.PutRegionAsync(1,mockInputRegion);
 
             Assert.Equal(404, result.StatusCode);
         }
 
         [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();
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(1, mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (BadRequestObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
+            var result = (BadRequestObjectResult)await regionProvider.PutRegionAsync(1, mockInputRegion);
 
             Assert.Equal(400, result.StatusCode);
         }
 
         [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");
+            var mockResponse = await MockData.getOkResponse(1);
 
-            mockRegionService.Setup(service => service.DeleteRegionAsync("1")).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.DeleteRegionAsync(1)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.DeleteRegionAsync("1");
+            var result = (OkObjectResult)await regionProvider.DeleteRegionAsync(1);
 
             Assert.Equal(200, result.StatusCode);
         }
 
         [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();
 
-            mockRegionService.Setup(service => service.DeleteRegionAsync("1")).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.DeleteRegionAsync(1)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundResult)await regionProvider.DeleteRegionAsync("1");
+            var result = (NotFoundResult)await regionProvider.DeleteRegionAsync(1);
 
             Assert.Equal(404, result.StatusCode);
         }

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

@@ -9,17 +9,52 @@ namespace DamageAssesment.Api.Locations.Test
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Locations.Models.Region { Id = "R" + i, Abbreviation = "AB" + i, Name = "Region " + i });
+                list.Append(new Locations.Models.Region { Id = i, Abbreviation = "AB" + i, Name = "Region " + i });
             }
             return (true, list, null);
         }
 
 
-        public static async Task<(bool, Locations.Models.Region, string)> getOkResponse(string Id)
+        public static async Task<(bool, Locations.Models.Region, string)> getOkResponse(int 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 = i, RegionId = 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(int Id)
+        {
+            var locations = await getOkResponseLocation();
+            var location = locations.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, location, null);
+        }
+
+        public static async Task<(bool, Models.Location, string)> getLocation(bool value, string message)
+        {
+            var location = new Models.Location { Id = 1, LocationCode = "Loc1", RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            return (value, location, 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()
@@ -39,8 +74,7 @@ namespace DamageAssesment.Api.Locations.Test
 
         public static async Task<Locations.Models.Region> getInputRegionData()
         {
-            return new Locations.Models.Region { Id = "R99", Name = "Region 99", Abbreviation = "A99" };
+            return new Locations.Models.Region { Id = 99999, Name = "Region 99", Abbreviation = "A99" };
         }
-
     }
 }

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

@@ -4,12 +4,10 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Locations.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class LocationsController : ControllerBase
     {
         private ILocationsProvider LocationProvider;
-
         public LocationsController(ILocationsProvider LocationsProvider)
         {
             this.LocationProvider = LocationsProvider;
@@ -18,24 +16,24 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// Get all locations.
         /// </summary>
 
-        [HttpGet("Locations")]
+        [HttpGet("locations")]
         public async Task<ActionResult> GetLocationsAsync()
         {
 
             var result = await LocationProvider.GetLocationsAsync();
             if (result.IsSuccess)
             {
-                return Ok(result.locations);
+                return Ok(result.Locations);
             }
-            return NotFound();
+            return NoContent();
 
         }
         /// <summary>
         /// Get all locations based on locationdId.
         /// </summary>
 
-        [HttpGet("Locations/{id}")]
-        public async Task<ActionResult> GetLocationByIdAsync(string id)
+        [HttpGet("locations/{id}")]
+        public async Task<ActionResult> GetLocationByIdAsync(int id)
         {
 
             var result = await LocationProvider.GetLocationByIdAsync(id);
@@ -50,15 +48,15 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// Update a Location.
         /// </summary>
 
-        [HttpPut("Locations")]
-        public async Task<IActionResult> UpdateLocation(Db.Location Location)
+        [HttpPut("locations/{id}")]
+        public async Task<IActionResult> UpdateLocation(int id, Models.Location Location)
         {
             if (Location != null)
             {
-                var result = await this.LocationProvider.UpdateLocationAsync(Location);
+                var result = await this.LocationProvider.UpdateLocationAsync(id, Location);
                 if (result.IsSuccess)
                 {
-                    return Ok(result.ErrorMessage);
+                    return Ok(result.Location);
                 }
                 return NotFound();
             }
@@ -68,31 +66,31 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// Save a new location.
         /// </summary>
 
-        [HttpPost("Locations")]
-        public async Task<IActionResult> CreateLocation(Db.Location Location)
+        [HttpPost("locations")]
+        public async Task<IActionResult> CreateLocation(Models.Location Location)
         {
             if (Location != null)
             {
                 var result = await this.LocationProvider.PostLocationAsync(Location);
                 if (result.IsSuccess)
                 {
-                    return Ok(result.Question);
+                    return Ok(result.Location);
                 }
-                return NotFound();
+                return BadRequest(result.ErrorMessage);
             }
-            return CreatedAtRoute("DefaultApi", new { id = Location.Id }, Location);
+            return BadRequest();
         }
         /// <summary>
         /// Delete an existing location.
         /// </summary>
 
-        [HttpDelete("Locations/{id}")]
-        public async Task<IActionResult> DeleteLocation(string id)
+        [HttpDelete("locations/{id}")]
+        public async Task<IActionResult> DeleteLocation(int id)
         {
             var result = await this.LocationProvider.DeleteLocationAsync(id);
             if (result.IsSuccess)
             {
-                return Ok(result.ErrorMessage);
+                return Ok(result.Location);
             }
             return NotFound();
         }

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

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Locations.Controllers
 {
-    [Route("api/[controller]")]
     [ApiController]
     public class RegionsController : ControllerBase
     {
@@ -14,16 +13,16 @@ namespace DamageAssesment.Api.Locations.Controllers
             this.regionProvider = regionProvider;
         }
         /// <summary>
-        /// Get all regions.
+        /// Get all regions.2
         /// </summary>
 
-        [HttpGet]
+        [HttpGet("regions")]
         public async Task<ActionResult> GetRegionsAsync()
         {
             var result = await regionProvider.GetRegionsAsync();
             if (result.IsSuccess)
             {
-                return Ok(result.regions);
+                return Ok(result.Regions);
             }
             return NoContent();
         }
@@ -31,10 +30,10 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// GET request for retrieving a region by its ID.
         /// </summary>
 
-        [HttpGet("{Id}")]
-        public async Task<ActionResult> GetRegionAsync(string Id)
+        [HttpGet("regions/{id}")]
+        public async Task<ActionResult> GetRegionAsync(int id)
         {
-            var result = await this.regionProvider.GetRegionByIdAsync(Id);
+            var result = await this.regionProvider.GetRegionByIdAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Region);
@@ -45,7 +44,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// POST request for creating a new region.
         /// </summary>
 
-        [HttpPost]
+        [HttpPost("regions")]
         public async Task<ActionResult> PostRegionAsync(Models.Region region)
         {
             var result = await this.regionProvider.PostRegionAsync(region);
@@ -59,10 +58,10 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// PUT request for updating an existing region.
         /// </summary>
 
-        [HttpPut]
-        public async Task<ActionResult> PutRegionAsync(Models.Region region)
+        [HttpPut("regions/{id}")]
+        public async Task<ActionResult> PutRegionAsync(int id, Models.Region region)
         {
-            var result = await this.regionProvider.PutRegionAsync(region);
+            var result = await this.regionProvider.PutRegionAsync(id,region);
             if (result.IsSuccess)
             {
                 return Ok(result.Region);
@@ -77,10 +76,10 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// </summary>
 
 
-        [HttpDelete("{Id}")]
-        public async Task<ActionResult> DeleteRegionAsync(string Id)
+        [HttpDelete("regions/{id}")]
+        public async Task<ActionResult> DeleteRegionAsync(int id)
         {
-            var result = await this.regionProvider.DeleteRegionAsync(Id);
+            var result = await this.regionProvider.DeleteRegionAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Region);

DamageAssesmentApi/DamageAssesment.Api.Locations/Db/Location.cs

@@ -3,21 +3,24 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Locations.Db
 {
+    [Table("Locations")]
     public class Location
     {
         [Key]
+        public int Id { get; set; }
+        [ForeignKey("Region")]
+        public int RegionId { get; set; }
         [StringLength(4)]
-        public string Id { get; set; }
+        public string LocationCode { get; set; }
 
         [StringLength(50)]
         public string Name { get; set; }
 
-        [StringLength(1)]
+        [StringLength(4)]
         public string MaintenanceCenter { get; set; }
 
         [StringLength(2)]
         public string SchoolType { get; set; }
-        [ForeignKey("Region")]
-        public string RegionId { get; set; }
+
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Db/LocationDbContext.cs

@@ -2,7 +2,7 @@
 
 namespace DamageAssesment.Api.Locations.Db
 {
-    public class LocationDbContext:DbContext
+    public class LocationDbContext : DbContext
     {
         public DbSet<Db.Location> Locations { get; set; }
         public DbSet<Db.Region> Regions { get; set; }
@@ -10,5 +10,17 @@ namespace DamageAssesment.Api.Locations.Db
         {
 
         }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<Location>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<Region>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+
+        }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Db/Region.cs

@@ -1,19 +1,18 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Locations.Db
 {
+    [Table("Regions")]
     public class Region
     {
         [Key]
-        [StringLength(2)]
-        public string Id { get; set; }
-
+        public int Id { get; set; }
+  
         [StringLength(50)]
         public string Name { get; set; }
 
         [StringLength(5)]
         public string Abbreviation { get; set; }
-
-       // public ICollection<Location> Locations { get; set; }
     }
 }

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

@@ -4,10 +4,11 @@ namespace DamageAssesment.Api.Locations.Interfaces
 {
     public interface ILocationsProvider
     {
-        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, string ErrorMessage)> DeleteLocationAsync(string Id);
+        Task<(bool IsSuccess, IEnumerable<Models.Location> Locations, string ErrorMessage)> GetLocationsAsync();
+        Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> GetLocationByIdAsync(int Id);
+        Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> PostLocationAsync(Models.Location Location);
+        Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> UpdateLocationAsync(int Id, Models.Location Location);
+        Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> DeleteLocationAsync(int Id);
+        void SeedData();
     }
 }

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

@@ -2,10 +2,11 @@
 {
     public interface IRegionsProvider
     {
-        Task<(bool IsSuccess, IEnumerable<Models.Region> regions, string ErrorMessage)> GetRegionsAsync();
-        Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(string Id);
+        Task<(bool IsSuccess, IEnumerable<Models.Region> Regions, string ErrorMessage)> GetRegionsAsync();
+        Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(int Id);
         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);
+        Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> PutRegionAsync(int Id, Models.Region region);
+        Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> DeleteRegionAsync(int Id);
+        void SeedData();
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Models/Location.cs

@@ -4,19 +4,12 @@ namespace DamageAssesment.Api.Locations.Models
 {
     public class Location
     {
-        [StringLength(4)]
-        public string Id { get; set; }
-
-        [StringLength(1)]
-        public string RegionId { get; set; }
-
-        [StringLength(50)]
+        [Key]
+        public int Id { get; set; }
+        public int RegionId { get; set; }
+        public string LocationCode { get; set; }
         public string Name { get; set; }
-
-        [StringLength(1)]
         public string MaintenanceCenter { get; set; }
-
-        [StringLength(2)]
         public string SchoolType { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Models/Region.cs

@@ -4,14 +4,8 @@ namespace DamageAssesment.Api.Locations.Models
 {
     public class Region
     {
-        
-        [StringLength(1)]
-        public string Id { get; set; }
-
-        [StringLength(50)]
+        public int Id { get; set; }
         public string Name { get; set; }
-
-        [StringLength(5)]
         public string Abbreviation { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Profiles/LocationProfile.cs

@@ -5,6 +5,7 @@
         public LocationProfile()
         {
             CreateMap<Db.Location, Models.Location>();
+            CreateMap<Models.Location, Db.Location>();
         }
     }
 }

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,42 +17,19 @@ 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()
-        {
-
-            try
-            {
-                logger?.LogInformation("Query Question");
-                var Location = await locationDbContext.Locations.AsNoTracking().ToListAsync();
-                if (Location != null)
-                {
-                    logger?.LogInformation($"{Location.Count} Locations(s) found");
-                    var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(Location);
-                    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.Location Location, string ErrorMessage)> GetLocationByIdAsync(string Id)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Location> Locations, string ErrorMessage)> GetLocationsAsync()
         {
             try
             {
                 logger?.LogInformation("Query Location");
-                var Location = await locationDbContext.Locations.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
-                if (Location != null)
+                var locations = await locationDbContext.Locations.AsNoTracking().ToListAsync();
+                if (locations != null)
                 {
-                    logger?.LogInformation($"{Location} customer(s) found");
-                    var result = mapper.Map<Db.Location, Models.Location>(Location);
+                    logger?.LogInformation($"{locations.Count} Locations(s) found");
+                    var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(locations);
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -63,21 +40,42 @@ 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 Location, string ErrorMessage)> GetLocationByIdAsync(int Id)
         {
             try
             {
                 logger?.LogInformation("Query Location");
-                if (!LocationExists(Location.Id))
+                var location = await locationDbContext.Locations.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                if (location != null)
                 {
-                    locationDbContext.Locations.Add(Location);
-                    locationDbContext.SaveChanges();
-                    var result = mapper.Map<Db.Location, Models.Location>(Location);
+                    logger?.LogInformation($"{location}  found");
+                    var result = mapper.Map<Db.Location, Models.Location>(location);
                     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.Location Location, string ErrorMessage)> PostLocationAsync(Models.Location location)
+        {
+            try
+            {
+                if (!LocationCodeExists(location.LocationCode))
+                {
+                    Db.Location _location = mapper.Map<Models.Location, Db.Location>(location);
+                    locationDbContext.Locations.Add(_location);
+                    await locationDbContext.SaveChangesAsync();
+                    location.Id = _location.Id;
+                    return (true, location, null);
+                }
                 else
                 {
-                    return (false, null, "Location is Already exists");
+                    return (false, null, "Location code is already exists");
                 }
             }
             catch (Exception ex)
@@ -86,56 +84,68 @@ 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, Models.Location Location, string ErrorMessage)> UpdateLocationAsync(int Id, Models.Location location)
         {
             try
             {
-                locationDbContext.Entry(Location).State = EntityState.Modified;
-                locationDbContext.SaveChanges();
-                return (true, "Record updated successfully");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, string ErrorMessage)> DeleteLocationAsync(string Id)
-        {
-            try
-            {
-                Db.Location Location = locationDbContext.Locations.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
-                if (Location == null)
+                if (LocationExists(Id))
                 {
-                    return (false, "record not found");
+                    Db.Location _location = mapper.Map<Models.Location, Db.Location>(location);
+                    locationDbContext.Entry(_location).State = EntityState.Modified;
+                    await locationDbContext.SaveChangesAsync();
+                    return (true, location, "Record updated successfully");
+                }
+                else
+                {
+                    return (false, null, "Location is not exists");
                 }
-                locationDbContext.Locations.Remove(Location);
-                locationDbContext.SaveChanges();
-                return (true, "Record deleted successfully");
             }
             catch (Exception ex)
             {
-
                 logger?.LogError(ex.ToString());
-                return (false, ex.Message);
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> DeleteLocationAsync(int Id)
+        {
+            try
+            {
+                Db.Location location = locationDbContext.Locations.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
+                if (location == null)
+                {
+                    return (false, null, "record not found");
+                }
+                locationDbContext.Locations.Remove(location);
+                await locationDbContext.SaveChangesAsync();
+                return (true, mapper.Map<Db.Location, Models.Location>(location), "Record deleted successfully");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
             }
         }
 
-        private bool LocationExists(string id)
+        private bool LocationExists(int id)
         {
             return locationDbContext.Locations.AsNoTracking().Count(e => e.Id == id) > 0;
         }
-        private void SeedData()
+
+        private bool LocationCodeExists(string locationCode)
+        {
+            return locationDbContext.Locations.AsNoTracking().Count(e => e.LocationCode.ToLower() == locationCode.ToLower()) > 0;
+        }
+        public void SeedData()
         {
             if (!locationDbContext.Locations.Any())
             {
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc1", RegionId = "1", Name = "BOB GRAHAM EDUCATION CENTER 1", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc2", RegionId = "2", Name = "BOB GRAHAM EDUCATION CENTER 2", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc3", RegionId = "3", Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc4", RegionId = "1", Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc5", RegionId = "2", Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc6", RegionId = "3", Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0091", RegionId = 5, Name = "BOB GRAHAM EDUCATION CENTER", MaintenanceCenter = "1", SchoolType = "K8" });
+                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0092", RegionId = 1, Name = "NORMAN S. EDELCUP/SUNNY ISLES BEACH K-8", MaintenanceCenter = "1", SchoolType = "K8" });
+                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "7511", RegionId = 4, Name = "MIAMI SPRINGS SHS", MaintenanceCenter = "2", SchoolType = "S" });
+                //locationDbContext.Locations.Add(new Db.Location() { Id = 3, LocationCode = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
+                //locationDbContext.Locations.Add(new Db.Location() { Id = 4, LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
+                //locationDbContext.Locations.Add(new Db.Location() { Id = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });
+                //locationDbContext.Locations.Add(new Db.Location() { Id = 6, LocationCode = "Loc6", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
                 locationDbContext.SaveChanges();
             }
 

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,10 +16,10 @@ 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)
+        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(int Id)
         {
             try
             {
@@ -42,7 +41,7 @@ namespace DamageAssesment.Api.Locations.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Region> regions, string ErrorMessage)> GetRegionsAsync()
+        public async Task<(bool IsSuccess, IEnumerable<Models.Region> Regions, string ErrorMessage)> GetRegionsAsync()
         {
             try
             {
@@ -70,11 +69,10 @@ namespace DamageAssesment.Api.Locations.Providers
             {
                 if (region != null)
                 {
-                    var regions = await locationDbContext.Regions.AsNoTracking().ToListAsync();
-
-                    region.Id = Convert.ToString(regions.Count + 1);
-                    locationDbContext.Regions.Add(mapper.Map<Models.Region, Db.Region>(region));
-                    locationDbContext.SaveChanges();
+                    var _region = mapper.Map<Models.Region, Db.Region>(region);
+                    locationDbContext.Regions.Add(_region);
+                    await locationDbContext.SaveChangesAsync();
+                    region.Id = _region.Id;
                     logger?.LogInformation($"{region} added successfuly");
                     return (true, region, "Successful");
                 }
@@ -91,30 +89,38 @@ namespace DamageAssesment.Api.Locations.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> PutRegionAsync(Models.Region region)
+        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> PutRegionAsync(int Id, Models.Region region)
         {
             try
             {
                 if (region != null)
                 {
-                    var _region = await locationDbContext.Regions.AsNoTracking().Where(s => s.Id == region.Id).FirstOrDefaultAsync();
+                    var _region = await locationDbContext.Regions.AsNoTracking().Where(s => s.Id == Id).FirstOrDefaultAsync();
 
                     if (_region != null)
                     {
-                        locationDbContext.Regions.Update(mapper.Map<Models.Region, Db.Region>(region));
-                        locationDbContext.SaveChanges();
-                        return (true, region, "Region updated Successfuly");
+                        if (RegionExists(region.Id))
+                        {
+                            locationDbContext.Regions.Update(mapper.Map<Models.Region, Db.Region>(region));
+                            locationDbContext.SaveChanges();
+                            return (true, region, "Region updated Successfuly");
+                        }
+                        else
+                        {
+                            logger?.LogInformation($"RegionID: {Id} Not exists");
+                            return (false, null, "Region not exists");
+                        }
                     }
                     else
                     {
-                        logger?.LogInformation($"RegionID: {region.Id} Not found");
+                        logger?.LogInformation($"RegionID: {Id} Not found");
                         return (false, null, "Not Found");
                     }
 
                 }
                 else
                 {
-                    logger?.LogInformation($"RegionID: {region.Id} Bad Request");
+                    logger?.LogInformation($"RegionID: {Id} Bad Request");
                     return (false, null, "Bad request");
                 }
             }
@@ -125,7 +131,7 @@ namespace DamageAssesment.Api.Locations.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> DeleteRegionAsync(string Id)
+        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> DeleteRegionAsync(int Id)
         {
             try
             {
@@ -150,13 +156,20 @@ namespace DamageAssesment.Api.Locations.Providers
             }
         }
 
-        private void SeedData()
+        private bool RegionExists(int id)
+        {
+            return locationDbContext.Regions.AsNoTracking().Count(e => e.Id == id) > 0;
+        }
+
+        public void SeedData()
         {
             if (!locationDbContext.Regions.Any())
             {
-                locationDbContext.Regions.Add(new Db.Region() { Id = "1", Name = "North", Abbreviation = "N" });
-                locationDbContext.Regions.Add(new Db.Region() { Id = "2", Name = "South", Abbreviation = "S" });
-                locationDbContext.Regions.Add(new Db.Region() { Id = "3", Name = "Central", Abbreviation = "C" });
+                locationDbContext.Regions.Add(new Db.Region() { Name = "North", Abbreviation = "N" });
+                locationDbContext.Regions.Add(new Db.Region() { Name = "Central", Abbreviation = "C" });
+                locationDbContext.Regions.Add(new Db.Region() { Name = "South", Abbreviation = "S" });
+                locationDbContext.Regions.Add(new Db.Region() { Name = "Charter Schools", Abbreviation = "CS" });
+                locationDbContext.Regions.Add(new Db.Region() { Name = "Alternate and Special Centers", Abbreviation = "AC" });
                 locationDbContext.SaveChanges();
             }
         }

DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

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")]
+        [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(int id, string? language)
         {
-            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);
@@ -72,7 +71,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// PUT request for updating a question (multilingual).
         /// </summary>
 
-        [HttpPut("Questions")]
+        [HttpPut("questions")]
         public async Task<IActionResult> UpdateQuestion(Models.Question question)
         {
             if (question != null)
@@ -93,7 +92,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question (multilingual).
         /// </summary>
 
-        [HttpPost("Questions")]
+        [HttpPost("questions")]
         public async Task<IActionResult> CreateQuestion(Models.Question question)
         {
             if (question != null)
@@ -111,7 +110,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question based on ID.
         /// </summary>
 
-        [HttpDelete("Questions/{id}")]
+        [HttpDelete("questions/{id}")]
         public async Task<IActionResult> DeleteQuestion(int id)
         {
             var result = await this.questionsProvider.DeleteQuestionAsync(id);
@@ -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,16 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Questions.Db
+{
+    [Table("QuestionCategoryTrans")]
+    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/Question.cs

@@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
+    [Table("Questions")]
     public class Question
     {
         [Key]

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

@@ -1,14 +1,16 @@
 using System.Buffers.Text;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
+    [Table("QuestionCategories")]
     public class QuestionCategory
     {
         [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/Db/QuestionType.cs

@@ -1,7 +1,9 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
+    [Table("QuestionTypes")]
     public class QuestionType
     {
         [Key]

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

@@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
+    [Table("QuestionTrans")]
     public class QuestionsTranslation
     {
         [Key]

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.MultiLanguage Question, string ErrorMessage)> GetQuestionAsync(int id, string language);
+        Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language);
+        Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string language);
+        Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
+        Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
+        Task<(bool IsSuccess, Models.MultiLanguage 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

@@ -1,23 +1,18 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.Questions.Models
+namespace DamageAssesment.Api.Questions.Models
 {
-    public class Question
+     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;
-
         public int QuestionNumber { get; set; }
         public bool IsRequired { get; set; }
         public bool Comment { get; set; }
-
         public bool Key { get; set; }
         public int? SurveyId { get; set; }
         public int CategoryId { get; set; }
-        // public int? Survey_SurveyID { get; set; }
     }
 }

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

@@ -3,6 +3,10 @@
     public class QuestionsTranslation
     {
         public string QuestionText { get; set; }
-        public string Language { get; set; } = "En";
+        public string Language { get; set; } = "en";
+    }
+    public class MultiLanguage : BaseQuestion
+    {
+        public Dictionary<string,string> Text { get; set; }
     }
 }

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

@@ -3,8 +3,9 @@
     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 object CategoryNames { get; set; }
+        public List<MultiLanguage> QuestionsText { 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.MultiLanguage>().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

@@ -2,7 +2,6 @@ using DamageAssesment.Api.Questions.Db;
 using DamageAssesment.Api.Questions.Interfaces;
 using DamageAssesment.Api.Questions.Providers;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
 using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -16,7 +15,6 @@ builder.Services.AddControllers();
 builder.Services.AddScoped<IQuestionsProvider, QuestionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 
-
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
 builder.Services.AddSwaggerGen(c =>
@@ -37,6 +35,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

@@ -2,9 +2,7 @@
 using DamageAssesment.Api.Questions.Db;
 using DamageAssesment.Api.Questions.Interfaces;
 using DamageAssesment.Api.Questions.Models;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace DamageAssesment.Api.Questions.Providers
 {
@@ -21,52 +19,229 @@ namespace DamageAssesment.Api.Questions.Providers
             this.questionDbContext = questionDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+           // SeedData();
         }
 
-        private void SeedData()
+        public void SeedData()
         {
-
-            if (!questionDbContext.QuestionsTranslations.Any())
-            {
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 1, QuestionId = 1, QuestionText = "Can You Open ?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 2, QuestionId = 1, QuestionText = "Peux-tu ouvrir ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 3, QuestionId = 2, QuestionText = "Are the grounds flodded ?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 4, QuestionId = 2, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 5, QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 6, QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 7, QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 8, QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 9, QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
-                questionDbContext.SaveChanges();
-            }
-            if (!questionDbContext.Questions.Any())
-            {
-                questionDbContext.Questions.Add(new Db.Question() { Id = 1,  QuestionTypeId = 2, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1 });
-                questionDbContext.Questions.Add(new Db.Question() { Id = 2,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false,  CategoryId = 1 });
-                questionDbContext.Questions.Add(new Db.Question() { Id = 3,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true,  CategoryId = 2 });
-                questionDbContext.SaveChanges();
-            }
             if (!questionDbContext.QuestionTypes.Any())
             {
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 1, TypeText = "RadioButton" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 2, TypeText = "CheckBox" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 3, TypeText = "TextBox" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "RadioButton" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "CheckBox" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" });
                 questionDbContext.SaveChanges();
             }
 
             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() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Structural", IconLibrary = "https://example.com/images/img3.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Utility", IconLibrary = "https://example.com/images/img4.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Debris", IconLibrary = "https://example.com/images/img5.png" });
+                questionDbContext.SaveChanges();
+            }
+
+            if (!questionDbContext.CategoryTranslations.Any())
+            {
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 1, Title = "Flooding", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 2, Title = "Electrical", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 3, Title = "Structural", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 4, Title = "Utility", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 5, Title = "Debris", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 1, Title = "Inondation", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 2, Title = "Électrique", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 3, Title = "De construction", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 4, Title = "Utilitaire", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 5, Title = "Débris", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 1, Title = "Inundación", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 2, Title = "Eléctrica", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 3, Title = "Estructural", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 4, Title = "Utilidad", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 5, Title = "Escombros", Language = "es" });
+                questionDbContext.SaveChanges();
+            }
+
+            if (!questionDbContext.Questions.Any())
+            {
+                var question1 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
+                var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
+                var question3 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
+                var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
+                var question5 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
+                var question6 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
+                var question7 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 3};
+                var question8 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 };
+                var question9 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = true, Key = true, CategoryId = 5 };
+                var question10 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = false, Key = true, CategoryId = 1 };
+                var question11 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 2 };
+                var question12 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 };
+                var question13 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 4 };
+                var question14 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 5 };
+                var question15 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 };
+                var question16 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 2 };
+                var question17 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 3 };
+                var question18 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 };
+                var question19 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 5 };
+                var question20 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
+                var question21 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 2 };
+                var question22 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 };
+
+                questionDbContext.Questions.Add(question1);
+                questionDbContext.Questions.Add(question2);
+                questionDbContext.Questions.Add(question3);
+                questionDbContext.Questions.Add(question4);
+                questionDbContext.Questions.Add(question5);
+                questionDbContext.Questions.Add(question6);
+                questionDbContext.Questions.Add(question7);
+                questionDbContext.Questions.Add(question8);
+                questionDbContext.Questions.Add(question9);
+                questionDbContext.Questions.Add(question10);
+                questionDbContext.Questions.Add(question11);
+                questionDbContext.Questions.Add(question12);
+                questionDbContext.Questions.Add(question13);
+                questionDbContext.Questions.Add(question14);
+                questionDbContext.Questions.Add(question15);
+                questionDbContext.Questions.Add(question16);
+                questionDbContext.Questions.Add(question17);
+                questionDbContext.Questions.Add(question18);
+                questionDbContext.Questions.Add(question19);
+                questionDbContext.Questions.Add(question20);
+                questionDbContext.Questions.Add(question21);
+                questionDbContext.Questions.Add(question22);
+
+                questionDbContext.SaveChanges();
+            }
+
+            if (!questionDbContext.QuestionsTranslations.Any())
+            {
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Can You Open ?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Peux-tu ouvrir ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Are the grounds flooded ?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Are the grounds flooded ?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
+
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Can you open?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Is debris blocking access?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Are the grounds flooded?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "Is the access blocked by flooding?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Are any utility wires down?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Do you have damage to windows, doors, or walls?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Do you have roof damage?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Do you have major water intrusion?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Are any portable classrooms damaged and unusable?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Does your facility need to be secured/boarded?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Are you without commercial power?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Are you without water pressure?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Are you without telephones?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Are traffic signals damaged/missing?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "Are you without an operable fire alarm?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "Are you without an operable public address?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Do you have major debris?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Are there any problems or issues not addressed above that would impede you from opening? If yes, please explain below?", Language = "en" });
+
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Pouvez-vous ouvrir ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Est-ce que des débris bloquent l'accès ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "L'accès est-il bloqué par des inondations ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Des câbles d'utilité sont-ils tombés ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Avez-vous des dommages aux fenêtres, portes ou murs ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Avez-vous des dommages au toit ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Avez-vous une intrusion d'eau majeure ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Les salles de classe portables sont-elles endommagées et inutilisables ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Votre établissement a-t-il besoin d'être sécurisé/protégé ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Êtes-vous sans alimentation électrique commerciale ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Êtes-vous sans pression d'eau ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Êtes-vous sans téléphones ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Les feux de circulation sont-ils endommagés/absents ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "N'avez-vous pas d'alarme incendie fonctionnelle ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "N'avez-vous pas de système de sonorisation opérationnel ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Avez-vous une grande quantité de débris ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Y a-t-il des problèmes ou des problèmes non abordés ci-dessus qui vous empêcheraient d'ouvrir ? Si oui, veuillez expliquer ci-dessous.", Language = "fr" });
+
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "¿Puedes abrir ?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "¿Los escombros bloquean el acceso?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "¿Hay cables de utilidad caídos?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "¿Tienes daños en ventanas, puertas o paredes?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "¿Tienes daños en el techo?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "¿Tienes una gran intrusión de agua?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "¿Hay aulas portátiles dañadas e inutilizables?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "¿Tu instalación necesita ser asegurada/tabicada?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "¿No tienes energía comercial?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "¿No tienes presión de agua?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "¿No tienes teléfonos?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "¿Los semáforos están dañados/faltan?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "¿No tienes una alarma de incendios operativa?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "¿No tienes un sistema de megafonía operativo?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "¿Tienes una gran cantidad de escombros?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "¿Hay algún problema o asunto no abordado anteriormente que le impida abrir? Si es así, por favor explíquelo a continuación.", 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 Dictionary<string, string> 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 dict;
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language)
         {
             try
             {
@@ -76,21 +251,10 @@ namespace DamageAssesment.Api.Questions.Providers
                 {
 
                     //logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.Question>>(questions);
-
-
-                    foreach (var question in result)
+                    var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.MultiLanguage>>(questions);
+                    foreach (var item 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());
-                        }
+                        item.Text = CreateMultiLanguageObject(GetQuestionsTranslations(item.Id, language));
                     }
                     return (true, result, null);
                 }
@@ -102,27 +266,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.MultiLanguage 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.MultiLanguage>(question);                    
+                    result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(id, language));
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -133,27 +287,15 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public List<Models.Question> GetSurveyQuestion(List<Models.Question> questions, string Language)
+        public List<Models.MultiLanguage> GetSurveyQuestion(List<Models.MultiLanguage> questions, string language)
         {
-            if (string.IsNullOrEmpty(Language))
+            foreach (var item in questions)
             {
-                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.Text = 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 +312,10 @@ 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,
+                            CategoryNames= CreateCategoryMultiLanguageObject(GetCategoryTranslations(item.Id, language)),
+                            QuestionsText = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanguage>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language)
                         });
                     }
 
@@ -187,7 +330,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.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question)
         {
             try
             {
@@ -200,7 +343,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.MultiLanguage>(dbquestion);
+                result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id,""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -208,7 +353,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.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
         {
             try
             {
@@ -222,7 +367,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.MultiLanguage>(dbquestion);
+                result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -231,21 +378,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.MultiLanguage 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.MultiLanguage>(question);
+                    result.Text = 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 +407,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 +416,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 +431,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 +452,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 +476,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 +501,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.Questions/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

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.MultiLanguage>, string)> getOkResponse()
         {
-            IEnumerable<Questions.Models.Question> list = new List<Questions.Models.Question>();
+            IEnumerable<Questions.Models.MultiLanguage> list = new List<Questions.Models.MultiLanguage>();
 
             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.MultiLanguage { 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.MultiLanguage> question = new List<Models.MultiLanguage>();
+                question.Add(new Models.MultiLanguage { 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,
-                    Questions = question
+                    IconLibrary = "img" + i,
+                    IconName = "Category " + i,
+                    QuestionsText = question
                 });
             }
             return (true, list, null);
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getOkResponse(int Id)
+        public static async Task<(bool, Questions.Models.MultiLanguage, 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.MultiLanguage, string)> getBadRequestResponse()
         {
             return (false, null, "Bad Request");
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getNotFoundResponse()
+        public static async Task<(bool, Questions.Models.MultiLanguage, 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.MultiLanguage>, string)> getNoContentResponse()
         {
-            IEnumerable<Questions.Models.Question> list = new List<Questions.Models.Question>();
+            IEnumerable<Questions.Models.MultiLanguage> list = new List<Questions.Models.MultiLanguage>();
             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.Responses.Test/DamageAssesment.Api.Responses.Test.csproj

@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DamageAssesment.Api.SurveyResponses\DamageAssesment.Api.SurveyResponses.csproj" />
+    <ProjectReference Include="..\DamageAssesment.Api.Responses\DamageAssesment.Api.Responses.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -1,9 +1,9 @@
 
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using System.Collections.Generic;
 using System.Text;
 
-namespace DamageAssesment.Api.SurveyResponses.Test
+namespace DamageAssesment.Api.Responses.Test
 {
     public class MockData
     {
@@ -24,7 +24,7 @@ namespace DamageAssesment.Api.SurveyResponses.Test
 
         public static async Task<Models.SurveyResponse> getSurveyResponseObject()
         {
-            return new Models.SurveyResponse { EmployeeId = "Emp1", LocationId = "Loc1", SurveyId = 1, Id = 1 };
+            return new Models.SurveyResponse { EmployeeId = 1, LocationId = 1, SurveyId = 1, Id = 1 };
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Responses.Test/SurveyResponsesServiceTest.cs

@@ -1,12 +1,11 @@
-using DamageAssesment.Api.SurveyResponses.Controllers;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
-using DamageAssesment.Api.SurveyResponses.Test;
+using DamageAssesment.Api.Responses.Controllers;
+using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Models;
+using DamageAssesment.Api.Responses.Test;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore.Infrastructure;
 using Moq;
 using Xunit;
-using Xunit.Sdk;
+
 
 namespace DamageAssesment.SurveyResponses.Test
 {
@@ -18,133 +17,133 @@ namespace DamageAssesment.SurveyResponses.Test
             mockSurveyResponseService = new Mock<ISurveysResponse>();
         }
 
-        [Fact(DisplayName = "Get SurveyResponses - Ok case")]
+        [Fact(DisplayName = "Get Responses - Ok case")]
         public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync()).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync();
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "Get SurveyResponses - BadRequest case")]
-        public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode204()
-        {
-            var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync()).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync();
-            Assert.Equal(400, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "Get SurveyResponses by surveyId - Ok case")]
-        public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode200()
-        {
-            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
-            var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse);
             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId - NoContent case")]
+        [Fact(DisplayName = "Get Responses - BadRequest case")]
+        public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode204()
+        {
+            var mockResponse = await MockData.getResponse();
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
+            var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by surveyId - Ok case")]
+        public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse();
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1,1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by surveyId - NoContent case")]
         public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1,1)).ReturnsAsync(mockResponse);
             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
             Assert.Equal(204, result.StatusCode);
         }
 
 
 
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId and locationId - Ok case")]
+        [Fact(DisplayName = "Get Responses by surveyId and locationId - Ok case")]
         public async Task GetSurveyResponsesBySurveyLocationAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, "Loc1")).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1,1)).ReturnsAsync(mockResponse);
             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, "Loc1");
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1,1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId  and locationId - NoContent case")]
+        [Fact(DisplayName = "Get Responses by surveyId  and locationId - NoContent case")]
         public async Task GetSurveyResponsesBySurveyLocationAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, "Loc1")).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse);
             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, "Lo1");
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
             Assert.Equal(204, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId and QuestionId and Answer - Ok case")]
+        [Fact(DisplayName = "Get Responses by surveyId and QuestionId and Answer - Ok case")]
         public async Task GetSurveyResponsesBySurveyQuestionAnswerAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes")).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes",1)).ReturnsAsync(mockResponse);
             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes");
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes",1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId and QuestionId and Answer - NoContent case")]
+        [Fact(DisplayName = "Get Responses by surveyId and QuestionId and Answer - NoContent case")]
         public async Task GetSurveyResponsesBySurveyQuestionAnswerAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes")).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse);
             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes");
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes",1);
             Assert.Equal(204, result.StatusCode);
         }
 
 
-        [Fact(DisplayName = "Get SurveyResponses by region and surveyId - Ok case")]
+        [Fact(DisplayName = "Get Responses by region and surveyId - Ok case")]
         public async Task GetSurveyResponsesByRegionSurveyAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1,1)).ReturnsAsync(mockResponse);
             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1);
+            var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by region and surveyId - NoContent Case")]
+        [Fact(DisplayName = "Get Responses by region and surveyId - NoContent Case")]
         public async Task GetSurveyResponsesByRegionSurveyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse);
             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1);
+            var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by maintenanceCenter and surveyId - Ok case")]
+        [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - Ok case")]
         public async Task GetSurveyResponsesMaintenanceCenterSurveyAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse);
             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1);
+            var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by maintenanceCenter and surveyId - No Content  Case")]
+        [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - No Content  Case")]
         public async Task GetSurveyResponsesMaintenanceCenterSurveyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse);
             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1);
+            var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
 
@@ -159,7 +158,7 @@ namespace DamageAssesment.SurveyResponses.Test
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by maintenanceCenter and surveyId - NoContent Case")]
+        [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - NoContent Case")]
         public async Task GetSurveyResponsesByResponseIdyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
@@ -170,7 +169,7 @@ namespace DamageAssesment.SurveyResponses.Test
         }
 
 
-        [Fact(DisplayName = "Post SurveyResponses - Ok case")]
+        [Fact(DisplayName = "Post Responses - Ok case")]
         public async Task PostSurveyAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
@@ -181,7 +180,7 @@ namespace DamageAssesment.SurveyResponses.Test
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Post SurveyResponses - BadRequest case")]
+        [Fact(DisplayName = "Post Responses - BadRequest case")]
         public async Task PostSurveyAsync_ShouldReturnStatusCode400()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
@@ -192,7 +191,7 @@ namespace DamageAssesment.SurveyResponses.Test
             Assert.Equal(400, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Put SurveyResponses - Ok case")]
+        [Fact(DisplayName = "Put Responses - Ok case")]
         public async Task PutSurveyAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
@@ -203,7 +202,7 @@ namespace DamageAssesment.SurveyResponses.Test
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Put SurveyResponses - BadRequest case")]
+        [Fact(DisplayName = "Put Responses - BadRequest case")]
         public async Task PutSurveyAsync_ShouldReturnStatusCode404()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
@@ -214,7 +213,7 @@ namespace DamageAssesment.SurveyResponses.Test
             Assert.Equal(400, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Delete SurveyResponses - Ok case")]
+        [Fact(DisplayName = "Delete Responses - Ok case")]
         public async Task DeleteSurveyAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
@@ -225,7 +224,7 @@ namespace DamageAssesment.SurveyResponses.Test
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Delete SurveyResponses - NotFound case")]
+        [Fact(DisplayName = "Delete Responses - NotFound case")]
         public async Task DeleteSurveyAsync_ShouldReturnStatusCode404()
         {
             var mockResponse = await MockData.getResponse();

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

@@ -1,12 +1,9 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
-using Microsoft.AspNetCore.Http;
+using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Models;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
 
-namespace DamageAssesment.Api.SurveyResponses.Controllers
+namespace DamageAssesment.Api.Responses.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class SurveyResponsesController : ControllerBase
     {
@@ -20,10 +17,12 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// GET request for retrieving survey responses.
         /// </summary>
 
-        [HttpGet("SurveyResponses")]
-        public async Task<ActionResult> GetSurveyResponsesAsync()
+        [Route("responses/{employeeid:int}")]
+        [Route("responses")]
+        [HttpGet]
+        public async Task<ActionResult> GetSurveyResponsesAsync(int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesAsync();
+            var result = await this.surveyResponseProvider.GetSurveyResponsesAsync(employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.surveyResponses);
@@ -37,11 +36,12 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// <summary>
         /// GET request for retrieving survey responses by survey ID.
         /// </summary>
-       
-        [HttpGet("SurveyResponses/{surveyId}")]
-        public async Task<ActionResult> GetSurveyResponsesAsync(int surveyId)
+        [Route("responses/bysurvey/{surveyid:int}/{employeeid:int}")]
+        [Route("responses/bysurvey/{surveyid:int}")]
+        [HttpGet]
+        public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid, int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyId);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyid, employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -51,18 +51,19 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// <summary>
         /// GET request for retrieving survey responses by survey and location IDs.
         /// </summary>
-        /// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param>
-        /// <param name="locationId">The ID of the location for which responses are to be retrieved.</param>
+        /// <param name="surveyid">The ID of the survey for which responses are to be retrieved.</param>
+        /// <param name="locationid">The ID of the location for which responses are to be retrieved.</param>
 
-        [HttpGet("Responses/{surveyId}/{locationId}")]
-        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, string locationId)
+        [Route("responses/{surveyid:int}/{locationid:int}/{employeeid:int}")]
+        [Route("responses/{surveyid:int}/{locationid:int}")]
+        [HttpGet]
+        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid,int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyId, locationId);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid,employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
             }
-
             return NoContent();
         }
         /// <summary>
@@ -72,10 +73,12 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// <param name="questionId">The ID of the question for which responses are to be retrieved.</param>
         /// <param name="answer">The answer for which responses are to be retrieved.</param>
 
-        [HttpGet("ResponsesByAnswer/{surveyId}/{questionId}/{answer}")]
-        public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyId, int questionId, string answer)
-        {       
-            var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyId, questionId, answer);
+        [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}/{employeeid:int}")]
+        [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}")]
+        [HttpGet]
+        public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer, int? employeeid)
+        {
+            var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyid, questionid, answer, employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -88,10 +91,12 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// </summary>
         /// <param name="surveyId">The ID of the survey for which answers are to be retrieved.</param>
 
-        [HttpGet("AnswersByRegion/{surveyId}")]
-        public async Task<ActionResult> GetAnswersByRegionAsync(int surveyId)
+        [Route("responses/byregion/{surveyid:int}")]
+        [Route("responses/byregion/{surveyid:int}/{employeeid}")]
+        [HttpGet]
+        public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid, int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyId);
+            var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyid, employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.Answers);
@@ -102,11 +107,12 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// GET request for retrieving survey responses by survey ID and maintenance center.
         /// </summary>
         /// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param>
-
-        [HttpGet("AnswersByMaintenanceCenter/{surveyId}")]
-        public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyId)
+        [Route("responses/bymaintenancecenter/{surveyid:int}/{employeeid:int}")]
+        [Route("responses/bymaintenancecenter/{surveyid:int}")]
+        [HttpGet]
+        public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid, int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyId);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyid, employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -118,10 +124,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("responses/{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);
@@ -134,7 +140,7 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// </summary>
         /// <param name="surveyResponse">The survey response object to be created.</param>
 
-        [HttpPost("SurveyResponses")]
+        [HttpPost("responses")]
         public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse)
         {
             var result = await this.surveyResponseProvider.PostSurveyResponseAsync(surveyResponse);
@@ -150,10 +156,10 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// <param name="Id">The ID of the survey response to be updated.</param>
         /// <param name="surveyResponse">The updated survey response object.</param>
 
-        [HttpPut("SurveyResponses/{Id}")]
-        public async Task<ActionResult> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse)
+        [HttpPut("responses/{id}")]
+        public async Task<ActionResult> PutSurveyResponseAsync(int id, Models.SurveyResponse surveyResponse)
         {
-            var result = await this.surveyResponseProvider.PutSurveyResponseAsync(Id, surveyResponse);
+            var result = await this.surveyResponseProvider.PutSurveyResponseAsync(id, surveyResponse);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponse);
@@ -166,11 +172,11 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// <summary>
         /// DELETE request for deleting an existing survey response.
         /// </summary>
-       
-        [HttpDelete("SurveyResponses/{Id}")]
-        public async Task<ActionResult> DeleteSurveyResponseAsync(int Id)
+
+        [HttpDelete("responses/{id}")]
+        public async Task<ActionResult> DeleteSurveyResponseAsync(int id)
         {
-            var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(Id);
+            var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponse);
@@ -180,23 +186,43 @@ 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)
+        [HttpPost("responses/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);
             else
                 return BadRequest(result.ErrorMessage);
         }
+
+        [Route("responses/surveys/active/{employeeid:int}")]
+        [Route("responses/surveys/active/{employeeid:int}/{language:alpha}")]
+        [HttpGet]
+        public async Task<ActionResult> GetActiveSurveysAsync(int employeeid, string? language)
+        {
+            var result = await this.surveyResponseProvider.GetActiveSurveysAsync(employeeid, language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.Surveys);
+            }
+            return NoContent();
+        }
+
+        [Route("responses/surveys/historic/{employeeid:int}")]
+        [Route("responses/surveys/historic/{employeeid:int}/{language:alpha}")]
+        [HttpGet]
+        public async Task<ActionResult> GetHistoricSurveysAsync(int employeeid, string? language)
+        {
+            var result = await this.surveyResponseProvider.GetHistoricSurveysAsync(employeeid, language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.Surveys);
+            }
+            return NoContent();
+        }
     }
 }