updated latest changes from dev

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

@@ -17,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();
@@ -33,11 +33,11 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// </summary>
 
 
-        [HttpGet("Answers/{Id}")]
+        [HttpGet("answers/{id}")]
-        public async Task<ActionResult> GetAnswerByIdAsync(int 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);
@@ -48,7 +48,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers based on responseId.
         /// </summary>
-        [HttpGet("Answers/ByResponse/{responseid}")]
+        [HttpGet("answers/byresponse/{responseid}")]
         public async Task<IActionResult> GetAnswersByResponseId(int responseid)
         {
             var result = await this.answerProvider.GetAnswersAsync(responseid);
@@ -62,7 +62,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Get all answers based on questionId.
         /// </summary>
 
-        [HttpGet("Answers/ByQuestion/{questionid}")]
+        [HttpGet("answers/byquestion/{questionid}")]
         public async Task<IActionResult> AnswersByQuestionId(int questionid)
         {
             var result = await this.answerProvider.GetAnswersByQuestionAsync(questionid);
@@ -76,7 +76,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Update an existing answer.
         /// </summary>
 
-        [HttpPut("Answers")]
+        [HttpPut("answers")]
         public async Task<IActionResult> UpdateAnswer(Models.Answer answer)
         {
             if (answer != null)
@@ -97,7 +97,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Save a new answer.
         /// </summary>
 
-        [HttpPost("Answers")]
+        [HttpPost("answers")]
         public async Task<IActionResult> CreateAnswer(Models.Answer answer)
         {
             if (answer != null)
@@ -115,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/Providers/AnswerProvider.cs

@@ -8,19 +8,20 @@ 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
@@ -40,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
@@ -63,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
@@ -74,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
@@ -96,17 +99,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);
             }
         }
+
+        // Create a new answer
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer)
         {
             try
@@ -120,7 +123,7 @@ namespace DamageAssesment.Api.Answers.Providers
                     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)
             {
@@ -128,6 +131,8 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
+
+        // Update an existing answer
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer)
         {
             try
@@ -156,14 +161,14 @@ namespace DamageAssesment.Api.Answers.Providers
             }
             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();
@@ -173,30 +178,33 @@ 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;
         }
 
+        // Seed initial data if the table is empty
         public void SeedData()
         {
             if (!answerDbContext.Answers.Any())
             {
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
+                // Uncomment the lines below to add more initial data if needed
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, 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/Controllers/AttachmentsController.cs

@@ -22,7 +22,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// Get all attachments.
         /// </summary>
 
-        [HttpGet("Attachments")]
+        [HttpGet("attachments")]
         public async Task<ActionResult> GetAttachmentsAsync()
         {
 
@@ -37,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)
         {
 
@@ -81,7 +81,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// Save new Attachment(s)
         /// </summary>
 
-        [HttpPost("Attachments"), DisableRequestSizeLimit]
+        [HttpPost("attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo)
         {
             try
@@ -108,7 +108,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// Modify an new attachment.
         /// </summary>
 
-        [HttpPut("Attachments"), DisableRequestSizeLimit]
+        [HttpPut("attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
         {
             try
@@ -138,7 +138,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Delete an existing attachment.
         /// </summary>
-        [HttpDelete("Attachments/{id}")]
+        [HttpDelete("attachments/{id}")]
         public async Task<IActionResult> DeleteAttachment(int id)
         {
             // database soft delete

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/Providers/AttachmentsProvider.cs

@@ -21,7 +21,7 @@ namespace DamageAssesment.Api.Attachments.Providers
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-            //SeedData();
+            SeedData();
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
         {

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

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

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

@@ -16,7 +16,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getNoContentResponse();
+            var mockResponse = await MockData.getNoContentResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en",null)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -30,7 +30,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getNoContentResponse();
+            var mockResponse = await MockData.getNoContentResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -43,7 +43,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getOkResponse();
+            var mockResponse = await MockData.getOkResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en", null)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -56,7 +56,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getOkResponse();
+            var mockResponse = await MockData.getOkResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -65,6 +65,32 @@ namespace DamageAssesment.Api.DocuLinks.Test
             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()
         {

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

@@ -11,7 +11,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
     public class MockData
     {
 
-        public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponse()
+        public static async Task<(bool, List<DocuLinks.Models.ResDoculinks>, string)> getOkResponses()
         {
             List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
             
@@ -46,6 +46,48 @@ namespace DamageAssesment.Api.DocuLinks.Test
                     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)
@@ -64,6 +106,11 @@ namespace DamageAssesment.Api.DocuLinks.Test
         {
             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>();

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

@@ -136,7 +136,21 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             }
             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>

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

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

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

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

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

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

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

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

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

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

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

@@ -7,7 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
         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.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive);
+        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);

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

@@ -7,6 +7,11 @@ namespace DamageAssesment.Api.DocuLinks.Models
     {
         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; }

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

@@ -6,8 +6,10 @@ 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
@@ -63,13 +65,20 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 int counter = 0;
                 for (int i = 1; i <= 4; i++)
                 {
-                    FileModel fileModel = new FileModel() { url = "www.google"+i+".com", IsAttachments = false, CustomOrder = 1 };
+                    int linkTypeId = 2;
-                    ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i,CustomOrder=i, Files = new List<FileModel>() { fileModel } };
+                    FileModel fileModel = new FileModel();
-                    Db.DoculinkTranslation documents = new Db.DoculinkTranslation { DocumentId = i, title = "Test"+i, description = "ss"+i, Language = "en" };
+                    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();
-                    DocumentDbContext.DocumentsTranslations.AddRange(documents);
                     var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(document.doclinksAttachments);
                     dbattachments.ForEach(a => a.DocumentId = i);
                     DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
@@ -77,6 +86,34 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     counter++;
                 }
             }
+            if (!DocumentDbContext.DocumentsTranslations.Any())
+            {
+                string[] titles = {
+                         "Mobile App Damage Assessment Instructions",
+                         "PC Damage Assessment Instructions",
+                         "Emergency Evacuation centers",
+                         "Mobile App Damage Assessment Instructions" };
+                string[] esTranslations = {
+                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil",
+                         "Instrucciones de Evaluación de Daños del PC",
+                         "Centros de Evacuación de Emergencia",
+                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil"  };
+                string[] frTranslations = {
+                      "Instructions d'Évaluation des Dommages de l'Application Mobile",
+                      "Instructions d'Évaluation des Dommages du PC",
+                       "Centres d'Évacuation d'Urgence",
+                       "Instructions d'Évaluation des Dommages de l'Application Mobile" };
+                List<Db.DoculinkTranslation> documents = new List<Db.DoculinkTranslation>();
+                for (int i = 0; i < 4; i++)
+                {
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = titles[i], description = titles[i], Language = "en" });
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = esTranslations[i], description = esTranslations[i], Language = "es" });
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = frTranslations[i], description = frTranslations[i], Language = "fr" });
+                }
+                DocumentDbContext.DocumentsTranslations.AddRange(documents);
+                DocumentDbContext.SaveChanges();
+            }
+
         }
         public List<Models.DoculinkTranslation> GetDocumentTranslations(int id, string? language)
         {
@@ -133,7 +170,44 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             MultiLanguage = dicttitle;
             return MultiLanguage;
         }
-        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
+
+        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
@@ -157,7 +231,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
                             DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
                     }
-                    return (true, result, null);
+                    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");
             }

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

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

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

@@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// GET request for retrieving employees.
         /// </summary>
 
-        [HttpGet("Employees")]
+        [HttpGet("employees")]
         public async Task<ActionResult> GetEmployeesAsync()
         {
 
@@ -36,7 +36,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// GET request for retrieving an employee by ID.
         /// </summary>
         
-        [HttpGet("Employees/{id}")]
+        [HttpGet("employees/{id}")]
         public async Task<ActionResult> GetEmployeeByIdAsync(int id)
         {
 
@@ -53,7 +53,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// PUT request for updating an existing employee.
         /// </summary>
         /// <param name="Employee">The updated employee object.</param>
-        [HttpPut("Employees/{id}")]
+        [HttpPut("employees/{id}")]
         public async Task<IActionResult> UpdateEmployee(int id, Models.Employee Employee)
         {
             if (Employee != null)
@@ -75,7 +75,7 @@ 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")]
+        [HttpPost("employees")]
         public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
         {
             if (Employee != null)
@@ -93,7 +93,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// DELETE request for deleting an existing employee.
         /// </summary>
         /// <param name="id">The ID of the employee to be deleted.</param>
-        [HttpDelete("Employees/{id}")]
+        [HttpDelete("employees/{id}")]
         public async Task<IActionResult> DeleteEmployee(int id)
         {
             var result = await this.EmployeeProvider.DeleteEmployeeAsync(id);

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

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

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()
@@ -156,12 +156,12 @@ namespace DamageAssesment.Api.Employees.Providers
         {
             if (!EmployeeDbContext.Employees.Any())
             {
-                EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" });
+                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 = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
+                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() { 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 = 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() { 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 = 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() { 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 = 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() { EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), 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/Controllers/LocationsController.cs

@@ -16,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// Get all locations.
         /// </summary>
 
-        [HttpGet("Locations")]
+        [HttpGet("locations")]
         public async Task<ActionResult> GetLocationsAsync()
         {
 
@@ -32,7 +32,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// Get all locations based on locationdId.
         /// </summary>
 
-        [HttpGet("Locations/{id}")]
+        [HttpGet("locations/{id}")]
         public async Task<ActionResult> GetLocationByIdAsync(int id)
         {
 
@@ -48,7 +48,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// Update a Location.
         /// </summary>
 
-        [HttpPut("Locations/{id}")]
+        [HttpPut("locations/{id}")]
         public async Task<IActionResult> UpdateLocation(int id, Models.Location Location)
         {
             if (Location != null)
@@ -66,7 +66,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// Save a new location.
         /// </summary>
 
-        [HttpPost("Locations")]
+        [HttpPost("locations")]
         public async Task<IActionResult> CreateLocation(Models.Location Location)
         {
             if (Location != null)
@@ -84,7 +84,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// Delete an existing location.
         /// </summary>
 
-        [HttpDelete("Locations/{id}")]
+        [HttpDelete("locations/{id}")]
         public async Task<IActionResult> DeleteLocation(int id)
         {
             var result = await this.LocationProvider.DeleteLocationAsync(id);

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

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

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

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

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

@@ -17,7 +17,7 @@ namespace DamageAssesment.Api.Locations.Providers
             this.locationDbContext = locationDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            //SeedData();
+          //  SeedData();
         }
 
         public async Task<(bool IsSuccess, IEnumerable<Models.Location> Locations, string ErrorMessage)> GetLocationsAsync()
@@ -139,12 +139,13 @@ namespace DamageAssesment.Api.Locations.Providers
         {
             if (!locationDbContext.Locations.Any())
             {
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "Loc1", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 1", 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 = "Loc2", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 2", MaintenanceCenter = "1", SchoolType = "US" });
+                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 = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "7511", RegionId = 4, Name = "MIAMI SPRINGS SHS", MaintenanceCenter = "2", SchoolType = "S" });
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
+                //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() { LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", 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() { LocationCode = "Loc6", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 6", 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

@@ -16,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Providers
             this.locationDbContext = regionDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            //SeedData();
+          //  SeedData();
         }
 
         public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(int Id)
@@ -166,8 +166,10 @@ namespace DamageAssesment.Api.Locations.Providers
             if (!locationDbContext.Regions.Any())
             {
                 locationDbContext.Regions.Add(new Db.Region() { Name = "North", Abbreviation = "N" });
-                locationDbContext.Regions.Add(new Db.Region() { Name = "South", Abbreviation = "S" });
                 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

@@ -20,8 +20,8 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// </summary>
 
         // get all questions
-        [Route("Questions")]
+        [Route("questions")]
-        [Route("Questions/{language:alpha}")]
+        [Route("questions/{language:alpha}")]
         [HttpGet]
         public async Task<IActionResult> GetQuestionsAsync(string? language)
         {
@@ -37,8 +37,8 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// GET request for retrieving a question by ID.
         /// </summary>
-        [Route("Questions/{id}/{language:alpha}")]
+        [Route("questions/{id}/{language:alpha}")]
-        [Route("Questions/{id:int}")]
+        [Route("questions/{id:int}")]
         [HttpGet]
         public async Task<IActionResult> GetQuestionByIdAsync(int id, string? language)
         {
@@ -55,8 +55,8 @@ 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("Questions/BySurvey/{surveyId:int}")]
+        [Route("questions/bysurvey/{surveyId:int}")]
-        [Route("Questions/BySurvey/{surveyId:int}/{language:alpha}")]
+        [Route("questions/bysurvey/{surveyId:int}/{language:alpha}")]
         [HttpGet]
         public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? language)
         {
@@ -71,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)
@@ -92,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)
@@ -110,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);
@@ -125,8 +125,8 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving question categories.
         /// </summary>
 
-        [HttpGet("Questions/Categories")]
+        [HttpGet("questions/categories")]
-        [HttpGet("Questions/Categories/{language:alpha}")]
+        [HttpGet("questions/categories/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoriesAsync(string? language)
         {
             var result = await this.questionsProvider.GetQuestionCategoriesAsync(language);
@@ -140,8 +140,8 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving a question category by ID.
         /// </summary>
 
-        [HttpGet("Questions/Categories/{id:int}")]
+        [HttpGet("questions/categories/{id:int}")]
-        [HttpGet("Questions/Categories/{id:int}/{language:alpha}")]
+        [HttpGet("questions/categories/{id:int}/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language)
         {
             var result = await this.questionsProvider.GetQuestionCategoryAsync(id, language);
@@ -157,7 +157,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// PUT request for updating a question category.
         /// </summary>
 
-        [HttpPut("Questions/Categories")]
+        [HttpPut("questions/categories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -178,7 +178,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question category.
         /// </summary>
 
-        [HttpPost("Questions/Categories")]
+        [HttpPost("questions/categories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -196,7 +196,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question category based on ID.
         /// </summary>
 
-        [HttpDelete("Questions/Categories/{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

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

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

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/Models/SurveyQuestion.cs

@@ -5,6 +5,7 @@
         public int CategoryId { 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/Providers/QuestionsProvider.cs

@@ -19,21 +19,11 @@ namespace DamageAssesment.Api.Questions.Providers
             this.questionDbContext = questionDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+           // SeedData();
         }
 
         public void SeedData()
         {
-
-            if (!questionDbContext.QuestionCategories.Any())
-            {
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "img1" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "img1" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Structural", IconLibrary = "img1" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Utility", IconLibrary = "img1" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Debris", IconLibrary = "img1" });
-                questionDbContext.SaveChanges();
-            }
             if (!questionDbContext.QuestionTypes.Any())
             {
                 questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "RadioButton" });
@@ -41,30 +31,19 @@ namespace DamageAssesment.Api.Questions.Providers
                 questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" });
                 questionDbContext.SaveChanges();
             }
-            if (!questionDbContext.Questions.Any())
+
+            if (!questionDbContext.QuestionCategories.Any())
             {
-                questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 2, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1 });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" });
-                questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 3, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
-                questionDbContext.Questions.Add(new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true,  CategoryId = 2 });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Structural", IconLibrary = "https://example.com/images/img3.png" });
-                questionDbContext.SaveChanges();
+                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" });
-            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 = 2, QuestionText = "Are the grounds flodded ?", 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 = 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 = 1, QuestionText = "Puedes abrir ?", Language = "sp" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "sp" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "sp" });
                 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" });
@@ -82,6 +61,132 @@ namespace DamageAssesment.Api.Questions.Providers
                 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 List<Models.CategoryTranslation> GetCategoryTranslations(int id, string? language)
@@ -209,6 +314,7 @@ namespace DamageAssesment.Api.Questions.Providers
                             CategoryId = item.Id,
                             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)
                         });
                     }

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

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

DamageAssesmentApi/DamageAssesment.Api.Responses.Test/DamageAssesment.Api.Responses.Test.csproj

@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DamageAssesment.Api.SurveyResponses\DamageAssesment.Api.Responses.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
     {

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

@@ -1,7 +1,7 @@
-using DamageAssesment.Api.SurveyResponses.Controllers;
+using DamageAssesment.Api.Responses.Controllers;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
-using DamageAssesment.Api.SurveyResponses.Test;
+using DamageAssesment.Api.Responses.Test;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
 using Xunit;
@@ -17,7 +17,7 @@ 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();
@@ -28,7 +28,7 @@ namespace DamageAssesment.SurveyResponses.Test
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses - BadRequest case")]
+        [Fact(DisplayName = "Get Responses - BadRequest case")]
         public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
@@ -38,31 +38,31 @@ namespace DamageAssesment.SurveyResponses.Test
             Assert.Equal(400, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId - Ok case")]
+        [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);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId - NoContent case")]
+        [Fact(DisplayName = "Get Responses by surveyId - NoContent case")]
         public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
             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();
@@ -73,7 +73,7 @@ namespace DamageAssesment.SurveyResponses.Test
             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();
@@ -83,7 +83,7 @@ namespace DamageAssesment.SurveyResponses.Test
             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();
@@ -94,7 +94,7 @@ namespace DamageAssesment.SurveyResponses.Test
             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();
@@ -105,7 +105,7 @@ namespace DamageAssesment.SurveyResponses.Test
         }
 
 
-        [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();
@@ -116,7 +116,7 @@ namespace DamageAssesment.SurveyResponses.Test
             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();
@@ -126,7 +126,7 @@ namespace DamageAssesment.SurveyResponses.Test
             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();
@@ -137,7 +137,7 @@ namespace DamageAssesment.SurveyResponses.Test
             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();
@@ -158,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();
@@ -169,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();
@@ -180,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();
@@ -191,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();
@@ -202,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();
@@ -213,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();
@@ -224,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,8 +1,8 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DamageAssesment.Api.SurveyResponses.Controllers
+namespace DamageAssesment.Api.Responses.Controllers
 {
     [ApiController]
     public class SurveyResponsesController : ControllerBase
@@ -17,8 +17,8 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// GET request for retrieving survey responses.
         /// </summary>
 
-        [Route("Responses/{employeeid:int}")]
+        [Route("responses/{employeeid:int}")]
-        [Route("Responses")]
+        [Route("responses")]
         [HttpGet]
         public async Task<ActionResult> GetSurveyResponsesAsync(int? employeeid)
         {
@@ -36,8 +36,8 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// <summary>
         /// GET request for retrieving survey responses by survey ID.
         /// </summary>
-        [Route("Responses/BySurvey/{surveyid:int}/{employeeid:int}")]
+        [Route("responses/bysurvey/{surveyid:int}/{employeeid:int}")]
-        [Route("Responses/BySurvey/{surveyid:int}")]
+        [Route("responses/bysurvey/{surveyid:int}")]
         [HttpGet]
         public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid, int? employeeid)
         {
@@ -54,8 +54,8 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// <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>
 
-        [Route("Responses/{surveyid:int}/{locationid:int}/{employeeid:int}")]
+        [Route("responses/{surveyid:int}/{locationid:int}/{employeeid:int}")]
-        [Route("Responses/{surveyid:int}/{locationid:int}")]
+        [Route("responses/{surveyid:int}/{locationid:int}")]
         [HttpGet]
         public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid,int? employeeid)
         {
@@ -73,8 +73,8 @@ 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>
 
-        [Route("Responses/ByAnswer/{surveyid:int}/{questionid:int}/{answer:alpha}/{employeeid:int}")]
+        [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}/{employeeid:int}")]
-        [Route("Responses/ByAnswer/{surveyid:int}/{questionid:int}/{answer:alpha}")]
+        [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}")]
         [HttpGet]
         public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer, int? employeeid)
         {
@@ -91,8 +91,8 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// </summary>
         /// <param name="surveyId">The ID of the survey for which answers are to be retrieved.</param>
 
-        [Route("Responses/ByRegion/{surveyid:int}")]
+        [Route("responses/byregion/{surveyid:int}")]
-        [Route("Responses/ByRegion/{surveyid:int}/{employeeid}")]
+        [Route("responses/byregion/{surveyid:int}/{employeeid}")]
         [HttpGet]
         public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid, int? employeeid)
         {
@@ -107,8 +107,8 @@ 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>
-        [Route("Responses/ByMaintenanceCenter/{surveyid:int}/{employeeid:int}")]
+        [Route("responses/bymaintenancecenter/{surveyid:int}/{employeeid:int}")]
-        [Route("Responses/ByMaintenanceCenter/{surveyid:int}")]
+        [Route("responses/bymaintenancecenter/{surveyid:int}")]
         [HttpGet]
         public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid, int? employeeid)
         {
@@ -124,7 +124,7 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// </summary>
         /// <param name="responseId">The ID of the survey response to be retrieved.</param>
 
-        [HttpGet("Responses/{id}")]
+        [HttpGet("responses/{id}")]
         public async Task<ActionResult> GetSurveyResponseByIdAsync(int id)
         {
             var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(id);
@@ -140,7 +140,7 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// </summary>
         /// <param name="surveyResponse">The survey response object to be created.</param>
 
-        [HttpPost("Responses")]
+        [HttpPost("responses")]
         public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse)
         {
             var result = await this.surveyResponseProvider.PostSurveyResponseAsync(surveyResponse);
@@ -156,7 +156,7 @@ 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("Responses/{id}")]
+        [HttpPut("responses/{id}")]
         public async Task<ActionResult> PutSurveyResponseAsync(int id, Models.SurveyResponse surveyResponse)
         {
             var result = await this.surveyResponseProvider.PutSurveyResponseAsync(id, surveyResponse);
@@ -173,7 +173,7 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// DELETE request for deleting an existing survey response.
         /// </summary>
 
-        [HttpDelete("Responses/{id}")]
+        [HttpDelete("responses/{id}")]
         public async Task<ActionResult> DeleteSurveyResponseAsync(int id)
         {
             var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(id);
@@ -188,7 +188,7 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// </summary>
         /// <param name="request">The answers to be submitted for the survey.</param>
 
-        [HttpPost("Responses/Answers")]
+        [HttpPost("responses/answers")]
         public async Task<ActionResult> PostSurveyAnswersAsync(Request request)
         {
             var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(request);
@@ -199,8 +199,8 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
                 return BadRequest(result.ErrorMessage);
         }
 
-        [Route("Responses/Surveys/active/{employeeid:int}")]
+        [Route("responses/surveys/active/{employeeid:int}")]
-        [Route("Responses/Surveys/active/{employeeid:int}/{language:alpha}")]
+        [Route("responses/surveys/active/{employeeid:int}/{language:alpha}")]
         [HttpGet]
         public async Task<ActionResult> GetActiveSurveysAsync(int employeeid, string? language)
         {
@@ -212,8 +212,8 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
             return NoContent();
         }
 
-        [Route("Responses/Surveys/historic/{employeeid:int}")]
+        [Route("responses/surveys/historic/{employeeid:int}")]
-        [Route("Responses/Surveys/historic/{employeeid:int}/{language:alpha}")]
+        [Route("responses/surveys/historic/{employeeid:int}/{language:alpha}")]
         [HttpGet]
         public async Task<ActionResult> GetHistoricSurveysAsync(int employeeid, string? language)
         {

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

@@ -1,8 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.SurveyResponses.Db
+namespace DamageAssesment.Api.Responses.Db
 {
+    [Table("SurveyResponses")]
     public class SurveyResponse
     {
         [Key]

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

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace DamageAssesment.Api.SurveyResponses.Db
+namespace DamageAssesment.Api.Responses.Db
 {
     public class SurveyResponseDbContext:DbContext
     {
@@ -12,7 +12,7 @@ namespace DamageAssesment.Api.SurveyResponses.Db
         protected override void OnConfiguring(DbContextOptionsBuilder options)
         {
             // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("SurveyResponseConnection"));
+            options.UseSqlServer(_Configuration.GetConnectionString("ResponsesConnection"));
         }
         public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }
 

DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IAnswerServiceProvider.cs

@@ -1,6 +1,6 @@
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 
-namespace DamageAssesment.Api.SurveyResponses.Interfaces
+namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface IAnswerServiceProvider
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IAttachmentServiceProvider.cs

@@ -1,6 +1,6 @@
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 
-namespace DamageAssesment.Api.SurveyResponses.Interfaces
+namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface IAttachmentServiceProvider
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IEmployeeServiceProvider.cs

@@ -1,6 +1,6 @@
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 
-namespace DamageAssesment.Api.SurveyResponses.Interfaces
+namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface IEmployeeServiceProvider
     {

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

@@ -1,6 +1,6 @@
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 
-namespace DamageAssesment.Api.SurveyResponses.Interfaces
+namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface IHttpUtil
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ILocationServiceProvider.cs

@@ -1,6 +1,6 @@
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 
-namespace DamageAssesment.Api.SurveyResponses.Interfaces
+namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface ILocationServiceProvider
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IQuestionServiceProvider.cs

@@ -1,6 +1,6 @@
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 
-namespace DamageAssesment.Api.SurveyResponses.Interfaces
+namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface IQuestionServiceProvider
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IRegionServiceProvider.cs

@@ -0,0 +1,9 @@
+using DamageAssesment.Api.Responses.Models;
+
+namespace DamageAssesment.Api.Responses.Interfaces
+{
+    public interface IRegionServiceProvider
+    {
+        Task<List<Region>> getRegionsAsync();
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/ISurveyServiceProvider.cs

@@ -1,6 +1,6 @@
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 
-namespace DamageAssesment.Api.SurveyResponses.Interfaces
+namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface ISurveyServiceProvider
     {

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

@@ -1,7 +1,7 @@
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DamageAssesment.Api.SurveyResponses.Interfaces
+namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface ISurveysResponse
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Answer.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Answer
     {

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class AnswerRequest
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Models/Attachment.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Attachment
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Models/AttachmentInfo.cs

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class AttachmentInfo
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Employee
     {

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Location
     {

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

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
      public class Question
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Region
     {

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Request
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Survey
     {

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

@@ -1,10 +1,11 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class SurveyQuestions
     {
         public int CategoryId { get; set; }
         public string CategoryName { get; set; }
         public string CategoryImage { get; set; }
+        public object CategoryNames { get; set; }
         public List<Question> Questions { get; set; }
     }
 }

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

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class SurveyResponse
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyTranslation.cs

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class SurveyTranslation
     {        

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Profiles
+namespace DamageAssesment.Api.Responses.Profiles
 {
     public class SurveyResponsesProvider : AutoMapper.Profile
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs

@@ -1,7 +1,7 @@
-using DamageAssesment.Api.SurveyResponses.Db;
+using DamageAssesment.Api.Responses.Db;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Services;
+using DamageAssesment.Api.Responses.Services;
-using DamageAssesment.Api.SurveyResponses.Providers;
+using DamageAssesment.Api.Responses.Providers;
 using Microsoft.EntityFrameworkCore;
 using Polly;
 using System.Reflection;
@@ -44,7 +44,7 @@ builder.Services.AddSwaggerGen(c =>
 });
 builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
 {
-    option.UseSqlServer("SurveyResponseConnection");
+    option.UseSqlServer("ResponsesConnection");
 });
 var app = builder.Build();
 

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

@@ -1,10 +1,10 @@
 using AutoMapper;
-using DamageAssesment.Api.SurveyResponses.Db;
+using DamageAssesment.Api.Responses.Db;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Microsoft.EntityFrameworkCore;
 
-namespace DamageAssesment.Api.SurveyResponses.Providers
+namespace DamageAssesment.Api.Responses.Providers
 {
     public class SurveyResponsesProvider : ISurveysResponse
     {
@@ -31,24 +31,24 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             this.questionServiceProvider = questionServiceProvider;
             this.surveyServiceProvider = surveyServiceProvider;
             this.mapper = mapper;
-            // seedData();
+            SeedData();
         }
 
-        private void seedData()
+        public void SeedData()
         {
+            // Check if SurveyResponses exist, if not, seed data
             if (!surveyResponseDbContext.SurveyResponses.Any())
             {
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 1, LocationId = 1 });
+
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 2, LocationId = 1 });
+                // Create and save SurveyResponse records with references to existing Employee and Location records
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 3, EmployeeId = 3, LocationId = 2 });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 1, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 4, EmployeeId = 4, LocationId = 2 });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 5, LocationId = 3});
+
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 4, LocationId = 2 });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 3, LocationId = 1 });
                 surveyResponseDbContext.SaveChanges();
             }
         }
 
+
         public async Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId, int employeeid)
         {
             try
@@ -852,7 +852,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                     }
                 }
 
-                //var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync();
+                //var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync();
                 // var employees = await employeeServiceProvider.getEmployeesAsync();
                 var answers = await answerServiceProvider.getAnswersAsync();
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();

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

@@ -1,9 +1,9 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
 
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class AnswerServiceProvider : ServiceProviderBase, IAnswerServiceProvider
     {

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

@@ -1,8 +1,8 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class AttachmentServiceProvider : ServiceProviderBase, IAttachmentServiceProvider
     {

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

@@ -1,9 +1,9 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class EmployeeServiceProvider : ServiceProviderBase, IEmployeeServiceProvider
     {

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

@@ -1,8 +1,8 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
 using System.Net.Http.Headers;
 using System.Text;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class HttpUtil : IHttpUtil
     {

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

@@ -1,8 +1,8 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class LocationServiceProvider :ServiceProviderBase, ILocationServiceProvider
     {

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

@@ -1,8 +1,8 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class QuestionServiceProvider : ServiceProviderBase, IQuestionServiceProvider
     {

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

@@ -1,8 +1,8 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class RegionServiceProvider : ServiceProviderBase, IRegionServiceProvider
     {

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

@@ -1,6 +1,6 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class ServiceProviderBase
     {

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

@@ -1,8 +1,8 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class SurveyServiceProvider : ServiceProviderBase, ISurveyServiceProvider
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json

@@ -7,7 +7,7 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "SurveyResponseConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "ResponsesConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
   },
   "EndPointSettings": {
     "AnswerUrlBase": "http://localhost:5200",
@@ -20,17 +20,17 @@
   },
 
   "RessourceSettings": {
-    "Employee": "/Employees",
+    "Employee": "/employees",
-    "EmployeeById": "/Employees/{0}",
+    "EmployeeById": "/employees/{0}",
-    "Question": "/Questions",
+    "Question": "/questions",
-    "QuestionById": "/Questions/{0}",
+    "QuestionById": "/questions/{0}",
-    "SurveyQuestion": "/Questions/BySurvey/{0}",
+    "SurveyQuestion": "/questions/bysurvey/{0}",
-    "Survey": "/Surveys",
+    "Survey": "/surveys",
-    "SurveyById": "/Surveys/{0}",
+    "SurveyById": "/surveys/{0}",
-    "Attachment": "/Attachments",
+    "Attachment": "/attachments",
-    "Answer": "/Answers",
+    "Answer": "/answers",
-    "AnswerByResponse": "/Answers/ByResponse/{0}",
+    "AnswerByResponse": "/answers/byresponse/{0}",
-    "Location": "/Locations",
+    "Location": "/locations",
-    "Region": "/Regions"
+    "Region": "/regions"
   }
 }

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

@@ -1,9 +0,0 @@
-using DamageAssesment.Api.SurveyResponses.Models;
-
-namespace DamageAssesment.Api.SurveyResponses.Interfaces
-{
-    public interface IRegionServiceProvider
-    {
-        Task<List<Region>> getRegionsAsync();
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Migrations/20230817221348_InitialSurveyResponse.Designer.cs

@@ -1,55 +0,0 @@
-// <auto-generated />
-using DamageAssesment.Api.SurveyResponses.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.SurveyResponses.Migrations
-{
-    [DbContext(typeof(SurveyResponseDbContext))]
-    [Migration("20230817221348_InitialSurveyResponse")]
-    partial class InitialSurveyResponse
-    {
-        /// <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.SurveyResponses.Db.SurveyResponse", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("EmployeeId")
-                        .IsRequired()
-                        .HasMaxLength(6)
-                        .HasColumnType("nvarchar(6)");
-
-                    b.Property<string>("LocationId")
-                        .IsRequired()
-                        .HasMaxLength(4)
-                        .HasColumnType("nvarchar(4)");
-
-                    b.Property<int>("SurveyId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("SurveyResponses");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Migrations/20230817221348_InitialSurveyResponse.cs

@@ -1,36 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace DamageAssesment.Api.SurveyResponses.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitialSurveyResponse : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "SurveyResponses",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    SurveyId = table.Column<int>(type: "int", nullable: false),
-                    LocationId = table.Column<string>(type: "nvarchar(4)", maxLength: 4, nullable: false),
-                    EmployeeId = table.Column<string>(type: "nvarchar(6)", maxLength: 6, nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_SurveyResponses", x => x.Id);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "SurveyResponses");
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Migrations/SurveyResponseDbContextModelSnapshot.cs

@@ -1,52 +0,0 @@
-// <auto-generated />
-using DamageAssesment.Api.SurveyResponses.Db;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace DamageAssesment.Api.SurveyResponses.Migrations
-{
-    [DbContext(typeof(SurveyResponseDbContext))]
-    partial class SurveyResponseDbContextModelSnapshot : 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.SurveyResponses.Db.SurveyResponse", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<string>("EmployeeId")
-                        .IsRequired()
-                        .HasMaxLength(6)
-                        .HasColumnType("nvarchar(6)");
-
-                    b.Property<string>("LocationId")
-                        .IsRequired()
-                        .HasMaxLength(4)
-                        .HasColumnType("nvarchar(4)");
-
-                    b.Property<int>("SurveyId")
-                        .HasColumnType("int");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("SurveyResponses");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

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

@@ -1,32 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    },
-    "EndPointSettings": {
-      "AnswerUrlBase": "http://localhost:5200",
-      "LocationUrlBase": "http://localhost:5213",
-      "RegionUrlBase": "http://localhost:5211",
-      "QuestionUrlBase": "http://localhost:5133",
-      "EmployeeUrlBase": "http://localhost:5135",
-      "AttachmentUrlBase": "http://localhost:5243",
-      "SurveyUrlBase": "http://localhost:5009"
-    },
-
-    "RessourceSettings": {
-      "Employee": "/Employees",
-      "EmployeeById": "/Employees/{0}",
-      "Question": "/Questions",
-      "QuestionById": "/Questions/{0}",
-      "SurveyQuestion": "/Questions/BySurvey/{0}",
-      "Survey": "/Surveys",
-      "SurveyById": "/Surveys/{0}",
-      "Attachment": "/Attachments",
-      "Answer": "/Answers",
-      "AnswerByResponse": "/Answers/ByResponse/{0}",
-      "Location": "/Locations",
-      "Region": "/Regions"
-    }
-  }
-}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/appsettings.Production.json

@@ -1,5 +0,0 @@
-{
-  "ConnectionStrings": {
-    "DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=_CHANGE_ME;Trusted_Connection=True;MultipleActiveResultSets=true"
-  }
-}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/appsettings.Test.json

@@ -1,5 +0,0 @@
-{
-  "ConnectionStrings": {
-    "DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=_CHANGE_ME;Trusted_Connection=True;MultipleActiveResultSets=true"
-  }
-}

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

@@ -15,8 +15,8 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// GET request for retrieving surveys.
         /// </summary>
-        [Route("Surveys")]
+        [Route("surveys")]
-        [Route("Surveys/{language:alpha}")]
+        [Route("surveys/{language:alpha}")]
         [HttpGet]
         public async Task<ActionResult> GetSurveysAsync(string? language)
         {
@@ -31,8 +31,8 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// GET request for retrieving surveys by ID.
         /// </summary>
-        [Route("Surveys/{id:int}")]
+        [Route("surveys/{id:int}")]
-        [Route("Surveys/{id:int}/{language:alpha}")]
+        [Route("surveys/{id:int}/{language:alpha}")]
         [HttpGet]
         public async Task<ActionResult> GetSurveysAsync(int id, string? language)
         {
@@ -46,7 +46,7 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// POST request for creating a new survey.
         /// </summary>
-        [HttpPost("Surveys")]
+        [HttpPost("surveys")]
         public async Task<ActionResult> PostSurveysAsync(Models.Survey survey)
         {
             var result = await this.surveyProvider.PostSurveyAsync(survey);
@@ -59,7 +59,7 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// PUT request for updating an existing survey (surveyId,Updated Survey data).
         /// </summary>
-        [HttpPut("Surveys/{id}")]
+        [HttpPut("surveys/{id}")]
         public async Task<ActionResult> PutSurveysAsync(int id, Models.Survey survey)
         {
             var result = await this.surveyProvider.PutSurveyAsync(id, survey);
@@ -76,7 +76,7 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// DELETE request for deleting a survey by ID.
         /// </summary>
-        [HttpDelete("Surveys/{id}")]
+        [HttpDelete("surveys/{id}")]
         public async Task<ActionResult> DeleteSurveysAsync(int id)
         {
             var result = await this.surveyProvider.DeleteSurveyAsync(id);

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

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

DamageAssesmentApi/DamageAssesment.Api.Surveys/Db/SurveyTranslation.cs

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

DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs

@@ -21,35 +21,41 @@ namespace DamageAssesment.Api.Surveys.Providers
             //seedData();
         }
 
+        // Method to seed initial data into the database
         public void seedData()
         {
             if (!surveyDbContext.Surveys.Any())
             {
-                surveyDbContext.Surveys.Add(new Db.Survey {   IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90) });
+                var survey1 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now };
-                surveyDbContext.Surveys.Add(new Db.Survey {   IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90) });
+                var survey2 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now };
-                surveyDbContext.Surveys.Add(new Db.Survey {   IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90) });
+                var survey3 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now };
+
+                surveyDbContext.Surveys.Add(survey1);
+                surveyDbContext.Surveys.Add(survey2);
+                surveyDbContext.Surveys.Add(survey3);
                 surveyDbContext.SaveChanges();
-            }
 
-            if (!surveyDbContext.SurveysTranslation.Any())
+                if (!surveyDbContext.SurveysTranslation.Any())
-            {
+                {
-                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 1, Language = "en", Title = "Impact of Tropical Storm Emily on Florida's Economy" });
+                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey1.Id, Language = "en", Title = "Impact of Tropical Storm Emily on Florida's Economy" });
-                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 1, Language = "es", Title = "Impacto de la tormenta tropical Emily en la economía de Florida" });
+                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey1.Id, Language = "es", Title = "Impacto de la tormenta tropical Emily en la economía de Florida" });
-                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 1, Language = "fr", Title = "Impact de la tempête tropicale Emily sur l'économie de la Floride" });
+                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey1.Id, Language = "fr", Title = "Impact de la tempête tropicale Emily sur l'économie de la Floride" });
 
-                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 2, Language = "en", Title = "Hurricane Andrew Aftermath Survey" });
+                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "en", Title = "Hurricane Andrew Aftermath Survey" });
-                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 2, Language = "es", Title = "Encuesta sobre las secuelas del huracán Andrew" });
+                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "es", Title = "Encuesta sobre las secuelas del huracán Andrew" });
-                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 2, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Andrew" });
+                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Andrew" });
                   
-                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 3, Language = "en", Title = "Public Perception of Hurricane Michael's Response" });
+                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "en", Title = "Hurricane Irma" });
-                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 3, Language = "es", Title = "Percepción pública de la respuesta del huracán Michael" });
+                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "es", Title = "Huracán Irma" });
-                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = 3, Language = "fr", Title = "Perception du public de la réponse de l'ouragan Michael" });
+                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "fr", Title = "Ouragan Irma" });
 
-                surveyDbContext.SaveChangesAsync();
+                    surveyDbContext.SaveChanges();
+                }
             }
         }
 
-        public IEnumerable<Models.SurveyTranslation> GetSurveyTranslations(int id, IEnumerable<Models.SurveyTranslation> SurveyTranslation,string? language)
+        // Method to get survey translations for a given survey ID and language
+        public IEnumerable<Models.SurveyTranslation> GetSurveyTranslations(int id, IEnumerable<Models.SurveyTranslation> SurveyTranslation, string? language)
         {
             if (SurveyTranslation == null)
             {
@@ -66,6 +72,8 @@ namespace DamageAssesment.Api.Surveys.Providers
             }
             return SurveyTranslation;
         }
+
+        // Method to create a multi-language object from survey translations
         public object CreateMultiLanguageObject(IEnumerable<Models.SurveyTranslation> surveyTranslations)
         {
             object MultiLanguage = new object();
@@ -77,28 +85,27 @@ namespace DamageAssesment.Api.Surveys.Providers
             MultiLanguage = dict;
             return MultiLanguage;
         }
+
+        // Method to get surveys asynchronously with multi-language support
         public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language)
         {
             IEnumerable<Models.MultiLanSurvey> surveysList = null;
             try
             {
-                logger?.LogInformation("Gell all Surveys from DB");
+                logger?.LogInformation("Get all Surveys from DB");
                 var surveys = await surveyDbContext.Surveys.Where(s => s.IsEnabled == true).ToListAsync();
-                //var surveyTranslations = await surveyDbContext.SurveysTranslation.ToListAsync();
 
                 if (surveys != null)
                 {
                     surveysList = from s in surveys
-                                  select new
+                                  select new Models.MultiLanSurvey
-                                  Models.MultiLanSurvey
                                   {
                                       Id = s.Id,
                                       StartDate = s.StartDate,
                                       EndDate = s.EndDate,
                                       IsEnabled = s.IsEnabled,
                                       CreatedDate = s.CreatedDate,
-                                      Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id,null, language))
+                                      Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id, null, language))
-
                                   };
 
                     logger?.LogInformation($"{surveys.Count} Items(s) found");
@@ -112,12 +119,15 @@ namespace DamageAssesment.Api.Surveys.Providers
                 return (false, null, ex.Message);
             }
         }
+
+        // Method to get a specific survey by ID asynchronously with multi-language support
         public async Task<(bool IsSuccess, Models.MultiLanSurvey Surveys, string ErrorMessage)> GetSurveysAsync(int id, string language)
         {
             try
             {
                 logger?.LogInformation("Query Survey");
                 var survey = await surveyDbContext.Surveys.SingleOrDefaultAsync(s => s.Id == id && s.IsEnabled == true);
+
                 if (survey != null)
                 {
                     Models.MultiLanSurvey result = null;
@@ -129,8 +139,7 @@ namespace DamageAssesment.Api.Surveys.Providers
                         EndDate = survey.EndDate,
                         IsEnabled = survey.IsEnabled,
                         CreatedDate = survey.CreatedDate,
-                        Titles = CreateMultiLanguageObject(GetSurveyTranslations(survey.Id,null, language))
+                        Titles = CreateMultiLanguageObject(GetSurveyTranslations(survey.Id, null, language))
-
                     };
                     logger?.LogInformation($"Survey Id: {id} found");
                     return (true, result, null);
@@ -144,6 +153,7 @@ namespace DamageAssesment.Api.Surveys.Providers
             }
         }
 
+        // Method to create a new survey asynchronously with multi-language support
         public async Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PostSurveyAsync(Models.Survey survey)
         {
             try
@@ -158,7 +168,7 @@ namespace DamageAssesment.Api.Surveys.Providers
 
                     foreach (var title in survey.Titles)
                     {
-                        surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation {SurveyId = _survey.Id, Language = title.Language, Title = title.Title });
+                        surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = _survey.Id, Language = title.Language, Title = title.Title });
                     }
                     await surveyDbContext.SaveChangesAsync();
                     var result = mapper.Map<Db.Survey, Models.MultiLanSurvey>(_survey);
@@ -178,6 +188,7 @@ namespace DamageAssesment.Api.Surveys.Providers
             }
         }
 
+        // Method to update an existing survey asynchronously with multi-language support
         public async Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PutSurveyAsync(int Id, Models.Survey survey)
         {
             try
@@ -227,6 +238,7 @@ namespace DamageAssesment.Api.Surveys.Providers
             }
         }
 
+        // Method to delete a survey by ID asynchronously with multi-language support
         public async Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> DeleteSurveyAsync(int Id)
         {
             try
@@ -239,7 +251,7 @@ namespace DamageAssesment.Api.Surveys.Providers
                     result.Titles = CreateMultiLanguageObject(GetSurveyTranslations(survey.Id, null, ""));
                     surveyDbContext.Surveys.Remove(survey);
                     await surveyDbContext.SaveChangesAsync();
-                    return (true, result, $"Survey Id: {Id} deleted Successfuly");
+                    return (true, result, $"Survey Id: {Id} deleted Successfully");
                 }
                 else
                 {

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

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

DamageAssesmentApi/DamageAssesment.sln

@@ -17,14 +17,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Locations", "DamageAssesment.Api.Locations\DamageAssesment.Api.Locations.csproj", "{746C67BF-9949-4361-B5D2-358C7607750E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses", "DamageAssesment.Api.SurveyResponses\DamageAssesment.Api.Responses.csproj", "{D11808FE-AD1C-4BA6-87FD-9D18B2DC81F2}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Questions.Test", "DamageAssesment.Api.QuestionsTest\DamageAssesment.Api.Questions.Test.csproj", "{35CD9231-034D-4999-BCFC-1786DD007ED2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Surveys.Test", "DamageAssesment.Api.Surveys.Test\DamageAssesment.Api.Surveys.Test.csproj", "{ADFB79E3-83C9-454F-A070-49D167BD28CC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses.Test", "DamageAssesment.SurveyResponses.Test\DamageAssesment.Api.Responses.Test.csproj", "{6F4B9C9D-CE5D-421A-876F-57D0FEDF8049}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Attachments.Test", "DamageAssesment.Api.Attachments.Test\DamageAssesment.Api.Attachments.Test.csproj", "{730E5718-FCE1-42C0-AB76-EA020896A788}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Locations.Test", "DamageAssesment.Api.Locations.Test\DamageAssesment.Api.Locations.Test.csproj", "{DA68AE47-6825-41ED-9107-5151822FB083}"
@@ -41,6 +37,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLin
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks.Test", "DamageAssesment.Api.DocuLinks.Test\DamageAssesment.Api.DocuLinks.Test.csproj", "{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses", "DamageAssesment.Api.Responses\DamageAssesment.Api.Responses.csproj", "{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses.Test", "DamageAssesment.Api.Responses.Test\DamageAssesment.Api.Responses.Test.csproj", "{26BFCF59-0D24-41C1-9202-D4FFCC52389B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -63,10 +63,6 @@ Global
 		{746C67BF-9949-4361-B5D2-358C7607750E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{746C67BF-9949-4361-B5D2-358C7607750E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{746C67BF-9949-4361-B5D2-358C7607750E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D11808FE-AD1C-4BA6-87FD-9D18B2DC81F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D11808FE-AD1C-4BA6-87FD-9D18B2DC81F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D11808FE-AD1C-4BA6-87FD-9D18B2DC81F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D11808FE-AD1C-4BA6-87FD-9D18B2DC81F2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{35CD9231-034D-4999-BCFC-1786DD007ED2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{35CD9231-034D-4999-BCFC-1786DD007ED2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{35CD9231-034D-4999-BCFC-1786DD007ED2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -75,10 +71,6 @@ Global
 		{ADFB79E3-83C9-454F-A070-49D167BD28CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADFB79E3-83C9-454F-A070-49D167BD28CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADFB79E3-83C9-454F-A070-49D167BD28CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6F4B9C9D-CE5D-421A-876F-57D0FEDF8049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6F4B9C9D-CE5D-421A-876F-57D0FEDF8049}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6F4B9C9D-CE5D-421A-876F-57D0FEDF8049}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6F4B9C9D-CE5D-421A-876F-57D0FEDF8049}.Release|Any CPU.Build.0 = Release|Any CPU
 		{730E5718-FCE1-42C0-AB76-EA020896A788}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{730E5718-FCE1-42C0-AB76-EA020896A788}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{730E5718-FCE1-42C0-AB76-EA020896A788}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -111,6 +103,14 @@ Global
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE