doculink changes

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}")]
-        public async Task<ActionResult> GetAnswerByIdAsync(int id)
+        [HttpGet("Answers/{Id}")]
+        public async Task<ActionResult> GetAnswerByIdAsync(int Id)
         {
 
-            var result = await answerProvider.GetAnswerByIdAsync(id);
+            var result = await answerProvider.GetAnswerByIdAsync(Id);
             if (result.IsSuccess)
             {
                 return Ok(result.Answer);
@@ -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,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Answers.Db
 {
-    [Table("Answers")]
     public class Answer
     {
         [Key]

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

@@ -8,20 +8,19 @@ 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(); // Seed initial data if the table is empty
+            //SeedData();
         }
 
-        // Get all answers
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync()
         {
             try
@@ -41,9 +40,9 @@ namespace DamageAssesment.Api.Answers.Providers
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
+
         }
 
-        // Get an answer by its ID
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> GetAnswerByIdAsync(int Id)
         {
             try
@@ -64,8 +63,6 @@ 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
@@ -77,17 +74,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
@@ -99,17 +96,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
@@ -123,7 +120,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 exists");
+                return (false, null, "Answer is already exits");
             }
             catch (Exception ex)
             {
@@ -131,8 +128,6 @@ 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
@@ -161,14 +156,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();
@@ -178,33 +173,30 @@ namespace DamageAssesment.Api.Answers.Providers
                 }
                 answerDbContext.Answers.Remove(answer);
                 answerDbContext.SaveChanges();
-                return (true, mapper.Map<Db.Answer, Models.Answer>(answer), $"AnswerId {Id} deleted successfully");
+                return (true, mapper.Map<Db.Answer, Models.Answer>(answer), $"AnswerId {Id} deleted Successfuly");
             }
             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() { Id = 1, AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 });
-                // Uncomment the lines below to add more initial data if needed
-                //answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
-                //answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
-                //answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
-                //answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "Yes", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
                 answerDbContext.SaveChanges();
             }
         }

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

@@ -0,0 +1,8 @@
+{
+  "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,7 +3,6 @@ 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

@@ -0,0 +1,8 @@
+{
+  "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.getNoContentResponses();
+            var mockResponse = await MockData.getNoContentResponse();
             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.getNoContentResponses();
+            var mockResponse = await MockData.getNoContentResponse();
             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.getOkResponses();
+            var mockResponse = await MockData.getOkResponse();
             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.getOkResponses();
+            var mockResponse = await MockData.getOkResponse();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -65,32 +65,6 @@ 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.ResDoculinks>, string)> getOkResponses()
+        public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponse()
         {
             List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
             
@@ -46,48 +46,6 @@ 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)
@@ -106,11 +64,6 @@ 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,21 +136,7 @@ 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,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("Doculinks")]
     public class Doculink
     {
         [Key]

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

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

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

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

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

@@ -1,9 +1,7 @@
 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,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("DoculinkTypeTrans")]
     public class LinksTranslation
     {
         [Key]

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

@@ -7,8 +7,7 @@ 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.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, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, 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,11 +7,6 @@ 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,10 +6,8 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System;
-using System.Collections.Immutable;
 using System.Diagnostics.Eventing.Reader;
 using System.Reflection.Metadata;
-using System.Xml;
 using System.Xml.Linq;
 
 namespace DamageAssesment.Api.DocuLinks.Providers
@@ -65,20 +63,13 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 int counter = 0;
                 for (int i = 1; i <= 4; i++)
                 {
-                    int linkTypeId = 2;
-                    FileModel fileModel = new FileModel();
-                    if (i < 3)
-                    {
-                        linkTypeId = 1;
-
-                        fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 };
-                    }
-                    else
-                        fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
-                    ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
+                    FileModel fileModel = new FileModel() { url = "www.google"+i+".com", IsAttachments = false, CustomOrder = 1 };
+                    ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i,CustomOrder=i, Files = new List<FileModel>() { fileModel } };
+                    Db.DoculinkTranslation documents = new Db.DoculinkTranslation { DocumentId = i, title = "Test"+i, description = "ss"+i, Language = "en" };
                     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);
@@ -86,34 +77,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     counter++;
                 }
             }
-            if (!DocumentDbContext.DocumentsTranslations.Any())
-            {
-                string[] titles = {
-                         "Mobile App Damage Assessment Instructions",
-                         "PC Damage Assessment Instructions",
-                         "Emergency Evacuation centers",
-                         "Mobile App Damage Assessment Instructions" };
-                string[] esTranslations = {
-                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil",
-                         "Instrucciones de Evaluación de Daños del PC",
-                         "Centros de Evacuación de Emergencia",
-                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil"  };
-                string[] frTranslations = {
-                      "Instructions d'Évaluation des Dommages de l'Application Mobile",
-                      "Instructions d'Évaluation des Dommages du PC",
-                       "Centres d'Évacuation d'Urgence",
-                       "Instructions d'Évaluation des Dommages de l'Application Mobile" };
-                List<Db.DoculinkTranslation> documents = new List<Db.DoculinkTranslation>();
-                for (int i = 0; i < 4; i++)
-                {
-                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = titles[i], description = titles[i], Language = "en" });
-                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = esTranslations[i], description = esTranslations[i], Language = "es" });
-                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = frTranslations[i], description = frTranslations[i], Language = "fr" });
-                }
-                DocumentDbContext.DocumentsTranslations.AddRange(documents);
-                DocumentDbContext.SaveChanges();
-            }
-
         }
         public List<Models.DoculinkTranslation> GetDocumentTranslations(int id, string? language)
         {
@@ -170,44 +133,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             MultiLanguage = dicttitle;
             return MultiLanguage;
         }
-
-        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
-        {
-
-            try
-            {
-                logger?.LogInformation("Query Question");
-                var documents = new List<Db.Doculink>();
-                if (linkTypeId==null)
-                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
-                else
-                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
-                     q.linkTypeId == linkTypeId.Value).ToListAsync();
-                if (documents != null)
-                {
-                    var result = mapper.Map<List<Db.Doculink>, List<Models.ResDoculink>>(documents);
-                    foreach (var item in result)
-                    {
-                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
-                        item.titles = multilan.titles;
-                        item.description = multilan.description;
-                        item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
-                    }
-                    List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
-                    return (true, doculinks, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-
-        }
-        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
+        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
         {
 
             try
@@ -231,8 +157,7 @@ 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());
                     }
-                    List<ResDoculinks> doculinks =  result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
-                    return (true, doculinks, null);
+                    return (true, result, null);
                 }
                 return (false, null, "Not found");
             }

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

@@ -0,0 +1,8 @@
+{
+  "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,9 +1,7 @@
 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 = "10101", Name = "David", Email = "david@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "20202", Name = "Smith", Email = "smith@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
-                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 3, EmployeeCode = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30), IsActive = true, PreferredLanguage = "fr" });
-                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 4, EmployeeCode = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20), IsActive = true, PreferredLanguage = "en" });
-                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" });
-                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 6, EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), IsActive = true, PreferredLanguage = "es" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 1, 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() { Id = 2, 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() { Id = 3, EmployeeCode = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30), IsActive = true, PreferredLanguage = "fr" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 4, EmployeeCode = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20), IsActive = true, PreferredLanguage = "en" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 6, EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), IsActive = true, PreferredLanguage = "es" });
                 EmployeeDbContext.SaveChanges();
             }
 

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

@@ -0,0 +1,8 @@
+{
+  "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,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Locations.Db
 {
-    [Table("Locations")]
     public class Location
     {
         [Key]

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

@@ -1,9 +1,7 @@
 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,13 +139,12 @@ namespace DamageAssesment.Api.Locations.Providers
         {
             if (!locationDbContext.Locations.Any())
             {
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0091", RegionId = 5, Name = "BOB GRAHAM EDUCATION CENTER", MaintenanceCenter = "1", SchoolType = "K8" });
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0092", RegionId = 1, Name = "NORMAN S. EDELCUP/SUNNY ISLES BEACH K-8", MaintenanceCenter = "1", SchoolType = "K8" });
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "7511", RegionId = 4, Name = "MIAMI SPRINGS SHS", MaintenanceCenter = "2", SchoolType = "S" });
-                //locationDbContext.Locations.Add(new Db.Location() { Id = 3, LocationCode = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
-                //locationDbContext.Locations.Add(new Db.Location() { Id = 4, LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
-                //locationDbContext.Locations.Add(new Db.Location() { Id = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });
-                //locationDbContext.Locations.Add(new Db.Location() { Id = 6, LocationCode = "Loc6", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = 1, LocationCode = "Loc1", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 1", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = 2, LocationCode = "Loc2", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 2", 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() { Id = 4, LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = 6, LocationCode = "Loc6", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
                 locationDbContext.SaveChanges();
             }
 

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

@@ -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)
@@ -165,11 +165,9 @@ 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 = "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.Regions.Add(new Db.Region() { Id = 1, Name = "North", Abbreviation = "N" });
+                locationDbContext.Regions.Add(new Db.Region() { Id = 2, Name = "South", Abbreviation = "S" });
+                locationDbContext.Regions.Add(new Db.Region() { Id = 3, Name = "Central", Abbreviation = "C" });
                 locationDbContext.SaveChanges();
             }
         }

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

@@ -0,0 +1,8 @@
+{
+  "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/{language:alpha}")]
+        [Route("Questions")]
+        [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:int}")]
+        [Route("Questions/{id}/{language:alpha}")]
+        [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}/{language:alpha}")]
+        [Route("Questions/BySurvey/{surveyId:int}")]
+        [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/{language:alpha}")]
+        [HttpGet("Questions/Categories")]
+        [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}/{language:alpha}")]
+        [HttpGet("Questions/Categories/{id:int}")]
+        [HttpGet("Questions/Categories/{id:int}/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language)
         {
             var result = await this.questionsProvider.GetQuestionCategoryAsync(id, 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,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("QuestionCategoryTrans")]
     public class CategoryTranslation
     {
         [Key]

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

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

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

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

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

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

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

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

@@ -1,9 +0,0 @@
-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,10 +0,0 @@
-using DamageAssesment.Api.Responses.Models;
-
-namespace DamageAssesment.Api.Responses.Interfaces
-{
-    public interface ISurveyServiceProvider
-    {
-        Task<List<Survey>> getSurveysAsync(string language);
-        Task<Survey> getSurveyAsync(int surveyId);
-    }
-}

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

@@ -1,8 +1,10 @@
-using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.Responses.Models;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Models;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 
-namespace DamageAssesment.Api.Responses.Controllers
+namespace DamageAssesment.Api.SurveyResponses.Controllers
 {
     [ApiController]
     public class SurveyResponsesController : ControllerBase
@@ -17,12 +19,10 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// GET request for retrieving survey responses.
         /// </summary>
 
-        [Route("responses/{employeeid:int}")]
-        [Route("responses")]
-        [HttpGet]
-        public async Task<ActionResult> GetSurveyResponsesAsync(int? employeeid)
+        [HttpGet("Responses")]
+        public async Task<ActionResult> GetSurveyResponsesAsync()
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesAsync(employeeid ?? 0);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesAsync();
             if (result.IsSuccess)
             {
                 return Ok(result.surveyResponses);
@@ -36,12 +36,11 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <summary>
         /// GET request for retrieving survey responses by survey ID.
         /// </summary>
-        [Route("responses/bysurvey/{surveyid:int}/{employeeid:int}")]
-        [Route("responses/bysurvey/{surveyid:int}")]
-        [HttpGet]
-        public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid, int? employeeid)
+       
+        [HttpGet("Responses/BySurvey/{surveyid}")]
+        public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyid, employeeid ?? 0);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyid);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -54,16 +53,15 @@ namespace DamageAssesment.Api.Responses.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}")]
-        [HttpGet]
-        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid,int? employeeid)
+        [HttpGet("Responses/{surveyid}/{locationid}")]
+        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid,employeeid ?? 0);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
             }
+
             return NoContent();
         }
         /// <summary>
@@ -73,12 +71,10 @@ namespace DamageAssesment.Api.Responses.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}")]
-        [HttpGet]
-        public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer, int? employeeid)
-        {
-            var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyid, questionid, answer, employeeid ?? 0);
+        [HttpGet("Responses/ByAnswer/{surveyid}/{questionid}/{answer}")]
+        public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer)
+        {       
+            var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyid, questionid, answer);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -91,12 +87,10 @@ namespace DamageAssesment.Api.Responses.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}/{employeeid}")]
-        [HttpGet]
-        public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid, int? employeeid)
+        [HttpGet("Responses/ByRegion/{surveyid}")]
+        public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid)
         {
-            var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyid, employeeid ?? 0);
+            var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyid);
             if (result.IsSuccess)
             {
                 return Ok(result.Answers);
@@ -107,12 +101,11 @@ namespace DamageAssesment.Api.Responses.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}")]
-        [HttpGet]
-        public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid, int? employeeid)
+
+        [HttpGet("Responses/ByMaintenanceCenter/{surveyid}")]
+        public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyid, employeeid ?? 0);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyid);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -124,7 +117,7 @@ namespace DamageAssesment.Api.Responses.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 +133,7 @@ namespace DamageAssesment.Api.Responses.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 +149,7 @@ namespace DamageAssesment.Api.Responses.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);
@@ -172,8 +165,8 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <summary>
         /// 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 +181,7 @@ namespace DamageAssesment.Api.Responses.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);
@@ -198,31 +191,5 @@ namespace DamageAssesment.Api.Responses.Controllers
             else
                 return BadRequest(result.ErrorMessage);
         }
-
-        [Route("responses/surveys/active/{employeeid:int}")]
-        [Route("responses/surveys/active/{employeeid:int}/{language:alpha}")]
-        [HttpGet]
-        public async Task<ActionResult> GetActiveSurveysAsync(int employeeid, string? language)
-        {
-            var result = await this.surveyResponseProvider.GetActiveSurveysAsync(employeeid, language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Surveys);
-            }
-            return NoContent();
-        }
-
-        [Route("responses/surveys/historic/{employeeid:int}")]
-        [Route("responses/surveys/historic/{employeeid:int}/{language:alpha}")]
-        [HttpGet]
-        public async Task<ActionResult> GetHistoricSurveysAsync(int employeeid, string? language)
-        {
-            var result = await this.surveyResponseProvider.GetHistoricSurveysAsync(employeeid, language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Surveys);
-            }
-            return NoContent();
-        }
     }
 }

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

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

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

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace DamageAssesment.Api.Responses.Db
+namespace DamageAssesment.Api.SurveyResponses.Db
 {
     public class SurveyResponseDbContext:DbContext
     {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,10 @@
+using DamageAssesment.Api.SurveyResponses.Models;
+
+namespace DamageAssesment.Api.SurveyResponses.Interfaces
+{
+    public interface ISurveyServiceProvider
+    {
+        Task<List<Survey>> getSurveysAsync();
+        Task<Survey> getSurveyAsync(int surveyId);
+    }
+}

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

@@ -1,23 +1,22 @@
-using DamageAssesment.Api.Responses.Models;
+using DamageAssesment.Api.SurveyResponses.Models;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DamageAssesment.Api.Responses.Interfaces
+namespace DamageAssesment.Api.SurveyResponses.Interfaces
 {
     public interface ISurveysResponse
     {
-        Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId, int employeeid);
+        Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId);
         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyResponseAsync(Models.SurveyResponse surveyResponse);
        // Task<(bool IsSuccess,dynamic surveyResponses, string ErrorMessage)> GetSurveyResponseAsync(int responseId);
-        Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync(int employeeid);
-        Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetActiveSurveysAsync(int employeeid, string language);
-        Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetHistoricSurveysAsync(int employeeid, string language);
+        Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync();
         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse);
         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> DeleteSurveyResponseAsync(int Id);
         Task<(bool IsSuccess, dynamic SurveyResponse, string ErrorMessage)> GetSurveyResponseByIdAsync(int responseId);
-        Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAsync(int surveyId, int employeeid);
-        Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId, int employeeid);
-        Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId, int employeeid);
-        Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer, int employeeid);
+        Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAsync(int surveyId);
+        Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId);
+        Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId);
+        Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer);
+
         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Request request);
 
     }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,11 +1,10 @@
-namespace DamageAssesment.Api.Responses.Models
+namespace DamageAssesment.Api.SurveyResponses.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.SurveyResponses/Models/SurveyResponse.cs

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Program.cs

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

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

@@ -1,10 +1,10 @@
 using AutoMapper;
-using DamageAssesment.Api.Responses.Db;
-using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.Responses.Models;
+using DamageAssesment.Api.SurveyResponses.Db;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Models;
 using Microsoft.EntityFrameworkCore;
 
-namespace DamageAssesment.Api.Responses.Providers
+namespace DamageAssesment.Api.SurveyResponses.Providers
 {
     public class SurveyResponsesProvider : ISurveysResponse
     {
@@ -31,38 +31,29 @@ namespace DamageAssesment.Api.Responses.Providers
             this.questionServiceProvider = questionServiceProvider;
             this.surveyServiceProvider = surveyServiceProvider;
             this.mapper = mapper;
-            SeedData();
+           // seedData();
         }
 
-        public void SeedData()
+        private void seedData()
         {
-            // Check if SurveyResponses exist, if not, seed data
             if (!surveyResponseDbContext.SurveyResponses.Any())
             {
-
-                // Create and save SurveyResponse records with references to existing Employee and Location records
-                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 = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
-
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 1, 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 { Id = 2, SurveyId = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = 4, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = 1, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = 4, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 7, SurveyId = 1, EmployeeId = 4, LocationId = 3, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now });
                 surveyResponseDbContext.SaveChanges();
             }
         }
 
-
-        public async Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId, int employeeid)
+        public async Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId)
         {
             try
             {
                 logger?.LogInformation("Querying to get SurveyResponse object from DB");
-                IQueryable<Db.SurveyResponse> listSurveyResponse = null;
-                if (employeeid == 0)
-                {
-                    listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId);
-                }
-                else
-                {
-                    listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid);
-                }
+                var listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId);
 
                 if (listSurveyResponse.Any())
                 {
@@ -111,58 +102,10 @@ namespace DamageAssesment.Api.Responses.Providers
                 return (false, null, ex.Message);
             }
         }
-        
-        public async Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetActiveSurveysAsync(int employeeid, string language)
-        {
-            try
-            {
-                logger?.LogInformation("Querying to get SurveyResponse object from DB");
-                //get all the survey that already taken by the employee
-                var listOfsurveysId = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).Select(y => y.SurveyId).ToListAsync();
-                var surveys = await surveyServiceProvider.getSurveysAsync(language);
 
-                if (surveys != null)
-                {
-                    surveys = surveys.Where(s => s.IsEnabled == true && s.StartDate <= DateTime.Now && s.EndDate >= DateTime.Now).ToList();
-                }
 
-                if (listOfsurveysId==null || listOfsurveysId.Count == 0)
-                    return (true, surveys, null);
 
-                var activeSurveys = surveys.Where(s => s.IsEnabled == true && s.StartDate <= DateTime.Now && s.EndDate >= DateTime.Now && !listOfsurveysId.Contains(s.Id));
-                return (true, activeSurveys, null);
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetHistoricSurveysAsync(int employeeid, string language)
-        {
-            try
-            {
-                logger?.LogInformation("Querying to get SurveyResponse object from DB");
-                //get all the survey that already taken by the employee
-                var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).ToListAsync();
-                var surveys = await surveyServiceProvider.getSurveysAsync(language);
-
-                var historicSurveys = from s in surveys
-                                      from r in surveyResponses
-                                      where s.Id == r.SurveyId
-                                      select s;
-
-                return (true, historicSurveys, null);
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAsync(int surveyId, int employeeid)
+        public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAsync(int surveyId)
         {
             try
             {
@@ -171,7 +114,7 @@ namespace DamageAssesment.Api.Responses.Providers
 
                 if (survey != null)
                 {
-                    var answers = await getSurveyResponsesBySurveyIdAsync(surveyId, employeeid);
+                    var answers = await getSurveyResponsesBySurveyIdAsync(surveyId);
 
                     if (answers != null)
                         return (true, answers, "Request Successful.");
@@ -193,7 +136,7 @@ namespace DamageAssesment.Api.Responses.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId, int employeeid)
+        public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId)
         {
             try
             {
@@ -202,7 +145,7 @@ namespace DamageAssesment.Api.Responses.Providers
 
                 if (survey != null)
                 {
-                    var answers = await getSurveyResponsesBySurveyIdLocationIdAsync(surveyId, locationId, employeeid);
+                    var answers = await getSurveyResponsesBySurveyIdLocationIdAsync(surveyId, locationId);
 
                     if (answers != null)
                         return (true, answers, "Request Successful.");
@@ -224,7 +167,7 @@ namespace DamageAssesment.Api.Responses.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId, int employeeid)
+        public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId)
         {
             try
             {
@@ -233,7 +176,7 @@ namespace DamageAssesment.Api.Responses.Providers
 
                 if (survey != null)
                 {
-                    var answers = await getResultsByMaintenanceCenterAsync(surveyId, employeeid);
+                    var answers = await getResultsByMaintenanceCenterAsync(surveyId);
 
                     if (answers != null)
                         return (true, answers, "Request Successful.");
@@ -255,7 +198,7 @@ namespace DamageAssesment.Api.Responses.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer, int employeeid)
+        public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer)
         {
             try
             {
@@ -267,7 +210,7 @@ namespace DamageAssesment.Api.Responses.Providers
 
                 if (survey != null && question != null && IsCorrectAnswer)
                 {
-                    var answers = await getSurveyResponsesByAnswerAsync(survey, question, answer, employeeid);
+                    var answers = await getSurveyResponsesByAnswerAsync(survey, question, answer);
 
                     if (answers != null)
                         return (true, answers, "Request Successful.");
@@ -290,18 +233,18 @@ namespace DamageAssesment.Api.Responses.Providers
         }
 
 
-        public async Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync(int employeeid)
+        public async Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync()
         {
             try
             {
-                var responses = await getAllSurveyResponsesAsync(employeeid);
+                var answers = await getAllSurveyResponsesAsync();
 
-                if (responses != null)
-                    return (true, responses, "Request Successful.");
+                if (answers != null)
+                    return (true, answers, "Request Successful.");
                 else
                 {
-                    responses = new List<Models.SurveyResponse>();
-                    return (true, responses, "Empty object returned");
+                    answers = new List<Models.SurveyResponse>();
+                    return (true, answers, "Empty object returned");
                 }
             }
             catch (Exception ex)
@@ -412,7 +355,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                        answer => answer.SurveyResponseId,
                                        surveyResponse => surveyResponse.Id,
                                        (answer, surveyResponse) => new
-
+                                   
                                        {
                                            answer.Id,
                                            answer.QuestionId,
@@ -436,18 +379,18 @@ namespace DamageAssesment.Api.Responses.Providers
                 var result = from answer in surveyAnswers
                              from location in locations
                              where answer.LocationId.Equals(location.Id)
-                             select new
+                             select new 
                              {
-                                 answer.Id,
-                                 answer.QuestionId,
-                                 answer.AnswerText,
-                                 answer.Comment,
-                                 location.RegionId,
-                                 LocationId = location.Id,
-                                 answer.SurveyResponseId
+                                answer.Id,
+                                answer.QuestionId,
+                                answer.AnswerText,
+                                answer.Comment,
+                                location.RegionId,
+                                LocationId = location.Id,
+                                answer.SurveyResponseId
                              };
 
-
+               
 
                 //group records by answer and region
                 var q = from e in result
@@ -455,13 +398,13 @@ namespace DamageAssesment.Api.Responses.Providers
                         select new
                         {
                             g.Key.RegionId,
-                            Answers = new
+                            Answers = new 
                             {
                                 g.Key.AnswerText,
                                 Counter = g.Count()
                             }
                         };
-
+                
                 //build the result
 
                 List<dynamic> resultList = new List<dynamic>();
@@ -469,9 +412,9 @@ namespace DamageAssesment.Api.Responses.Providers
                 {
                     var answers = from u in q.ToList()
                                   where u.RegionId.Equals(region.Id)
-                                  select u.Answers;
-
-                    resultList.Add(new { RegionId = region.Id, region.Name, region.Abbreviation, Answers = answers });
+                                  select u.Answers; 
+   
+                    resultList.Add(new { RegionId = region.Id, region.Name, region.Abbreviation, Answers = answers});
                 }
                 //return the object result
                 return new { Regions = resultList };
@@ -527,24 +470,13 @@ namespace DamageAssesment.Api.Responses.Providers
 
 
         //Method to get Survey Responses by surveyId
-        private async Task<dynamic> getSurveyResponsesBySurveyIdAsync(int surveyId, int employeeid)
+        private async Task<dynamic> getSurveyResponsesBySurveyIdAsync(int surveyId)
         {
             try
             {
-                List<Db.SurveyResponse> surveyResonses = null;
-                Employee employee = null;
-                List<Employee> employees = null;
-                if (employeeid == 0)
-                {
-                    surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync();
-                }
-                else
-                {
-                    surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
-                }
+                var surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
 
+                var employees = await employeeServiceProvider.getEmployeesAsync();
                 var answers = await answerServiceProvider.getAnswersAsync();
                 var questions = await questionServiceProvider.getQuestionsAsync();
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
@@ -552,70 +484,32 @@ namespace DamageAssesment.Api.Responses.Providers
                 //var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId);
 
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+                var result = from r in surveyResonses
+                             select new
+                             {
+                                 r.Id,
+                                 r.SurveyId,
+                                 r.LocationId,
+                                 r.EmployeeId,
+                                 r.ClientDevice,
+                                 r.KeyAnswerResult,
+                                 r.Longitute,
+                                 r.Latitude,
+                                 Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 answers = from ans in answers
+                                           where ans.SurveyResponseId == r.Id
+                                           select new
+                                           {
+                                               ans.Id,
+                                               ans.QuestionId,
+                                               ans.AnswerText,
+                                               ans.Comment,
+                                               Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
+                                               Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
 
-                if (employeeid == 0)
-                {
-                    var result = from r in surveyResonses
-                                 select new
-                                 {
-                                     r.Id,
-                                     r.SurveyId,
-                                     r.LocationId,
-                                     r.EmployeeId,
-                                     r.ClientDevice,
-                                     r.KeyAnswerResult,
-                                     r.Longitute,
-                                     r.Latitude,
-                                     Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
-                                     answers = from ans in answers
-                                               where ans.SurveyResponseId == r.Id
-                                               select new
-                                               {
-                                                   ans.Id,
-                                                   ans.QuestionId,
-                                                   ans.AnswerText,
-                                                   ans.Comment,
-                                                   Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
-                                                   Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
-
-                                               }
-                                 };
-                    return result;
-                }
-                else
-                {
-                    object _employee = new { };
-                    if (employee != null)
-                    {
-                        _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
-                    }
-                    var result = from r in surveyResonses
-                                 select new
-                                 {
-                                     r.Id,
-                                     r.SurveyId,
-                                     r.LocationId,
-                                     r.EmployeeId,
-                                     r.ClientDevice,
-                                     r.KeyAnswerResult,
-                                     r.Longitute,
-                                     r.Latitude,
-                                     Employee = _employee,
-                                     answers = from ans in answers
-                                               where ans.SurveyResponseId == r.Id
-                                               select new
-                                               {
-                                                   ans.Id,
-                                                   ans.QuestionId,
-                                                   ans.AnswerText,
-                                                   ans.Comment,
-                                                   Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
-                                                   Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
-                                               }
-                                 };
-
-                    return result;
-                }
+                                           }
+                             };
+                return result;
             }
             catch (Exception ex)
             {
@@ -626,31 +520,13 @@ namespace DamageAssesment.Api.Responses.Providers
 
 
         //Method to get All Survey Responses
-        private async Task<dynamic> getAllSurveyResponsesAsync(int employeeid)
+        private async Task<dynamic> getAllSurveyResponsesAsync()
         {
             try
             {
-                List<Db.SurveyResponse> surveyResonses = null;
-                Employee employee = null;
-                List<Employee> employees = null;
-                object _employee = new { };
-                if (employeeid == 0)
-                {
-                    surveyResonses = await surveyResponseDbContext.SurveyResponses.ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync();
-                }
-                else
-                {
-                    surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
-
-                    if (employee != null)
-                    {
-                        _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
-                    }
-                }
-
+                var surveyResonses = await surveyResponseDbContext.SurveyResponses.ToListAsync();
 
+                var employees = await employeeServiceProvider.getEmployeesAsync();
                 var answers = await answerServiceProvider.getAnswersAsync();
                 var questions = await questionServiceProvider.getQuestionsAsync();
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();
@@ -666,7 +542,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                                 Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
                                            select new
@@ -680,8 +556,6 @@ namespace DamageAssesment.Api.Responses.Providers
                                            }
                              };
                 return result;
-
-
             }
             catch (Exception ex)
             {
@@ -692,19 +566,11 @@ namespace DamageAssesment.Api.Responses.Providers
 
 
         //Method to get Answers By Maintenance Center by surveyId
-        private async Task<dynamic> getResultsByMaintenanceCenterAsync(int surveyId, int employeeid)
+        private async Task<dynamic> getResultsByMaintenanceCenterAsync(int surveyId)
         {
             try
             {
-                List<Db.SurveyResponse> surveyResponses = null;
-                if (employeeid == 0)
-                {
-                    surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
-                }
-                else
-                {
-                    surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
-                }
+                var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
                 var answers = await answerServiceProvider.getAnswersAsync();
                 var locations = await locationServiceProvider.getLocationsAsync();
                 var maintenanceCenters = locations.DistinctBy(m => m.MaintenanceCenter);
@@ -735,7 +601,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                        select new
                                        {
                                            g.Key.MaintenanceCenter,
-                                           Answers = new
+                                           Answers = new 
                                            {
                                                g.Key.AnswerText,
                                                Counter = g.Count()
@@ -760,31 +626,13 @@ namespace DamageAssesment.Api.Responses.Providers
         }
 
         //Method to get Survey Responses by surveyId and LocationId
-        private async Task<dynamic> getSurveyResponsesBySurveyIdLocationIdAsync(int surveyId, int locationId, int employeeid)
+        private async Task<dynamic> getSurveyResponsesBySurveyIdLocationIdAsync(int surveyId, int locationId)
         {
             try
             {
-                List<Db.SurveyResponse> surveyResonses = null;
-                Employee employee = null;
-                List<Employee> employees = null;
-                object _employee = new { };
-
-                if (employeeid == 0)
-                {
-                    surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.LocationId == locationId).ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync();
-                }
-                else
-                {
-                    surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid && x.LocationId == locationId).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
-
-                    if (employee != null)
-                    {
-                        _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
-                    }
-                }
+                var surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.LocationId.Equals(locationId)).ToListAsync();
 
+                var employees = await employeeServiceProvider.getEmployeesAsync();
                 var answers = await answerServiceProvider.getAnswersAsync();
                 var questions = await questionServiceProvider.getQuestionsAsync();
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
@@ -801,7 +649,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                                 Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
 
@@ -816,7 +664,6 @@ namespace DamageAssesment.Api.Responses.Providers
                                            }
                              };
                 return result;
-
             }
             catch (Exception ex)
             {
@@ -827,34 +674,13 @@ namespace DamageAssesment.Api.Responses.Providers
 
 
         //Method to get Survey Responses by surveyId questionId and answer
-        private async Task<dynamic> getSurveyResponsesByAnswerAsync(Survey survey, Question question, string answer, int employeeid)
+        private async Task<dynamic> getSurveyResponsesByAnswerAsync(Survey survey, Question question, string answer)
         {
             try
             {
-                List<Db.SurveyResponse> surveyResponses = null;
-                Employee employee = null;
-                List<Employee> employees = null;
-                object _employee = new { };
-
-                if (employeeid == 0)
-                {
-                    surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync();
-                }
-                else
-                {
-                    surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id && x.EmployeeId == employeeid).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
-
-                    if (employee != null)
-                    {
-                        _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
-                    }
-                }
-
-                //var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync();
-                // var employees = await employeeServiceProvider.getEmployeesAsync();
+                var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync();
                 var answers = await answerServiceProvider.getAnswersAsync();
+                var employees = await employeeServiceProvider.getEmployeesAsync();
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
                 var result = from r in surveyResponses
@@ -868,7 +694,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                                 Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
                                            && ans.QuestionId == question.Id
@@ -931,7 +757,7 @@ namespace DamageAssesment.Api.Responses.Providers
             {
                 if (request != null)
                 {
-                    var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId, ClientDevice = request.ClientDevice, KeyAnswerResult = request.KeyAnswerResult, Latitude = Convert.ToDouble(request.Latitude), Longitute = Convert.ToDouble(request.Longitute), CreatedDate = DateTime.Now });
+                    var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId, ClientDevice = request.ClientDevice, KeyAnswerResult = request.KeyAnswerResult, Latitude = Convert.ToDouble(request.Latitude), Longitute = Convert.ToDouble(request.Longitute), CreatedDate=DateTime.Now });
                     if (response.IsSuccess)
                     {
                         var surveyResponse = response.SurveyResponse;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,21 +1,19 @@
-using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.Responses.Models;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.Responses.Services
+namespace DamageAssesment.Api.SurveyResponses.Services
 {
-    public class SurveyServiceProvider : ServiceProviderBase, ISurveyServiceProvider
+    public class SurveyServiceProvider :ServiceProviderBase, ISurveyServiceProvider
     {
         public SurveyServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Survey"), configuration.GetValue<string>("EndPointSettings:SurveyUrlBase"))
         {
         }
 
-        public async Task<List<Survey>> getSurveysAsync(string language)
+        public async Task<List<Survey>> getSurveysAsync()
         {
             try
             {
-                if (!string.IsNullOrEmpty(language))
-                    url = url + "/" + language;
                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var surveys = JsonConvert.DeserializeObject<List<Survey>>(responseJsonString);
 
@@ -38,7 +36,7 @@ namespace DamageAssesment.Api.Responses.Services
                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var survey = JsonConvert.DeserializeObject<Survey>(responseJsonString);
 
-                if (survey == null)
+                if (survey == null )
                     return null;
                 else return survey;
             }

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

@@ -0,0 +1,32 @@
+{
+  "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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/appsettings.json

@@ -17,17 +17,17 @@
   },
 
   "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"
+    "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.Surveys.Test/DamageAssesment.Api.Survey.Test.csproj

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

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

@@ -15,8 +15,9 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// GET request for retrieving surveys.
         /// </summary>
-        [Route("surveys")]
-        [Route("surveys/{language:alpha}")]
+
+        [Route("Surveys")]
+        [Route("Surveys/{language:alpha}")]
         [HttpGet]
         public async Task<ActionResult> GetSurveysAsync(string? language)
         {
@@ -31,8 +32,8 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// GET request for retrieving surveys by ID.
         /// </summary>
-        [Route("surveys/{id:int}")]
-        [Route("surveys/{id:int}/{language:alpha}")]
+        [Route("Surveys/{id:int}")]
+        [Route("Surveys/{id:int}/{language:alpha}")]
         [HttpGet]
         public async Task<ActionResult> GetSurveysAsync(int id, string? language)
         {
@@ -46,7 +47,8 @@ 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 +61,9 @@ 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 +80,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,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Surveys.Db
 {
-    [Table("Surveys")]
     public class Survey
     {
         [Key]

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

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

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

@@ -21,41 +21,35 @@ namespace DamageAssesment.Api.Surveys.Providers
             //seedData();
         }
 
-        // Method to seed initial data into the database
         public void seedData()
         {
             if (!surveyDbContext.Surveys.Any())
             {
-                var survey1 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now };
-                var survey2 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now };
-                var survey3 = new Db.Survey { IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now };
+                surveyDbContext.Surveys.Add(new Db.Survey { Id = 1, IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now });
+                surveyDbContext.Surveys.Add(new Db.Survey { Id = 2, IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now });
+                surveyDbContext.Surveys.Add(new Db.Survey { Id = 3, IsEnabled = true, StartDate = DateTime.Now, EndDate = DateTime.Now.AddDays(90), CreatedDate = DateTime.Now });
+                surveyDbContext.SaveChangesAsync();
+            }
 
-                surveyDbContext.Surveys.Add(survey1);
-                surveyDbContext.Surveys.Add(survey2);
-                surveyDbContext.Surveys.Add(survey3);
-                surveyDbContext.SaveChanges();
+            if (!surveyDbContext.SurveysTranslation.Any())
+            {
+                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 1, SurveyId = 1, Language = "en", Title = "Impact of Tropical Storm Emily on Florida's Economy" });
+                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 2, SurveyId = 1, Language = "es", Title = "Impacto de la tormenta tropical Emily en la economía de Florida" });
+                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 3, SurveyId = 1, Language = "fr", Title = "Impact de la tempête tropicale Emily sur l'économie de la Floride" });
 
-                if (!surveyDbContext.SurveysTranslation.Any())
-                {
-                    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 = survey1.Id, 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 = "fr", Title = "Impact de la tempête tropicale Emily sur l'économie de la Floride" });
+                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 4, SurveyId = 2, Language = "en", Title = "Hurricane Andrew Aftermath Survey" });
+                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 5, SurveyId = 2, Language = "es", Title = "Encuesta sobre las secuelas del huracán Andrew" });
+                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 6, 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 = "en", Title = "Hurricane Andrew Aftermath Survey" });
-                    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 = survey2.Id, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Andrew" });
-                  
-                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "en", Title = "Hurricane Irma" });
-                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "es", Title = "Huracán Irma" });
-                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "fr", Title = "Ouragan Irma" });
+                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 7, SurveyId = 3, Language = "en", Title = "Public Perception of Hurricane Michael's Response" });
+                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 8, SurveyId = 3, Language = "es", Title = "Percepción pública de la respuesta del huracán Michael" });
+                surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { Id = 9, SurveyId = 3, Language = "fr", Title = "Perception du public de la réponse de l'ouragan Michael" });
 
-                    surveyDbContext.SaveChanges();
-                }
+                surveyDbContext.SaveChangesAsync();
             }
         }
 
-        // 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)
+        public IEnumerable<Models.SurveyTranslation> GetSurveyTranslations(int id, IEnumerable<Models.SurveyTranslation> SurveyTranslation,string? language)
         {
             if (SurveyTranslation == null)
             {
@@ -72,8 +66,6 @@ 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();
@@ -85,27 +77,28 @@ 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("Get all Surveys from DB");
+                logger?.LogInformation("Gell 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 Models.MultiLanSurvey
+                                  select new
+                                  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");
@@ -119,15 +112,12 @@ 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;
@@ -139,7 +129,8 @@ 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);
@@ -153,7 +144,6 @@ 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
@@ -165,14 +155,14 @@ namespace DamageAssesment.Api.Surveys.Providers
 
                     surveyDbContext.Surveys.Add(_survey);
                     await surveyDbContext.SaveChangesAsync();
-
+                  
                     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);
-                    result.Titles = CreateMultiLanguageObject(GetSurveyTranslations(_survey.Id, survey.Titles, ""));
+                    result.Titles = CreateMultiLanguageObject(GetSurveyTranslations(_survey.Id, survey.Titles, "")); 
                     return (true, result, "Successful");
                 }
                 else
@@ -188,7 +178,6 @@ 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
@@ -238,7 +227,6 @@ 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
@@ -251,7 +239,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 Successfully");
+                    return (true, result, $"Survey Id: {Id} deleted Successfuly");
                 }
                 else
                 {

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

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

DamageAssesmentApi/DamageAssesment.SurveyResponses.Test/DamageAssesment.Api.SurveyResponses.Test.csproj

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

DamageAssesmentApi/DamageAssesment.SurveyResponses.Test/MockData.cs

@@ -1,9 +1,9 @@
 
-using DamageAssesment.Api.Responses.Models;
+using DamageAssesment.Api.SurveyResponses.Models;
 using System.Collections.Generic;
 using System.Text;
 
-namespace DamageAssesment.Api.Responses.Test
+namespace DamageAssesment.Api.SurveyResponses.Test
 {
     public class MockData
     {

DamageAssesmentApi/DamageAssesment.SurveyResponses.Test/SurveyResponsesServiceTest.cs

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

DamageAssesmentApi/DamageAssesment.sln

@@ -17,15 +17,19 @@ 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.SurveyResponses", "DamageAssesment.Api.SurveyResponses\DamageAssesment.Api.SurveyResponses.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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Survey.Test", "DamageAssesment.Api.Surveys.Test\DamageAssesment.Api.Survey.Test.csproj", "{ADFB79E3-83C9-454F-A070-49D167BD28CC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.SurveyResponses.Test", "DamageAssesment.SurveyResponses.Test\DamageAssesment.Api.SurveyResponses.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}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Surveys", "DamageAssesment.Api.Surveys\DamageAssesment.Api.Surveys.csproj", "{55481AED-6801-47DB-A176-A6FA92002081}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Survey", "DamageAssesment.Api.Surveys\DamageAssesment.Api.Survey.csproj", "{55481AED-6801-47DB-A176-A6FA92002081}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Answers.Test", "DamageAssesment.Api.Answers.Test\DamageAssesment.Api.Answers.Test.csproj", "{594A47AC-DF50-47E5-903D-A856CADDF573}"
 EndProject
@@ -37,10 +41,6 @@ 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,6 +63,10 @@ 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
@@ -71,6 +75,10 @@ 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
@@ -103,14 +111,6 @@ 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

azure-pipelines.yml

@@ -1,16 +0,0 @@
-trigger:
-- '*'  # You can define triggers here to specify when the pipeline should run
-
-pool:
-  vmImage: 'ubuntu-latest'  # Use the appropriate VM image
-
-steps:
-- script: |
-    # Set the execution policy to allow script execution
-    chmod +x Scripts/build_and_push_services2acr.sh
-    
-    # Execute the script
-    ./Scripts/build_and_push_services2acr.sh
-    displayName: 'Run build_and_push_services2acr.sh'
-
-    displayName: 'Run Script'