Multi language dynamic object changes

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

@@ -98,7 +98,7 @@ namespace DamageAssesment.Api.Answers.Test
             mockAnswerService.Setup(service => service.PostAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (OkObjectResult)await AnswerProvider.CreateAnswer(mockInputAnswer);
+            var result =  (OkObjectResult) await AnswerProvider.CreateAnswer(mockInputAnswer);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -112,7 +112,7 @@ namespace DamageAssesment.Api.Answers.Test
             mockAnswerService.Setup(service => service.PostAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (BadRequestObjectResult)await AnswerProvider.CreateAnswer(mockInputAnswer);
+            var result = (BadRequestObjectResult)  await AnswerProvider.CreateAnswer(mockInputAnswer);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -126,7 +126,7 @@ namespace DamageAssesment.Api.Answers.Test
             mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (OkObjectResult)await AnswerProvider.UpdateAnswer(mockInputAnswer);
+            var result = (OkObjectResult) await AnswerProvider.UpdateAnswer(mockInputAnswer);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -140,7 +140,7 @@ namespace DamageAssesment.Api.Answers.Test
             mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (NotFoundObjectResult)await AnswerProvider.UpdateAnswer(mockInputAnswer);
+            var result = (NotFoundObjectResult) await AnswerProvider.UpdateAnswer(mockInputAnswer);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -154,7 +154,7 @@ namespace DamageAssesment.Api.Answers.Test
             mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (BadRequestObjectResult)await AnswerProvider.UpdateAnswer(mockInputAnswer);
+            var result = (BadRequestObjectResult) await AnswerProvider.UpdateAnswer(mockInputAnswer);
 
             Assert.Equal(400, result.StatusCode);
         }

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

@@ -43,9 +43,9 @@ namespace DamageAssesment.Api.Answers.Test
             return (false, list, null);
         }
 
-        public static async Task<Answers.Db.Answer> getInputAnswerData()
+        public static async Task<Answers.Models.Answer> getInputAnswerData()
         {
-            return new Answers.Db.Answer { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 };
+            return new Answers.Models.Answer { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 };
 
         }
 

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

@@ -14,7 +14,10 @@ namespace DamageAssesment.Api.Answers.Controllers
         public AnswersController(IAnswersProvider answersProvider) { 
         this.answerProvider=answersProvider;
         }
-        //get all answers
+        /// <summary>
+        /// Get all answers
+        /// </summary>
+        
         [HttpGet("Answers")]
         public async Task<ActionResult> GetAnswersAsync() {
         
@@ -26,7 +29,11 @@ namespace DamageAssesment.Api.Answers.Controllers
                return NoContent();
 
         }
-        //get answer based on answerid
+        /// <summary>
+        /// Get an answer based on answerId.
+        /// </summary>
+
+
         [HttpGet("Answers/{Id}")]
         public async Task<ActionResult> GetAnswerByIdAsync(int Id)
         {
@@ -39,7 +46,9 @@ namespace DamageAssesment.Api.Answers.Controllers
             return NotFound();
 
         }
-        // get all answers based on response id
+        /// <summary>
+        /// Get all answers based on responseId.
+        /// </summary>
         [HttpGet("AnswersByResponse/{ResponseId}")]
         public async Task<IActionResult> GetAnswersByResponseId(int ResponseId)
         {
@@ -50,7 +59,10 @@ namespace DamageAssesment.Api.Answers.Controllers
             }
             return NoContent();
         }
-        // get all answers based on question id
+        /// <summary>
+        /// Get all answers based on questionId.
+        /// </summary>
+
         [HttpGet("AnswersByQuestion/{QuestionId}")]
         public async Task<IActionResult> AnswersByQuestionId(int QuestionId)
         {
@@ -61,10 +73,12 @@ namespace DamageAssesment.Api.Answers.Controllers
             }
             return NotFound();
         }
-        //update existing answer
+        /// <summary>
+        /// Update an existing answer.
+        /// </summary>
 
         [HttpPut("Answers")]
-        public async Task<IActionResult> UpdateAnswer(Db.Answer answer)
+        public async Task<IActionResult> UpdateAnswer(Models.Answer answer)
         {
             if (answer != null)
             {
@@ -80,9 +94,12 @@ namespace DamageAssesment.Api.Answers.Controllers
             }
             return NotFound();
         }
-        //save new answer
+        /// <summary>
+        /// Save a new answer.
+        /// </summary>
+
         [HttpPost("Answers")]
-        public async Task<IActionResult> CreateAnswer(Db.Answer answer)
+        public async Task<IActionResult> CreateAnswer(Models.Answer answer)
         {
             if (answer != null)
             {
@@ -95,7 +112,10 @@ namespace DamageAssesment.Api.Answers.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = answer.Id }, answer);
         }
-        //delete existing answer
+        /// <summary>
+        ///  Delete an existing answer.
+        /// </summary>
+
         [HttpDelete("Answers/{id}")]
         public async Task<IActionResult> DeleteAnswer(int id)
         {

DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj

@@ -4,10 +4,12 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

@@ -10,7 +10,13 @@ namespace DamageAssesment.Api.Answers.Db
             
         }
         public DbSet<Db.Answer> Answers { get; set; }
-       
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<Answer>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
     }
 
 }

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

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

DamageAssesmentApi/DamageAssesment.Api.Answers/Profiles/AnswersProfile.cs

@@ -7,6 +7,7 @@ namespace DamageAssesment.Api.Answers.Profiles
         public AnswersProfile()
         {
             CreateMap<Db.Answer,Models.Answer>();
+            CreateMap<Models.Answer, Db.Answer>();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -2,6 +2,7 @@ using DamageAssesment.Api.Answers.Db;
 using DamageAssesment.Api.Answers.Interfaces;
 using DamageAssesment.Api.Answers.Providers;
 using Microsoft.EntityFrameworkCore;
+using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -10,15 +11,24 @@ var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+//builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(c =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    c.IncludeXmlComments(xmlPath);
+});
 builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AnswerDbContext>(option =>
 {
     option.UseInMemoryDatabase("Answers");
 });
+
 var app = builder.Build();
 
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {

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

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

DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

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

@@ -80,7 +80,7 @@ namespace DamageAssesment.Api.Attachments.Test
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);            
-            var result = (NoContentResult)await AttachmentProvider.UploadAttachmentAsync(AttachmentResponse);
+            var result = (NoContentResult) await AttachmentProvider.UploadAttachmentAsync(AttachmentResponse);
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -96,7 +96,7 @@ namespace DamageAssesment.Api.Attachments.Test
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
             AttachmentInfo attachmentInfo=new AttachmentInfo();
-            var result = (BadRequestObjectResult)await AttachmentProvider.UploadAttachmentAsync(attachmentInfo);
+            var result = (BadRequestObjectResult) await AttachmentProvider.UploadAttachmentAsync(attachmentInfo);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -112,7 +112,7 @@ namespace DamageAssesment.Api.Attachments.Test
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await AttachmentProvider.UpdateAttachmentAsync(AttachmentResponse);
+            var result = (NoContentResult) await AttachmentProvider.UpdateAttachmentAsync(AttachmentResponse);
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -128,7 +128,7 @@ namespace DamageAssesment.Api.Attachments.Test
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
             AttachmentInfo attachmentInfo = new AttachmentInfo();
-            var result = (BadRequestObjectResult)await AttachmentProvider.UpdateAttachmentAsync(attachmentInfo);
+            var result = (BadRequestObjectResult) await AttachmentProvider.UpdateAttachmentAsync(attachmentInfo);
 
             Assert.Equal(400, result.StatusCode);
         }

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

@@ -17,7 +17,7 @@ namespace DamageAssesment.Api.Attachments.Test
 
             for (int i = 0; i < 10; i++)
             {
-                list.Add(new Attachments.Models.Attachment(i, Guid.NewGuid().ToString() + "@gmail.com")
+                list.Add(new Attachments.Models.Attachment()
                 {
                     Id = i,
                     AnswerId = i,
@@ -73,10 +73,10 @@ namespace DamageAssesment.Api.Attachments.Test
             return (false, list, null);
         }
 
-        public static async Task<List<Attachments.Db.Attachment>> getInputAttachmentData()
+        public static async Task<List<Attachments.Models.Attachment>> getInputAttachmentData()
         {
-            List<Attachments.Db.Attachment> Attachments=new List<Db.Attachment>();
+            List<Attachments.Models.Attachment> Attachments=new List<Models.Attachment>();
-            Attachments.Add(new Db.Attachment{ Id = 0, AnswerId = 10, ResponseId = 10, URI = "sample", IsDeleted = false,FileName="sample1" }) ;
+            Attachments.Add(new Models.Attachment{ Id = 0, AnswerId = 10, ResponseId = 10, URI = "sample", IsDeleted = false,FileName="sample1" }) ;
             return Attachments;
         }
 

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

@@ -19,7 +19,10 @@ namespace DamageAssesment.Api.Attachments.Controllers
             this.AttachmentProvider = AttachmentsProvider;
             this.UploadService = uploadService;  
         }
-        //get all Attachments
+        /// <summary>
+        /// Get all attachments.
+        /// </summary>
+
         [HttpGet("Attachments")]
         public async Task<ActionResult> GetAttachmentsAsync()
         {
@@ -32,7 +35,9 @@ namespace DamageAssesment.Api.Attachments.Controllers
             return NoContent();
 
         }
-        //get all Attachment by Id
+        /// <summary>
+        /// Get all attachments by attachmentId.
+        /// </summary>
         [HttpGet("Attachments/{id}")]
         public async Task<ActionResult> GetAttachmentbyIdAsync(int id)
         {
@@ -73,7 +78,10 @@ namespace DamageAssesment.Api.Attachments.Controllers
         //    }
         //}
 
-        //Save new Attachment
+        /// <summary>
+        /// Save new Attachment(s)
+        /// </summary>
+
         [HttpPost("Attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo)
         {
@@ -82,7 +90,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                 if (attachmentInfo.Answers.Count > 0)
                 {
                     var Attachments =  await this.AttachmentProvider.GetAttachmentCounter();
-                    List<Db.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
+                    List<Models.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
                     var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments);
                     if (result.IsSuccess)
                     {
@@ -97,8 +105,10 @@ namespace DamageAssesment.Api.Attachments.Controllers
                 return BadRequest($"Internal server error: {ex}");
             }
         }
+        /// <summary>
+        /// Modify an new attachment.
+        /// </summary>
 
-        //Save new Attachment
         [HttpPut("Attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
         {
@@ -109,7 +119,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                     var res =  await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
                     if (res.IsSuccess)
                     {
-                        List<Db.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
+                        List<Models.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
                         var result = await this.AttachmentProvider.PutAttachmentAsync(attachments);
                         if (result.IsSuccess)
                         {
@@ -126,7 +136,9 @@ namespace DamageAssesment.Api.Attachments.Controllers
                 return BadRequest($"Internal server error: {ex}");
             }
         }
-        //delete existing Attachment
+        /// <summary>
+        /// Delete an existing attachment.
+        /// </summary>
         [HttpDelete("Delete")]
         public async Task<IActionResult> DeleteAttachment(int Id)
         {

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

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

DamageAssesmentApi/DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj

@@ -4,11 +4,13 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />

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

@@ -8,5 +8,12 @@ namespace DamageAssesment.Api.Attachments.Db
         {
         }
         public DbSet<Db.Attachment> Attachments { get; set; }
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<Attachment>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
     }
 }

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

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

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

@@ -4,9 +4,9 @@ namespace DamageAssesment.Api.Attachments.Interfaces
 {
     public interface IUploadService
     {
-        List<Db.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
+        List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
-        List<Db.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
+        List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
-        public List<Db.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
+        public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
         void Deletefile(string path);
         void Movefile(string path);
     }

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

@@ -13,10 +13,10 @@ namespace DamageAssesment.Api.Attachments.Models
         public bool IsDeleted { get; set; }
         public string FileName { get; set; }
 
-        public Attachment(int answerId, string uri)
+        //public Attachment(int answerId, string uri)
-        {
+        //{
-            this.AnswerId = answerId;
+        //    this.AnswerId = answerId;
-            this.URI = uri;
+        //    this.URI = uri;
-        }
+        //}
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Profiles/AttachmentsProfiles.cs

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

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -4,6 +4,7 @@ using DamageAssesment.Api.Attachments.Providers;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.FileProviders;
+using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -12,7 +13,14 @@ var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+//builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(c =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    c.IncludeXmlComments(xmlPath);
+});
 builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();

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

@@ -21,7 +21,7 @@ namespace DamageAssesment.Api.Attachments.Providers
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-            SeedData();
+           // SeedData();
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
         {
@@ -65,14 +65,15 @@ namespace DamageAssesment.Api.Attachments.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Db.Attachment> Attachments)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments)
         {
             try
             {
                 logger?.LogInformation("Query Attachment");
-                AttachmentDbContext.Attachments.AddRange(Attachments);
+                List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
-                AttachmentDbContext.SaveChanges();
+                AttachmentDbContext.Attachments.AddRange(attachments);
-                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachments);
+                await AttachmentDbContext.SaveChangesAsync();
+                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -82,14 +83,15 @@ namespace DamageAssesment.Api.Attachments.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Db.Attachment> Attachments)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments)
         {
             try
             {
                 logger?.LogInformation("Query Attachment");
-                AttachmentDbContext.Attachments.UpdateRange(Attachments);
+                List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
-                AttachmentDbContext.SaveChanges();
+                AttachmentDbContext.Attachments.UpdateRange(attachments);
-                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachments);
+                await AttachmentDbContext.SaveChangesAsync();
+                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -108,7 +110,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachments.Count > 0)
                 {
                     AttachmentDbContext.Attachments.RemoveRange(Attachments);
-                    AttachmentDbContext.SaveChanges();
+                    await AttachmentDbContext.SaveChangesAsync();
                 }
                 return (true, AttachmentId, "");
             }
@@ -141,7 +143,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachments.Count > 0)
                 {
                     AttachmentDbContext.Attachments.RemoveRange(Attachments);
-                    AttachmentDbContext.SaveChanges();
+                    await AttachmentDbContext.SaveChangesAsync();
                 }
                 return (true, AttachmentId, "");
             }
@@ -152,7 +154,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 return (false, AttachmentId, "");
             }
         }
-        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)>GetAttachmentInfo(List<AnswerInfo> answers)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentInfo(List<AnswerInfo> answers)
         {
             try
             {
@@ -181,7 +183,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 }
                 Attachment.IsDeleted = true;
                 AttachmentDbContext.Attachments.Update(Attachment);
-                AttachmentDbContext.SaveChanges();
+                await AttachmentDbContext.SaveChangesAsync();
                 return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id} is deleted");
             }
             catch (Exception ex)
@@ -204,10 +206,11 @@ namespace DamageAssesment.Api.Attachments.Providers
                 FileModel fileModel= new FileModel(){AttachmentId=0,FileName="Sample",FileContent= "c2FtcGxl",FileExtension=".txt"};
                 List<AnswerInfo> answerInfos=new List<AnswerInfo>();
                 answerInfos.Add(new AnswerInfo(){ AnswerId = 1,postedFiles=new List<FileModel> { fileModel }});
-                List<Db.Attachment> attachments = uploadservice.UploadAttachment(1, 0, answerInfos);
+                List<Models.Attachment> attachments = uploadservice.UploadAttachment(1, 0, answerInfos);
                 if (attachments.Count > 0)
                 {
-                    AttachmentDbContext.Attachments.AddRange(attachments);
+                    List<Db.Attachment> Attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(attachments);
+                    AttachmentDbContext.Attachments.AddRange(Attachments);
                     AttachmentDbContext.SaveChanges();
                 }
             }

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

@@ -24,7 +24,7 @@ namespace DamageAssesment.Api.Attachments.Providers
             uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
         }
-        public List<Db.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
+        public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
         {
             var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
             String responseDirectory = "Response-" + responseId;
@@ -42,7 +42,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                     Deletefile(searchFile);
                 }
             }
-            List<Db.Attachment> attachments = new List<Db.Attachment>();
+            List<Models.Attachment> attachments = new List<Models.Attachment>();
             foreach (IFormFile item in postedFile)
             {
                 
@@ -55,15 +55,15 @@ namespace DamageAssesment.Api.Attachments.Providers
                 {
                     item.CopyTo(stream);
                 }
-                attachments.Add(new Db.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
+                attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
             }
 
             return attachments;
         }
 
-        public List<Db.Attachment> UploadAttachment(int responseId, int counter,List<AnswerInfo> answers)
+        public List<Models.Attachment> UploadAttachment(int responseId, int counter,List<AnswerInfo> answers)
         {
-            List<Db.Attachment> attachments = new List<Db.Attachment>();
+            List<Models.Attachment> attachments = new List<Models.Attachment>();
             try
             {
                 foreach (var item in answers)
@@ -94,20 +94,20 @@ namespace DamageAssesment.Api.Attachments.Providers
                         var dbPath = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
 
-                        attachments.Add(new Db.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
+                        attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
                     }
                 }
                 return attachments;
             }
             catch (Exception ex) {
-                return new List<Db.Attachment>();
+                return new List<Models.Attachment>();
             }
 
            
         }
-        public List<Db.Attachment> UpdateAttachments(int responseId,List<AnswerInfo> answers,IEnumerable<Models.Attachment> attachments)
+        public List<Models.Attachment> UpdateAttachments(int responseId,List<AnswerInfo> answers,IEnumerable<Models.Attachment> attachments)
         {
-            List<Db.Attachment> Dbattachments = new List<Db.Attachment>();
+            List<Models.Attachment> Dbattachments = new List<Models.Attachment>();
             foreach (Models.Attachment searchFile in attachments)
             {
                 Deletefile(searchFile.URI);
@@ -131,7 +131,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                     var dbPath = Path.Combine(fullDirectoryPath, fileName);
                     File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
 
-                    Dbattachments.Add(new Db.Attachment { Id=attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
+                    Dbattachments.Add(new Models.Attachment { Id=attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
                 }
             }
             return Dbattachments;

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

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

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

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

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

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

@@ -15,7 +15,11 @@ namespace DamageAssesment.Api.Employees.Controllers
         {
             this.EmployeeProvider = EmployeesProvider;
         }
-        //get all Employees
+
+        /// <summary>
+        /// GET request for retrieving employees.
+        /// </summary>
+
         [HttpGet("Employees")]
         public async Task<ActionResult> GetEmployeesAsync()
         {
@@ -28,7 +32,11 @@ namespace DamageAssesment.Api.Employees.Controllers
             return NoContent();
 
         }
-        //get Employee based on Employeeid
+
+        /// <summary>
+        /// GET request for retrieving an employee by ID.
+        /// </summary>
+        
         [HttpGet("Employees/{Id}")]
         public async Task<ActionResult> GetEmployeeByIdAsync(string Id)
         {
@@ -41,14 +49,17 @@ namespace DamageAssesment.Api.Employees.Controllers
             return NotFound();
 
         }
-        //update existing Employee
    
+        /// <summary>
+        /// PUT request for updating an existing employee.
+        /// </summary>
+        /// <param name="Employee">The updated employee object.</param>
         [HttpPut("Employees")]
-        public async Task<IActionResult> UpdateEmployee(Db.Employee Employee)
+        public async Task<IActionResult> UpdateEmployee(string Id, Models.Employee Employee)
         {
             if (Employee != null)
             {
-                var result = await this.EmployeeProvider.UpdateEmployeeAsync(Employee);
+                var result = await this.EmployeeProvider.UpdateEmployeeAsync(Id,Employee);
                 if (result.IsSuccess)
                 {
                     return Ok(result.Employee);
@@ -60,9 +71,13 @@ namespace DamageAssesment.Api.Employees.Controllers
             }
             return NotFound();
         }
-        //save new Employee
+
+        /// <summary>
+        /// POST request for creating a new employee.
+        /// </summary>
+        /// <param name="Employee">The employee information for creating a new employee.</param>
         [HttpPost("Employees")]
-        public async Task<IActionResult> CreateEmployee(Db.Employee Employee)
+        public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
         {
             if (Employee != null)
             {
@@ -75,7 +90,10 @@ namespace DamageAssesment.Api.Employees.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = Employee.Id }, Employee);
         }
-        //delete existing Employee
+        /// <summary>
+        /// DELETE request for deleting an existing employee.
+        /// </summary>
+        /// <param name="id">The ID of the employee to be deleted.</param>
         [HttpDelete("Employees/{id}")]
         public async Task<IActionResult> DeleteEmployee(string id)
         {

DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj

@@ -1,13 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

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

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

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

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

@@ -4,18 +4,10 @@ namespace DamageAssesment.Api.Employees.Models
 {
     public class Employee
     {
-        [Key]
         public string Id { get; set; }
-
-        [StringLength(50)]
         public string Name { get; set; }
-
         public DateTime BirthDate { get; set; }
-
-        [StringLength(50)]
         public string OfficePhoneNumber { get; set; }
-
-        [StringLength(50)]
         public string Email { get; set; }
         public bool IsActive { get; set; }
         public string? PreferredLanguage { get; set; } = "en";

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -2,6 +2,7 @@ using DamageAssesment.Api.Employees.Db;
 using DamageAssesment.Api.Employees.Interfaces;
 using DamageAssesment.Api.Employees.Providers;
 using Microsoft.EntityFrameworkCore;
+using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -10,7 +11,15 @@ var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+//builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(c =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    c.IncludeXmlComments(xmlPath);
+});
+
 builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<EmployeeDbContext>(option =>
@@ -25,6 +34,13 @@ if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
+
+    using (var serviceScope = app.Services.CreateScope())
+    {
+        var services = serviceScope.ServiceProvider;
+        var employeesProvider = services.GetRequiredService<IEmployeesProvider>();
+        employeesProvider.SeedData();
+    }
 }
 
 app.UseAuthorization();

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

@@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Providers
             this.EmployeeDbContext = EmployeeDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+           // SeedData();
         }
 
         public async Task<(bool IsSuccess, IEnumerable<Models.Employee> Employees, string ErrorMessage)> GetEmployeesAsync()
@@ -65,17 +65,18 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Db.Employee Employee)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Models.Employee Employee)
         {
             try
             {
+                Db.Employee _employee = mapper.Map<Models.Employee, Db.Employee>(Employee);
+
                 logger?.LogInformation("Query Employee");
                 if (!EmployeeExists(Employee.Id))
                 {
-                    EmployeeDbContext.Employees.Add(Employee);
+                    EmployeeDbContext.Employees.Add(_employee);
                     EmployeeDbContext.SaveChanges();
-                    var result = mapper.Map<Db.Employee, Models.Employee>(Employee);
+                    return (true, Employee, null);
-                    return (true, result, null);
                 }
                 return (false, null, "Employee is already exits");
             }
@@ -85,19 +86,20 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(Db.Employee Employee)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(string Id , Models.Employee Employee)
         {
             try
             {
                 if (Employee != null)
                 {
-                    var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id.ToLower() == Employee.Id.ToLower()).FirstOrDefaultAsync();
+                    var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id.ToLower() == Id.ToLower()).FirstOrDefaultAsync();
 
                     if (_employee != null)
                     {
-                        EmployeeDbContext.Employees.Update(Employee);
+                        Db.Employee vEmployee = mapper.Map<Models.Employee, Db.Employee>(Employee);
+                        EmployeeDbContext.Employees.Update(vEmployee);
                         EmployeeDbContext.SaveChanges();
-                        return (true, mapper.Map<Db.Employee, Models.Employee>(Employee), "Successful");
+                        return (true, Employee, "Successful");
                     }
                     else
                     {
@@ -143,7 +145,7 @@ namespace DamageAssesment.Api.Employees.Providers
             return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id.ToLower() == id.ToLower()) > 0;
         }
 
-        private void SeedData()
+        public void SeedData()
         {
             if (!EmployeeDbContext.Employees.Any())
             {
@@ -151,8 +153,8 @@ namespace DamageAssesment.Api.Employees.Providers
                 EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
                 EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30) ,IsActive = true, PreferredLanguage = "fr" });
                 EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20) ,IsActive = true, PreferredLanguage = "en" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23) ,IsActive = true, PreferredLanguage = "sp" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23) ,IsActive = true, PreferredLanguage = "es" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32) ,IsActive = true, PreferredLanguage = "sp" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32) ,IsActive = true, PreferredLanguage = "es" });
                 EmployeeDbContext.SaveChanges();
             }
 

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

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

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

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

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

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

@@ -14,7 +14,10 @@ namespace DamageAssesment.Api.Locations.Controllers
         {
             this.LocationProvider = LocationsProvider;
         }
-        // Get all Locations
+        /// <summary>
+        /// Get all locations.
+        /// </summary>
+
         [HttpGet("Locations")]
         public async Task<ActionResult> GetLocationsAsync()
         {
@@ -24,10 +27,13 @@ namespace DamageAssesment.Api.Locations.Controllers
             {
                 return Ok(result.locations);
             }
-            return NotFound();
+            return NoContent();
 
         }
-        // Get all Location based on Id
+        /// <summary>
+        /// Get all locations based on locationdId.
+        /// </summary>
+
         [HttpGet("Locations/{id}")]
         public async Task<ActionResult> GetLocationByIdAsync(string id)
         {
@@ -40,9 +46,12 @@ namespace DamageAssesment.Api.Locations.Controllers
             return NotFound();
 
         }
-        // Update Location entity
+        /// <summary>
+        /// Update a Location.
+        /// </summary>
+
         [HttpPut("Locations")]
-        public async Task<IActionResult> UpdateLocation(Db.Location Location)
+        public async Task<IActionResult> UpdateLocation(Models.Location Location)
         {
             if (Location != null)
             {
@@ -55,9 +64,12 @@ namespace DamageAssesment.Api.Locations.Controllers
             }
             return NotFound();
         }
-        //save new location
+        /// <summary>
+        /// Save a new location.
+        /// </summary>
+
         [HttpPost("Locations")]
-        public async Task<IActionResult> CreateLocation(Db.Location Location)
+        public async Task<IActionResult> CreateLocation(Models.Location Location)
         {
             if (Location != null)
             {
@@ -66,11 +78,14 @@ namespace DamageAssesment.Api.Locations.Controllers
                 {
                     return Ok(result.Question);
                 }
-                return NotFound();
+                return BadRequest();
             }
-            return CreatedAtRoute("DefaultApi", new { id = Location.Id }, Location);
+            return BadRequest();
         }
-        //delete existing location
+        /// <summary>
+        /// Delete an existing location.
+        /// </summary>
+
         [HttpDelete("Locations/{id}")]
         public async Task<IActionResult> DeleteLocation(string id)
         {

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

@@ -13,8 +13,10 @@ namespace DamageAssesment.Api.Locations.Controllers
         {
             this.regionProvider = regionProvider;
         }
+        /// <summary>
+        /// Get all regions.2
+        /// </summary>
 
-        // Get all Regions
         [HttpGet]
         public async Task<ActionResult> GetRegionsAsync()
         {
@@ -25,6 +27,9 @@ namespace DamageAssesment.Api.Locations.Controllers
             }
             return NoContent();
         }
+        /// <summary>
+        /// GET request for retrieving a region by its ID.
+        /// </summary>
 
         [HttpGet("{Id}")]
         public async Task<ActionResult> GetRegionAsync(string Id)
@@ -36,6 +41,9 @@ namespace DamageAssesment.Api.Locations.Controllers
             }
             return NotFound();
         }
+        /// <summary>
+        /// POST request for creating a new region.
+        /// </summary>
 
         [HttpPost]
         public async Task<ActionResult> PostRegionAsync(Models.Region region)
@@ -47,6 +55,9 @@ namespace DamageAssesment.Api.Locations.Controllers
             }
             return BadRequest(result.ErrorMessage);
         }
+        /// <summary>
+        /// PUT request for updating an existing region.
+        /// </summary>
 
         [HttpPut]
         public async Task<ActionResult> PutRegionAsync(Models.Region region)
@@ -61,6 +72,10 @@ namespace DamageAssesment.Api.Locations.Controllers
 
             return BadRequest(result.ErrorMessage);
         }
+        /// <summary>
+        /// DELETE request for deleting a region based on ID.
+        /// </summary>
+
 
         [HttpDelete("{Id}")]
         public async Task<ActionResult> DeleteRegionAsync(string Id)

DamageAssesmentApi/DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj

@@ -4,10 +4,12 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -2,6 +2,7 @@ using DamageAssesment.Api.Locations.Db;
 using DamageAssesment.Api.Locations.Interfaces;
 using DamageAssesment.Api.Locations.Providers;
 using Microsoft.EntityFrameworkCore;
+using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -10,8 +11,14 @@ var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+//builder.Services.AddSwaggerGen();
-
+builder.Services.AddSwaggerGen(c =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    c.IncludeXmlComments(xmlPath);
+});
 builder.Services.AddScoped<ILocationsProvider, LocationsProvider>();
 builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
@@ -26,6 +33,15 @@ if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
+
+    using (var serviceScope = app.Services.CreateScope())
+    {
+        var services = serviceScope.ServiceProvider;
+        var locationProvider = services.GetRequiredService<ILocationsProvider>();
+        var regionProvider = services.GetRequiredService<IRegionsProvider>();
+        locationProvider.SeedData();
+        regionProvider.SeedData();
+    }
 }
 
 app.UseAuthorization();

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

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

@@ -1,13 +1,8 @@
-using DamageAssesment.Api.Questions.Db;
+using DamageAssesment.Api.Questions.Interfaces;
-using DamageAssesment.Api.Questions.Interfaces;
-using DamageAssesment.Api.Questions.Models;
-using DamageAssesment.Api.Questions.Providers;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class QuestionsController : ControllerBase
     {
@@ -19,41 +14,63 @@ namespace DamageAssesment.Api.Questions.Controllers
             this.questionsProvider = questionsProvider;
 
         }
+
+        /// <summary>
+        /// GET request for retrieving questions.
+        /// </summary>
+
         // get all questions
-        [HttpGet("Questions")]
+        [Route("Questions")]
-        public async Task<IActionResult> GetQuestionsAsync()
+        [Route("Questions/{language:alpha}")]
+        [HttpGet]
+        public async Task<IActionResult> GetQuestionsAsync(string? language)
         {
-            var result = await this.questionsProvider.GetQuestionsAsync();
+            var result = await this.questionsProvider.GetQuestionsAsync(language);
             if (result.IsSuccess)
             {
                 return Ok(result.Questions);
             }
             return NoContent();
         }
+
         //Get questions based on question id
-        [HttpGet("Questions/{id}")]
+        /// <summary>
-        public async Task<IActionResult> GetQuestionAsync(int id)
+        /// GET request for retrieving a question by ID.
+        /// </summary>
+        [Route("Questions/{id}/{language:alpha}")]
+        [Route("Questions/{id:int}")]
+        [HttpGet]
+        public async Task<IActionResult> GetQuestionByIdAsync(string? language,int id)
         {
-            var result = await this.questionsProvider.GetQuestionAsync(id);
+            var result = await this.questionsProvider.GetQuestionAsync(id, language);
             if (result.IsSuccess)
             {
                 return Ok(result.Question);
             }
             return NotFound();
         }
+
         //get all questions based on survey id
-        [HttpGet("GetSurveyQuestions/{surveyId}")]
+        /// <summary>
-        public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? Language)
+        /// 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}")]
+        [HttpGet]
+        public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? language)
         {
-            if (string.IsNullOrEmpty(Language)) Language = "en";
+            var result = await this.questionsProvider.GetSurveyQuestionAsync(surveyId, language);
-            var result = await this.questionsProvider.GetSurveyQuestionAsync(surveyId, Language);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyQuestions);
             }
             return NotFound();
         }
-        //update existing question
+        /// <summary>
+        /// PUT request for updating a question (multilingual).
+        /// </summary>
+
         [HttpPut("Questions")]
         public async Task<IActionResult> UpdateQuestion(Models.Question question)
         {
@@ -71,7 +88,10 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
         }
-        //save new question
+        /// <summary>
+        /// POST request for creating a new question (multilingual).
+        /// </summary>
+
         [HttpPost("Questions")]
         public async Task<IActionResult> CreateQuestion(Models.Question question)
         {
@@ -86,7 +106,10 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
         }
-        // delete existing question
+        /// <summary>
+        /// DELETE request for deleting a question based on ID.
+        /// </summary>
+
         [HttpDelete("Questions/{id}")]
         public async Task<IActionResult> DeleteQuestion(int id)
         {
@@ -98,23 +121,30 @@ namespace DamageAssesment.Api.Questions.Controllers
             return NotFound();
         }
 
+        /// <summary>
+        /// GET request for retrieving question categories.
+        /// </summary>
 
-        // get all questions
+        [HttpGet("Questions/Categories")]
-        [HttpGet("QuestionCategories")]
+        [HttpGet("Questions/Categories/{language:alpha}")]
-        public async Task<IActionResult> GetQuestionCategoriesAsync()
+        public async Task<IActionResult> GetQuestionCategoriesAsync(string? language)
         {
-            var result = await this.questionsProvider.GetQuestionCategoriesAsync();
+            var result = await this.questionsProvider.GetQuestionCategoriesAsync(language);
             if (result.IsSuccess)
             {
                 return Ok(result.QuestionCategories);
             }
             return NoContent();
         }
-        //Get questions based on question id
+        /// <summary>
-        [HttpGet("QuestionCategories/{id}")]
+        /// GET request for retrieving a question category by ID.
-        public async Task<IActionResult> GetQuestionCategoryAsync(int id)
+        /// </summary>
+
+        [HttpGet("Questions/Categories/{id:int}")]
+        [HttpGet("Questions/Categories/{id:int}/{language:alpha}")]
+        public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language)
         {
-            var result = await this.questionsProvider.GetQuestionCategoryAsync(id);
+            var result = await this.questionsProvider.GetQuestionCategoryAsync(id, language);
             if (result.IsSuccess)
             {
                 return Ok(result.QuestionCategory);
@@ -123,8 +153,11 @@ namespace DamageAssesment.Api.Questions.Controllers
         }
 
 
-        //update existing question
+        /// <summary>
-        [HttpPut("QuestionCategories")]
+        /// PUT request for updating a question category.
+        /// </summary>
+
+        [HttpPut("Questions/Categories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -141,8 +174,11 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = questionCategory.Id }, questionCategory);
         }
-        //save new question
+        /// <summary>
-        [HttpPost("QuestionCategories")]
+        /// POST request for creating a new question category.
+        /// </summary>
+
+        [HttpPost("Questions/Categories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -156,8 +192,11 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = questionCategory.Id }, questionCategory);
         }
-        // delete existing question
+        /// <summary>
-        [HttpDelete("QuestionCategories/{id}")]
+        /// DELETE request for deleting a question category based on ID.
+        /// </summary>
+
+        [HttpDelete("Questions/Categories/{id}")]
         public async Task<IActionResult> DeleteQuestionCategory(int id)
         {
             var result = await this.questionsProvider.DeleteQuestionCategoryAsync(id);

DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj

@@ -1,13 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

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

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

@@ -20,7 +20,6 @@ namespace DamageAssesment.Api.Questions.Db
         public bool Key { get; set; }
         [ForeignKey("Survey")]
         public int? SurveyId { get; set; }
-        public string QuestionGroup { get; set; }
         [ForeignKey("QuestionCategory")]
         public int CategoryId { get; set; }
 

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

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

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

@@ -10,16 +10,29 @@ namespace DamageAssesment.Api.Questions.Db
         public DbSet<Db.QuestionType> QuestionTypes { get; set; }
         public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; }
         public DbSet<Db.QuestionCategory> QuestionCategories { get; set; }
+        public DbSet<Db.CategoryTranslation> CategoryTranslations { get; set; }
         public QuestionDbContext(DbContextOptions options) : base(options)
         {
 
         }
-        //protected override void OnModelCreating(ModelBuilder modelBuilder)
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        //{
+        {
-        //    modelBuilder.Entity<Question>()
+            base.OnModelCreating(modelBuilder);
-        //        .HasOne(a => a.QuestionType)
+            modelBuilder.Entity<Question>()
-        //        .WithOne(b => b.Question)
+                .Property(item => item.Id)
-        //        .HasForeignKey<QuestionType>(b => b.QuestionTypeID);
+                .ValueGeneratedOnAdd();
-        //}
+            modelBuilder.Entity<QuestionType>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<QuestionsTranslation>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<QuestionCategory>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<CategoryTranslation>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
     }
 }

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

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

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

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

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

@@ -2,11 +2,17 @@
 
 namespace DamageAssesment.Api.Questions.Models
 {
-    public class Question
+    public class MultiLanQuestion: BaseQuestion
+    {
+        public MultiLanguage Questions { get; set; }
+    }
+    public class Question: BaseQuestion
+    {
+        public List<QuestionsTranslation> Questions { get; set; }
+    }
+    public class BaseQuestion
     {
         public int Id { get; set; }
-        public List<QuestionsTranslation> Questions { get; set; }
-
         //public int QuestionTypeID { get; set; }
 
         public string TypeText { get; set; } = string.Empty;
@@ -17,7 +23,6 @@ namespace DamageAssesment.Api.Questions.Models
 
         public bool Key { get; set; }
         public int? SurveyId { get; set; }
-        public string QuestionGroup { get; set; }
         public int CategoryId { get; set; }
         // public int? Survey_SurveyID { get; set; }
     }

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

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

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

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

@@ -3,6 +3,7 @@ using DamageAssesment.Api.Questions.Interfaces;
 using DamageAssesment.Api.Questions.Providers;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
+using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -17,7 +18,14 @@ builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 
 
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+//builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(c =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    c.IncludeXmlComments(xmlPath);
+});
 builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
     option.UseInMemoryDatabase("Questions");
@@ -29,6 +37,13 @@ if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
+
+    using (var serviceScope = app.Services.CreateScope())
+    {
+        var services = serviceScope.ServiceProvider;
+        var questionProvider = services.GetRequiredService<IQuestionsProvider>();
+        questionProvider.SeedData();
+    }
 }
 
 app.UseAuthorization();

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

@@ -5,6 +5,8 @@ using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace DamageAssesment.Api.Questions.Providers
 {
@@ -24,54 +26,122 @@ namespace DamageAssesment.Api.Questions.Providers
             SeedData();
         }
 
-
+        public void SeedData()
-
-        private 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 = 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 = "sp" });
+                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 = "sp" });
+                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 = "sp" });
+                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, QuestionGroup = "group1",CategoryId=1 });
+                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, QuestionGroup = "group1", 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, QuestionGroup = "group1", CategoryId = 2 });
+                questionDbContext.Questions.Add(new Db.Question() { Id = 3,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true,  CategoryId = 2 });
                 questionDbContext.SaveChanges();
             }
             if (!questionDbContext.QuestionTypes.Any())
             {
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 1, TypeText = "Text 1" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 1, TypeText = "RadioButton" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 2, TypeText = "Text 2" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 2, TypeText = "CheckBox" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 3, TypeText = "Text 3" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 3, TypeText = "TextBox" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 4, TypeText = "Text 4" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 5, TypeText = "Text 5" });
                 questionDbContext.SaveChanges();
             }
 
             if (!questionDbContext.QuestionCategories.Any())
             {
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 1, CategoryName = "Category 1", CategoryImage="img1" });
+                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, CategoryName = "Category 2", CategoryImage = "img1" });
+                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, CategoryName = "Category 3", CategoryImage = "img1" });
+                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, CategoryName = "Category 4", CategoryImage = "img1" });
+                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, CategoryName = "Category 5", CategoryImage = "img1" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory()   { Id = 5, IconName = "Debris", IconLibrary = "https://example.com/images/img5.png" });
                 questionDbContext.SaveChanges();
             }
 
+            if (!questionDbContext.CategoryTranslations.Any())
+            {
+
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 1, CategoryId = 1, Title = "Flooding", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 2, CategoryId = 2, Title = "Electrical", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 3, CategoryId = 3, Title = "Structural", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 4, CategoryId = 4, Title = "Utility", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 5, CategoryId = 5, Title = "Debris", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 6, CategoryId = 1, Title = "Inondation", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 7, CategoryId = 2, Title = "Électrique", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 8, CategoryId = 3, Title = "De construction", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 9, CategoryId = 4, Title = "Utilitaire", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 10, CategoryId = 5, Title = "Débris", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 11, CategoryId = 1, Title = "Inundación", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 12, CategoryId = 2, Title = "Eléctrica", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 13, CategoryId = 3, Title = "Estructural", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 14, CategoryId = 4, Title = "Utilidad", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 15, CategoryId = 5, Title = "Escombros", Language = "es" });
+                questionDbContext.SaveChanges();
+            }
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Question> Questions, string ErrorMessage)> GetQuestionsAsync()
+        public List<Models.CategoryTranslation> GetCategoryTranslations(int id, string? language)
+        {
+            List<Models.CategoryTranslation> categoryTranslations = new List<Models.CategoryTranslation>();
+            if (string.IsNullOrEmpty(language))
+            {
+                categoryTranslations = mapper.Map<List<Db.CategoryTranslation>, List<Models.CategoryTranslation>>(
+                    questionDbContext.CategoryTranslations.AsNoTracking().Where(a => a.CategoryId == id).ToList());
+            }
+            else
+            {
+                categoryTranslations = mapper.Map<List<Db.CategoryTranslation>, List<Models.CategoryTranslation>>(
+                questionDbContext.CategoryTranslations.AsNoTracking().Where(a => a.CategoryId == id && a.Language == language).ToList());
+            }
+            return categoryTranslations;
+        }
+        public object CreateCategoryMultiLanguageObject(List<Models.CategoryTranslation> categoryTranslations)
+        {
+            object MultiLanguage = new object();
+            Dictionary<string, string> dict = new Dictionary<string, string>();
+            foreach (Models.CategoryTranslation item in categoryTranslations)
+            {
+                dict.Add(item.Language, item.Title);
+            }
+            MultiLanguage = dict;
+            return MultiLanguage;
+        }
+        public List<Models.QuestionsTranslation> GetQuestionsTranslations(int id, string? language)
+        {
+            List<Models.QuestionsTranslation> QuestionTranslations;
+            if (string.IsNullOrEmpty(language))
+            {
+                QuestionTranslations = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                    questionDbContext.QuestionsTranslations.AsNoTracking().Where(a => a.QuestionId == id).ToList());
+            }
+            else
+            {
+                QuestionTranslations = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                questionDbContext.QuestionsTranslations.AsNoTracking().Where(a => a.QuestionId == id && a.Language == language).ToList());
+            }
+            return QuestionTranslations;
+        }
+        public MultiLanguage CreateMultiLanguageObject(List<Models.QuestionsTranslation> questions)
+        {
+            MultiLanguage MultiLanguage = new MultiLanguage();
+            Dictionary<string, string> dict = new Dictionary<string, string>();
+            foreach (Models.QuestionsTranslation item in questions)
+            {
+                dict.Add(item.Language, item.QuestionText);
+            }
+            MultiLanguage.questionText = dict;
+            return MultiLanguage;
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanQuestion> Questions, string ErrorMessage)> GetQuestionsAsync(string language)
         {
             try
             {
@@ -81,11 +151,10 @@ namespace DamageAssesment.Api.Questions.Providers
                 {
 
                     //logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.Question>>(questions);
+                    var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.MultiLanQuestion>>(questions);
                     foreach (var question in result)
                     {
-                        question.Questions=mapper.Map<List<Db.QuestionsTranslation>,List<Models.QuestionsTranslation>>(
+                        question.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(question.Id, language));
-                            questionDbContext.QuestionsTranslations.Where(a=>a.QuestionId==question.Id).ToList());
                     }
                     return (true, result, null);
                 }
@@ -97,18 +166,17 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> GetQuestionAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> GetQuestionAsync(int id, string language)
         {
             try
             {
                 logger?.LogInformation("Query Question");
-                var question = await questionDbContext.Questions.Include("QuestionType").AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                var question = await questionDbContext.Questions.Include("QuestionType").AsNoTracking().FirstOrDefaultAsync(q => q.Id == id);
                 if (question != null)
                 {
                     logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<Db.Question, Models.Question>(question);
+                    var result = mapper.Map<Db.Question, Models.MultiLanQuestion>(question);                    
-                    result.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                    result.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(id, language));
-                            questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == result.Id).ToList());
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -119,35 +187,34 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public List<Models.Question>  GetSurveyQuestion(List<Models.Question> questions,string Language)
+        public List<Models.MultiLanQuestion> GetSurveyQuestion(List<Models.MultiLanQuestion> questions, string language)
         {
             foreach (var item in questions)
             {
-                item.Questions= mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                item.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(item.Id, language));
-                            questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == item.Id && a.Language== Language).ToList());
             }
             return questions;
         }
-        public async Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int SurveyId, string Language)
+        public async Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int SurveyId, string language)
         {
             try
             {
                 logger?.LogInformation("Query Question");
-                var questions = await questionDbContext.Questions.Include("QuestionType").Where(a=>a.SurveyId==SurveyId).AsNoTracking().ToListAsync();
+                var questions = await questionDbContext.Questions.Include("QuestionType").Where(a => a.SurveyId == SurveyId).AsNoTracking().ToListAsync();
                 if (questions != null)
                 {
                     List<SurveyQuestions> surveyQuestionsList = new List<SurveyQuestions>();
-                    List<int> CategoryIds=questions.Select(a=>a.CategoryId).Distinct().ToList();
+                    List<int> CategoryIds = questions.Select(a => a.CategoryId).Distinct().ToList();
-                    var questioncategories = await questionDbContext.QuestionCategories.Where(a =>CategoryIds.Contains(a.Id)).ToListAsync();
+                    var questioncategories = await questionDbContext.QuestionCategories.Where(a => CategoryIds.Contains(a.Id)).ToListAsync();
                     //logger?.LogInformation($"{question} customer(s) found");
                     foreach (var item in questioncategories)
                     {
                         surveyQuestionsList.Add(new SurveyQuestions()
                         {
                             CategoryId = item.Id,
-                            CategoryImage = item.CategoryImage,
+                            IconLibrary = item.IconLibrary,
-                            CategoryName = item.CategoryName,
+                            IconName = item.IconName,
-                            Questions = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.Question>>(questions.Where(a => a.CategoryId == item.Id).ToList()), Language)
+                            Questions = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanQuestion>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language)
                         });
                     }
 
@@ -162,20 +229,22 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question)
         {
             try
             {
                 logger?.LogInformation("Query Question");
                 var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
                 var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
-                dbquestion.QuestionTypeId=questionDbContext.QuestionTypes.Where(a=>a.TypeText==Question.TypeText).Select(a=>a.Id).FirstOrDefault();
+                dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
                 questionDbContext.Questions.Add(dbquestion);
                 dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
                 questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
                 questionDbContext.SaveChanges();
                 Question.Id = dbquestion.Id;
-                return (true, Question, null);
+                var result = mapper.Map<Db.Question, Models.MultiLanQuestion>(dbquestion);
+                result.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id,""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -183,7 +252,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
         {
             try
             {
@@ -192,12 +261,14 @@ namespace DamageAssesment.Api.Questions.Providers
                 dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
                 questionDbContext.Entry(dbquestion).State = EntityState.Modified;
                 var oldquestions = questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == dbquestion.Id).ToList();
-                if(oldquestions!=null)
+                if (oldquestions != null)
                     questionDbContext.QuestionsTranslations.RemoveRange(oldquestions);
                 dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
                 questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
                 questionDbContext.SaveChanges();
-                return (true, Question, null);
+                var result = mapper.Map<Db.Question, Models.MultiLanQuestion>(dbquestion);
+                result.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -206,21 +277,23 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> DeleteQuestionAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestion Question, string ErrorMessage)> DeleteQuestionAsync(int id)
         {
             try
             {
-                var question = await questionDbContext.Questions.Where(x => x.Id == Id).FirstOrDefaultAsync();
+                var question = await questionDbContext.Questions.Where(x => x.Id == id).FirstOrDefaultAsync();
 
                 if (question != null)
                 {
+                    var result = mapper.Map<Db.Question, Models.MultiLanQuestion>(question);
+                    result.Questions = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
                     questionDbContext.Questions.Remove(question);
                     questionDbContext.SaveChanges();
-                    return (true, mapper.Map<Db.Question, Models.Question>(question), $"QuestionID {Id} deleted Successfuly");
+                    return (true, result, $"QuestionID {id} deleted Successfuly");
                 }
                 else
                 {
-                    logger?.LogInformation($"QuestionID: {Id} Not found");
+                    logger?.LogInformation($"QuestionID: {id} Not found");
                     return (false, null, "Not Found");
                 }
             }
@@ -231,11 +304,9 @@ namespace DamageAssesment.Api.Questions.Providers
             }
         }
 
-
-
         //Question Category Logic
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.QuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync()
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanQuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync(string? language)
         {
             try
             {
@@ -244,7 +315,11 @@ namespace DamageAssesment.Api.Questions.Providers
                 if (questionCategories != null)
                 {
                     //logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<IEnumerable<Db.QuestionCategory>, IEnumerable<Models.QuestionCategory>>(questionCategories);
+                    var result = mapper.Map<IEnumerable<Db.QuestionCategory>, IEnumerable<Models.MultiLanQuestionCategory>>(questionCategories);
+                    foreach (var category in result)
+                    {
+                        category.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(category.Id, language));
+                    }
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -255,16 +330,17 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int id, string? language)
         {
             try
             {
                 logger?.LogInformation("Query Question");
-                var questioncategory = await questionDbContext.QuestionCategories.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                var questioncategory = await questionDbContext.QuestionCategories.AsNoTracking().FirstOrDefaultAsync(q => q.Id == id);
                 if (questioncategory != null)
                 {
                     logger?.LogInformation($"{questioncategory} customer(s) found");
-                    var result = mapper.Map<Db.QuestionCategory, Models.QuestionCategory>(questioncategory);
+                    var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(questioncategory);
+                    result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, language));
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -275,17 +351,23 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
         {
             try
             {
                 logger?.LogInformation("Query Question");
                 var dbQuestionCategory = mapper.Map<Models.QuestionCategory, Db.QuestionCategory>(QuestionCategory);
+                var dbCategorytranslations = mapper.Map<List<Models.CategoryTranslation>, List<Db.CategoryTranslation>>(QuestionCategory.Categories);
                 // Question.QuestionType = GetQuestionType(Question.QuestionTypeId);
                 questionDbContext.QuestionCategories.Add(dbQuestionCategory);
                 questionDbContext.SaveChanges();
-                QuestionCategory.Id=dbQuestionCategory.Id;
+                QuestionCategory.Id = dbQuestionCategory.Id;
-                return (true, QuestionCategory, null);
+                dbCategorytranslations.ForEach(i => i.CategoryId = QuestionCategory.Id);
+                questionDbContext.CategoryTranslations.AddRange(dbCategorytranslations);
+                questionDbContext.SaveChanges();
+                var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(dbQuestionCategory);
+                result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -293,15 +375,23 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
         {
             try
             {
                 var dbQuestionCategory = mapper.Map<Models.QuestionCategory, Db.QuestionCategory>(QuestionCategory);
+                var dbCategorytranslations = mapper.Map<List<Models.CategoryTranslation>, List<Db.CategoryTranslation>>(QuestionCategory.Categories);
                 questionDbContext.Entry(dbQuestionCategory).State = EntityState.Modified;
-
+                QuestionCategory.Id = dbQuestionCategory.Id;
+                var oldcategories = questionDbContext.CategoryTranslations.Where(a => a.CategoryId == dbQuestionCategory.Id).ToList();
+                if (oldcategories != null)
+                    questionDbContext.CategoryTranslations.RemoveRange(oldcategories);
+                dbCategorytranslations.ForEach(i => i.CategoryId = QuestionCategory.Id);
+                questionDbContext.CategoryTranslations.AddRange(dbCategorytranslations);
                 questionDbContext.SaveChanges();
-                return (true, QuestionCategory, null);
+                var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(dbQuestionCategory);
+                result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -310,18 +400,20 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id)
         {
             try
             {
                 var questioncategory = await questionDbContext.QuestionCategories.Where(x => x.Id == Id).FirstOrDefaultAsync();
                 if (questioncategory != null)
                 {
+                    var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(questioncategory);
+                    result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
                     var question = await questionDbContext.Questions.Where(x => x.Id == Id).ToListAsync();
                     questionDbContext.Questions.RemoveRange(question);
                     questionDbContext.QuestionCategories.Remove(questioncategory);
                     questionDbContext.SaveChanges();
-                    return (true, mapper.Map<Db.QuestionCategory, Models.QuestionCategory>(questioncategory), $"QuestionID {Id} deleted Successfuly");
+                    return (true, result, $"QuestionID {Id} deleted Successfuly");
                 }
                 else
                 {

DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/CategoryMockData.cs

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

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

@@ -1,24 +1,17 @@
-using DamageAssesment.Api.Questions.Db;
+using System.Text;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DamageAssesment.Api.Questions.Test
 {
     public class MockData
     {
 
-        public static async Task<(bool, IEnumerable<Questions.Models.Question>, string)> getOkResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanQuestion>, string)> getOkResponse()
         {
-            IEnumerable<Questions.Models.Question> list = new List<Questions.Models.Question>();
+            IEnumerable<Questions.Models.MultiLanQuestion> list = new List<Questions.Models.MultiLanQuestion>();
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Questions.Models.Question { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, QuestionGroup = "group1",CategoryId=i });
+                list.Append(new Questions.Models.MultiLanQuestion { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=i });
             }
             return (true, list, null);
         }
@@ -30,38 +23,38 @@ namespace DamageAssesment.Api.Questions.Test
 
             for (int i = 0; i < 10; i++)
             {
-                List<Models.Question> question = new List<Models.Question>();
+                List<Models.MultiLanQuestion> question = new List<Models.MultiLanQuestion>();
-                question.Add(new Models.Question { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, QuestionGroup = "group1", CategoryId = i });
+                question.Add(new Models.MultiLanQuestion { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = i });
                 list.Append(new Questions.Models.SurveyQuestions
                 {
                     CategoryId = i,
-                    CategoryImage = "img" + i,
+                    IconLibrary = "img" + i,
-                    CategoryName = "Category " + i,
+                    IconName = "Category " + i,
                     Questions = question
                 });
             }
             return (true, list, null);
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getOkResponse(int Id)
+        public static async Task<(bool, Questions.Models.MultiLanQuestion, string)> getOkResponse(int Id)
         {
             var Questions = await getOkResponse();
             var Question = Questions.Item2.FirstOrDefault(s => s.Id == Id);
             return (true, Question, null);
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getBadRequestResponse()
+        public static async Task<(bool, Questions.Models.MultiLanQuestion, string)> getBadRequestResponse()
         {
             return (false, null, "Bad Request");
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getNotFoundResponse()
+        public static async Task<(bool, Questions.Models.MultiLanQuestion, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Questions.Models.Question>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanQuestion>, string)> getNoContentResponse()
         {
-            IEnumerable<Questions.Models.Question> list = new List<Questions.Models.Question>();
+            IEnumerable<Questions.Models.MultiLanQuestion> list = new List<Questions.Models.MultiLanQuestion>();
             return (false, list, null);
         }
         public static async Task<(bool, List<Questions.Models.SurveyQuestions>, string)> getNoSurveyContentResponse()
@@ -79,7 +72,7 @@ namespace DamageAssesment.Api.Questions.Test
             };
             List<Models.QuestionsTranslation> QuestionsTranslations = new List<Models.QuestionsTranslation>();
             QuestionsTranslations.Add(QuestionsTranslation);
-            return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, QuestionGroup = "group1" ,CategoryId=1};
+            return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1};
 
         }
 

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

@@ -1,16 +1,7 @@
-
-using AutoMapper;
 using DamageAssesment.Api.Questions.Controllers;
-using DamageAssesment.Api.Questions.Db;
 using DamageAssesment.Api.Questions.Interfaces;
-using DamageAssesment.Api.Questions.Models;
-using DamageAssesment.Api.Questions.Profiles;
-using DamageAssesment.Api.Questions.Providers;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Moq;
-using Newtonsoft.Json;
 using Xunit;
 
 namespace DamageAssesment.Api.Questions.Test
@@ -22,10 +13,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getOkResponse();
-            mockQuestionService.Setup(service => service.GetQuestionsAsync()).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionsAsync(null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionsAsync();
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionsAsync(null);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -35,10 +26,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockQuestionService.Setup(service => service.GetQuestionsAsync()).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionsAsync(null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NoContentResult)await QuestionProvider.GetQuestionsAsync();
+            var result = (NoContentResult)await QuestionProvider.GetQuestionsAsync(null);
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -48,10 +39,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getOkResponse(1);
-            mockQuestionService.Setup(service => service.GetQuestionAsync(1)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionAsync(1,null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionAsync(1);
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionByIdAsync(1,null);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -61,10 +52,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockQuestionService.Setup(service => service.GetQuestionAsync(99)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionAsync(99,null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NotFoundResult)await QuestionProvider.GetQuestionAsync(99);
+            var result = (NotFoundResult)await QuestionProvider.GetQuestionByIdAsync(99,null);
             Assert.Equal(404, result.StatusCode);
         }
 
@@ -197,10 +188,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getOkResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync()).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync("en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoriesAsync();
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoriesAsync("en");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -210,10 +201,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getNoContentResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync()).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync("en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NoContentResult)await QuestionProvider.GetQuestionCategoriesAsync();
+            var result = (NoContentResult)await QuestionProvider.GetQuestionCategoriesAsync("en");
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -223,10 +214,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getOkResponse(1);
-            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(1)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(1, "en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoryAsync(1);
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoryAsync(1, "en");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -236,10 +227,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getNotFoundResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(99)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(99, "en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NotFoundResult)await QuestionProvider.GetQuestionCategoryAsync(99);
+            var result = (NotFoundResult)await QuestionProvider.GetQuestionCategoryAsync(99, "en");
             Assert.Equal(404, result.StatusCode);
         }
 

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

@@ -16,6 +16,9 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         {
             this.surveyResponseProvider = surveyResponseProvider;
         }
+        /// <summary>
+        /// GET request for retrieving survey responses.
+        /// </summary>
 
         [HttpGet("SurveyResponses")]
         public async Task<ActionResult> GetSurveyResponsesAsync()
@@ -31,6 +34,9 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
 
             return BadRequest(result.ErrorMessage);
         }
+        /// <summary>
+        /// GET request for retrieving survey responses by survey ID.
+        /// </summary>
        
         [HttpGet("SurveyResponses/{surveyId}")]
         public async Task<ActionResult> GetSurveyResponsesAsync(int surveyId)
@@ -42,6 +48,11 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
             }
             return NoContent();
         }
+        /// <summary>
+        /// GET request for retrieving survey responses by survey and location IDs.
+        /// </summary>
+        /// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param>
+        /// <param name="locationId">The ID of the location for which responses are to be retrieved.</param>
 
         [HttpGet("Responses/{surveyId}/{locationId}")]
         public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, string locationId)
@@ -54,6 +65,12 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
 
             return NoContent();
         }
+        /// <summary>
+        /// GET request for retrieving survey responses by survey, question, and answer.
+        /// </summary>
+        /// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param>
+        /// <param name="questionId">The ID of the question for which responses are to be retrieved.</param>
+        /// <param name="answer">The answer for which responses are to be retrieved.</param>
 
         [HttpGet("ResponsesByAnswer/{surveyId}/{questionId}/{answer}")]
         public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyId, int questionId, string answer)
@@ -66,6 +83,10 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
 
             return NoContent();
         }
+        /// <summary>
+        /// GET request for retrieving answers from survey responses by survey ID and region.
+        /// </summary>
+        /// <param name="surveyId">The ID of the survey for which answers are to be retrieved.</param>
 
         [HttpGet("AnswersByRegion/{surveyId}")]
         public async Task<ActionResult> GetAnswersByRegionAsync(int surveyId)
@@ -77,6 +98,10 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
             }
             return NoContent();
         }
+        /// <summary>
+        /// GET request for retrieving survey responses by survey ID and maintenance center.
+        /// </summary>
+        /// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param>
 
         [HttpGet("AnswersByMaintenanceCenter/{surveyId}")]
         public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyId)
@@ -88,11 +113,15 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
             }
             return NoContent();
         }
+        /// <summary>
+        /// GET request for retrieving a survey response by response ID.
+        /// </summary>
+        /// <param name="responseId">The ID of the survey response to be retrieved.</param>
 
-        [HttpGet("SurveyResponse/{responseId}")]
+        [HttpGet("SurveyResponse/{Id}")]
-        public async Task<ActionResult> GetSurveyResponseByIdAsync(int responseId)
+        public async Task<ActionResult> GetSurveyResponseByIdAsync(int Id)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(responseId);
+            var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(Id);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponse);
@@ -100,6 +129,10 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
             return NoContent();
         }
 
+        /// <summary>
+        /// POST request for creating a new survey response.
+        /// </summary>
+        /// <param name="surveyResponse">The survey response object to be created.</param>
 
         [HttpPost("SurveyResponses")]
         public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse)
@@ -111,6 +144,11 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
             }
             return BadRequest(result.ErrorMessage);
         }
+        /// <summary>
+        /// PUT request for updating an existing survey response.
+        /// </summary>
+        /// <param name="Id">The ID of the survey response to be updated.</param>
+        /// <param name="surveyResponse">The updated survey response object.</param>
 
         [HttpPut("SurveyResponses/{Id}")]
         public async Task<ActionResult> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse)
@@ -125,6 +163,9 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
 
             return BadRequest(result.ErrorMessage);
         }
+        /// <summary>
+        /// DELETE request for deleting an existing survey response.
+        /// </summary>
        
         [HttpDelete("SurveyResponses/{Id}")]
         public async Task<ActionResult> DeleteSurveyResponseAsync(int Id)
@@ -136,17 +177,15 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
             }
             return NotFound();
         }
+        /// <summary>
+        /// POST request for submitting survey with multiple answers.
+        /// </summary>
+        /// <param name="request">The answers to be submitted for the survey.</param>
 
         [HttpPost("SurveyResponses/Answers")]
-        public async Task<ActionResult> PostSurveyAnswersAsync(AnswerRequest answers)
+        public async Task<ActionResult> PostSurveyAnswersAsync(Request request)
         {
-            /* var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(surveyAnswers);
+            var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(request);
-             if (result.IsSuccess)
-             {
-                 return Ok(result.SurveyResponse);
-             }
-             return BadRequest(result.ErrorMessage);*/
-            var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(answers);
 
             if (result.IsSuccess)
                 return Ok(result.SurveyResponse);

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

@@ -4,13 +4,14 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,25 +4,11 @@ namespace DamageAssesment.Api.SurveyResponses.Models
 {
     public class Survey
     {
-        [Key]
         public int Id { get; set; }
-
-        [StringLength(100)]
-        public string Title { get; set; }
-
-        //[StringLength(1000)]
-        //public string Description { get; set; }
-
         public bool IsEnabled { get; set; }
-
         public DateTime? StartDate { get; set; }
-
         public DateTime? EndDate { get; set; }
-
+        public DateTime CreatedDate { get; set; }
-        //public DateTime CreatedDate { get; set; }
+        public IEnumerable<SurveyTranslation> Titles { get; set; }
-
-        //[StringLength(6)]
-        //public string EmployeeID { get; set; }
-
     }
 }

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

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

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

@@ -0,0 +1,13 @@
+namespace DamageAssesment.Api.SurveyResponses.Models
+{
+    public class SurveyTranslation
+    {        
+        public string Title { get; set; }
+        public string Language { get; set; }
+    }
+}
+
+
+
+
+

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Program.cs

@@ -1,9 +1,10 @@
 using DamageAssesment.Api.SurveyResponses.Db;
 using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Services;
 using DamageAssesment.Api.SurveyResponses.Providers;
-using Microsoft.AspNetCore.DataProtection.XmlEncryption;
 using Microsoft.EntityFrameworkCore;
 using Polly;
+using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 const int maxApiCallRetries = 3;
@@ -18,39 +19,29 @@ builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 
 builder.Services.AddScoped<ISurveysResponse, SurveyResponsesProvider>();
-//builder.Services.AddScoped<ILogger, Logger>();
+builder.Services.AddScoped<IAnswerServiceProvider, AnswerServiceProvider>();
+builder.Services.AddScoped<ILocationServiceProvider, LocationServiceProvider>();
+builder.Services.AddScoped<IRegionServiceProvider, RegionServiceProvider>();
+builder.Services.AddScoped<IQuestionServiceProvider, QuestionServiceProvider>();
+builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
+builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>();
+builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>();
 
-builder.Services.AddHttpClient<IAnswerServiceProvider, AnswerServiceProvider>().
+builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker) ));
-
-builder.Services.AddHttpClient<ILocationServiceProvider, LocationServiceProvider>().
     AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
     AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
 
-builder.Services.AddHttpClient<IRegionServiceProvider, RegionServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
-
-builder.Services.AddHttpClient<IQuestionServiceProvider, QuestionServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
-
-builder.Services.AddHttpClient<IEmployeeServiceProvider, EmployeeServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
-
-builder.Services.AddHttpClient<IAttachmentServiceProvider, AttachmentServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
-
-builder.Services.AddHttpClient<ISurveyServiceProvider, SurveyServiceProvider>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
 
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+//builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(c =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    c.IncludeXmlComments(xmlPath);
+});
 builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
 {
     option.UseInMemoryDatabase("SurveyResponses");

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,10 +14,10 @@ namespace DamageAssesment.Api.Surveys.Test
         {
             var mockSurveyService = new Mock<ISurveyProvider>();
             var mockResponse = await  MockData.getOkResponse();
-            mockSurveyService.Setup(service => service.GetSurveysAsync()).ReturnsAsync(mockResponse);
+            mockSurveyService.Setup(service => service.GetSurveysAsync(null)).ReturnsAsync(mockResponse);
 
             var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (OkObjectResult) await surveyProvider.GetSurveysAsync();
+            var result = (OkObjectResult) await surveyProvider.GetSurveysAsync(null);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -27,10 +27,10 @@ namespace DamageAssesment.Api.Surveys.Test
         {
             var mockSurveyService = new Mock<ISurveyProvider>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockSurveyService.Setup(service => service.GetSurveysAsync()).ReturnsAsync(mockResponse);
+            mockSurveyService.Setup(service => service.GetSurveysAsync(null)).ReturnsAsync(mockResponse);
 
             var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (NoContentResult)await surveyProvider.GetSurveysAsync();
+            var result = (NoContentResult)await surveyProvider.GetSurveysAsync(null);
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -40,10 +40,10 @@ namespace DamageAssesment.Api.Surveys.Test
         {
             var mockSurveyService = new Mock<ISurveyProvider>();
             var mockResponse = await MockData.getOkResponse(1);
-            mockSurveyService.Setup(service => service.GetSurveysAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyService.Setup(service => service.GetSurveysAsync(1,null)).ReturnsAsync(mockResponse);
 
             var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (OkObjectResult)await surveyProvider.GetSurveysAsync(1);
+            var result = (OkObjectResult)await surveyProvider.GetSurveysAsync(1,null);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -53,10 +53,10 @@ namespace DamageAssesment.Api.Surveys.Test
         {
             var mockSurveyService = new Mock<ISurveyProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockSurveyService.Setup(service => service.GetSurveysAsync(99)).ReturnsAsync(mockResponse);
+            mockSurveyService.Setup(service => service.GetSurveysAsync(99,null)).ReturnsAsync(mockResponse);
 
             var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (NotFoundResult)await surveyProvider.GetSurveysAsync(99);
+            var result = (NotFoundResult)await surveyProvider.GetSurveysAsync(99,null);
             Assert.Equal(404, result.StatusCode);
         }
 

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

@@ -1,10 +1,8 @@
 using DamageAssesment.Api.Surveys.Interfaces;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Surveys.Controllers
 {
-    [Route("api/[controller]")]
     [ApiController]
     public class SurveysController : ControllerBase
     {
@@ -14,29 +12,43 @@ namespace DamageAssesment.Api.Surveys.Controllers
         {
             this.surveyProvider = surveyProvider;
         }
+        /// <summary>
+        /// GET request for retrieving surveys.
+        /// </summary>
 
+        [Route("Surveys")]
+        [Route("Surveys/{language:alpha}")]
         [HttpGet]
-        public async Task<ActionResult> GetSurveysAsync()
+        public async Task<ActionResult> GetSurveysAsync(string? language)
         {
-            var result = await this.surveyProvider.GetSurveysAsync();
+            var result = await this.surveyProvider.GetSurveysAsync(language);
             if (result.IsSuccess)
             {
                 return Ok(result.Surveys);
             }
             return NoContent();
         }
-        [HttpGet("{Id}")]
+
-        public async Task<ActionResult> GetSurveysAsync(int Id)
+        /// <summary>
+        /// GET request for retrieving surveys by ID.
+        /// </summary>
+        [Route("Surveys/{id:int}")]
+        [Route("Surveys/{id:int}/{language:alpha}")]
+        [HttpGet]
+        public async Task<ActionResult> GetSurveysAsync(int id, string? language)
         {
-            var result = await this.surveyProvider.GetSurveysAsync(Id);
+            var result = await this.surveyProvider.GetSurveysAsync(id, language);
             if (result.IsSuccess)
             {
                 return Ok(result.Surveys);
             }
             return NotFound();
         }
+        /// <summary>
+        /// POST request for creating a new survey.
+        /// </summary>
 
-        [HttpPost]
+        [HttpPost("Surveys")]
         public async Task<ActionResult> PostSurveysAsync(Models.Survey survey)
         {
             var result = await this.surveyProvider.PostSurveyAsync(survey);
@@ -46,11 +58,15 @@ namespace DamageAssesment.Api.Surveys.Controllers
             }
             return BadRequest(result.ErrorMessage);
         }
+        /// <summary>
+        /// PUT request for updating an existing survey (surveyId,Updated Survey data).
+        /// </summary>
 
-        [HttpPut("{Id}")]
+
-        public async Task<ActionResult> PutSurveysAsync(int Id, Models.Survey survey)
+        [HttpPut("Surveys/{id}")]
+        public async Task<ActionResult> PutSurveysAsync(int id, Models.Survey survey)
         {
-            var result = await this.surveyProvider.PutSurveyAsync(Id,survey);
+            var result = await this.surveyProvider.PutSurveyAsync(id, survey);
             if (result.IsSuccess)
             {
                 return Ok(result.Survey);
@@ -61,10 +77,13 @@ namespace DamageAssesment.Api.Surveys.Controllers
             return BadRequest(result.ErrorMessage);
         }
 
-        [HttpDelete("{Id}")]
+        /// <summary>
-        public async Task<ActionResult> DeleteSurveysAsync(int Id)
+        /// DELETE request for deleting a survey by ID.
+        /// </summary>
+        [HttpDelete("Surveys/{id}")]
+        public async Task<ActionResult> DeleteSurveysAsync(int id)
         {
-            var result = await this.surveyProvider.DeleteSurveyAsync(Id);
+            var result = await this.surveyProvider.DeleteSurveyAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Survey);

DamageAssesmentApi/DamageAssesment.Api.Surveys/DamageAssesment.Api.Survey.csproj

@@ -1,13 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Surveys.Db
 {
@@ -6,23 +7,20 @@ namespace DamageAssesment.Api.Surveys.Db
     {
         [Key]
         public int Id { get; set; }
-
-        [StringLength(100)]
-        [Required]
-        public string Title { get; set; }
-
         //[StringLength(1000)]
         //public string Description { get; set; }
 
         public bool IsEnabled { get; set; }
 
-        public DateTime? StartDate { get; set; }
+        public DateTime StartDate { get; set; }
 
-        public DateTime? EndDate { get; set; }
+        public DateTime EndDate { get; set; }
 
-        //public DateTime CreatedDate { get; set; }
+        public DateTime CreatedDate { get; set; } = DateTime.Now;
-
+        /*
-        //[StringLength(6)]
+        [StringLength(10)]
-        //public string EmployeeID { get; set; }
+        [ForeignKey("Employee")]
+        public string EmployeeId { get; set; }
+        */
     }
 }

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

@@ -0,0 +1,23 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Surveys.Db
+{
+    public class SurveyTranslation
+    {
+        [Key]
+        public int Id { get; set; }
+        [ForeignKey("Survey")]
+        public int SurveyId { get; set; }
+
+        [StringLength(200)]
+        [Required]
+        public string Title { get; set; }
+        public string Language { get; set; }
+    }
+}
+
+
+
+
+

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

@@ -2,13 +2,25 @@
 
 namespace DamageAssesment.Api.Surveys.Db
 {
-    public class SurveysDbContext:DbContext
+    public class SurveysDbContext : DbContext
     {
+        public DbSet<Db.Survey> Surveys { get; set; }
+        public DbSet<Db.SurveyTranslation> SurveysTranslation { get; set; }
         public SurveysDbContext(DbContextOptions options) : base(options)
         {
 
         }
-        public DbSet<Db.Survey> Surveys { get; set; }
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
 
+            modelBuilder.Entity<Survey>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+
+            modelBuilder.Entity<SurveyTranslation>()
+            .Property(item => item.Id)
+            .ValueGeneratedOnAdd();
+        }
     }
 }

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

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

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

@@ -2,27 +2,21 @@
 
 namespace DamageAssesment.Api.Surveys.Models
 {
-    public class Survey
+    public class MultiLanSurvey : BaseSurvey
     {
-        [Key]
+        public object Titles { get; set; }
-        public int Id { get; set; }
+    }
-
+    public class Survey : BaseSurvey
-        [StringLength(100)]
+    {
-        public string Title { get; set; }
+        public IEnumerable<SurveyTranslation> Titles { get; set; }
-
-        //[StringLength(1000)]
-       // public string? Description { get; set; }
-
-        public bool IsEnabled { get; set; }
-
-        public DateTime? StartDate { get; set; }
-
-        public DateTime? EndDate { get; set; }
-
-        //public DateTime CreatedDate { get; set; }
-
-        //[StringLength(6)]
-        //public string EmployeeID { get; set; }
 
     }
+    public class BaseSurvey
+    {
+        public int Id { get; set; }
+        public bool IsEnabled { get; set; }
+        public DateTime StartDate { get; set; }
+        public DateTime EndDate { get; set; }
+        public DateTime CreatedDate { get; set; }
+    }
 }

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

@@ -0,0 +1,13 @@
+namespace DamageAssesment.Api.Surveys.Models
+{
+    public class SurveyTranslation
+    {        
+        public string Title { get; set; }
+        public string Language { get; set; }
+    }
+}
+
+
+
+
+

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

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