document api link type changes

.gitignore

@@ -1,5 +0,0 @@
-################################################################################
-# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
-################################################################################
-
-/DamageAssesmentApi/nginx.conf

DamageAssesmentApi/.dockerignore

@@ -1,25 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md

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.Models.Answer> getInputAnswerData()
+        public static async Task<Answers.Db.Answer> getInputAnswerData()
         {
-            return new Answers.Models.Answer { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 };
+            return new Answers.Db.Answer { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 };
 
         }
 

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

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

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

@@ -1,20 +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>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </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="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -10,13 +10,7 @@ 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/Dockerfile

@@ -1,39 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-# Use the ASP.NET base image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-# Use the SDK image for building
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-
-# Copy the project file and restore dependencies
-COPY ["DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj", "DamageAssesment.Api.Answers/"]
-RUN dotnet restore "DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj"
-
-# Copy the source code
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Answers"
-
-# Build the application
-RUN dotnet build "DamageAssesment.Api.Answers.csproj" -c Release -o /app/build
-
-# Publish the application
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Answers.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-# Set up the final image
-FROM base AS final
-WORKDIR /app
-
-# Copy the published files
-COPY --from=publish /app/publish .
-
-## Set up the volume and copy the XML comments
-#VOLUME /xmlcomments
-#COPY ["DamageAssesment.Api.Answers.xml", "/xmlcomments/DamageAssesment.Api.Answers.xml"]
-#
-# Specify the entry point for the container
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Answers.dll"]

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

@@ -6,9 +6,8 @@
         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(Models.Answer Answer);
-        Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer);
+        Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Db.Answer Answer);
+        Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Db.Answer Answer);
         Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> DeleteAnswerAsync(int Id);
-        void SeedData();
     }
 }

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

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

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -2,9 +2,6 @@ using DamageAssesment.Api.Answers.Db;
 using DamageAssesment.Api.Answers.Interfaces;
 using DamageAssesment.Api.Answers.Providers;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Microsoft.OpenApi.Models;
-using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -13,45 +10,20 @@ 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(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.AddSwaggerGen();
 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())
 {
-    //using (var serviceScope = app.Services.CreateScope())
-    //{
-    //    var services = serviceScope.ServiceProvider;
-    //    var answerProvider = services.GetRequiredService<IAnswersProvider>();
-    //    answerProvider.SeedData();
-    //}
     app.UseSwagger();
-    app.UseSwaggerUI(
-        options =>
-    {
-        //switch for local environment
-        //options.SwaggerEndpoint("/swagger/v1/swagger.json", "");
-        options.SwaggerEndpoint("/answers/swagger/v1/swagger.json","" );
-        
-    } );
+    app.UseSwaggerUI();
 }
 
 app.UseAuthorization();

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

@@ -18,11 +18,12 @@ 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");
@@ -107,17 +108,16 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer)
+        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Db.Answer Answer)
         {
             try
             {
                 logger?.LogInformation("Query Answer");
                 if (!AnswerExists(Answer.Id))
                 {
-                    Db.Answer answer = mapper.Map<Models.Answer, Db.Answer>(Answer);
-                    answerDbContext.Answers.Add(answer);
-                    await answerDbContext.SaveChangesAsync();
-                    var result = mapper.Map<Db.Answer, Models.Answer>(answer);
+                    answerDbContext.Answers.Add(Answer);
+                    answerDbContext.SaveChanges();
+                    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(Models.Answer Answer)
+        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Db.Answer Answer)
         {
             try
             {
@@ -137,10 +137,9 @@ namespace DamageAssesment.Api.Answers.Providers
                     var existing = answerDbContext.Answers.AsNoTracking().FirstOrDefault(x => x.Id == Answer.Id);
                     if (existing != null)
                     {
-                        Db.Answer answer = mapper.Map<Models.Answer, Db.Answer>(Answer);
-                        answerDbContext.Answers.Update(answer);
-                        await answerDbContext.SaveChangesAsync();
-                        return (true, mapper.Map<Db.Answer, Models.Answer>(answer), "Successful");
+                        answerDbContext.Answers.Update(Answer);
+                        answerDbContext.SaveChanges();
+                        return (true, mapper.Map<Db.Answer, Models.Answer>(Answer), "Successful");
                     }
                     else
                     {
@@ -153,6 +152,7 @@ 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;
         }
 
-        public void SeedData()
+        private void SeedData()
         {
             if (!answerDbContext.Answers.Any())
             {
@@ -199,6 +199,10 @@ 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,7 +1,4 @@
 {
-  "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()
+                list.Add(new Attachments.Models.Attachment(i, Guid.NewGuid().ToString() + "@gmail.com")
                 {
                     Id = i,
                     AnswerId = i,
@@ -73,10 +73,10 @@ namespace DamageAssesment.Api.Attachments.Test
             return (false, list, null);
         }
 
-        public static async Task<List<Attachments.Models.Attachment>> getInputAttachmentData()
+        public static async Task<List<Attachments.Db.Attachment>> getInputAttachmentData()
         {
-            List<Attachments.Models.Attachment> Attachments=new List<Models.Attachment>();
-            Attachments.Add(new Models.Attachment{ Id = 0, AnswerId = 10, ResponseId = 10, URI = "sample", IsDeleted = false,FileName="sample1" }) ;
+            List<Attachments.Db.Attachment> Attachments=new List<Db.Attachment>();
+            Attachments.Add(new Db.Attachment{ Id = 0, AnswerId = 10, ResponseId = 10, URI = "sample", IsDeleted = false,FileName="sample1" }) ;
             return Attachments;
         }
 

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

@@ -7,7 +7,7 @@ using System.Net.Http.Headers;
 
 namespace DamageAssesment.Api.Attachments.Controllers
 {
-    //[Route("api")]
+    [Route("api")]
     [ApiController]
     public class AttachmentsController : ControllerBase
     {
@@ -19,10 +19,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
             this.AttachmentProvider = AttachmentsProvider;
             this.UploadService = uploadService;  
         }
-        /// <summary>
-        /// Get all attachments.
-        /// </summary>
-
+        //get all Attachments
         [HttpGet("Attachments")]
         public async Task<ActionResult> GetAttachmentsAsync()
         {
@@ -35,9 +32,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
             return NoContent();
 
         }
-        /// <summary>
-        /// Get all attachments by attachmentId.
-        /// </summary>
+        //get all Attachment by Id
         [HttpGet("Attachments/{id}")]
         public async Task<ActionResult> GetAttachmentbyIdAsync(int id)
         {
@@ -78,10 +73,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         //    }
         //}
 
-        /// <summary>
-        /// Save new Attachment(s)
-        /// </summary>
-
+        //Save new Attachment
         [HttpPost("Attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo)
         {
@@ -89,9 +81,9 @@ namespace DamageAssesment.Api.Attachments.Controllers
             {
                 if (attachmentInfo.Answers.Count > 0)
                 {
-                    var Attachments =  await this.AttachmentProvider.GetAttachmentCounter();
-                    List<Models.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
-                    var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments);
+                    var Attachments = await this.AttachmentProvider.GetAttachmentCounter();
+                    List<Db.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
+                    var result = await this.AttachmentProvider.PostAttachmentAsync(attachments);
                     if (result.IsSuccess)
                     {
                         return Ok(result.Attachments);
@@ -105,10 +97,8 @@ 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)
         {
@@ -116,10 +106,10 @@ namespace DamageAssesment.Api.Attachments.Controllers
             {
                 if (attachmentInfo.Answers.Count > 0)
                 {
-                    var res =  await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
+                    var res = await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
                     if (res.IsSuccess)
                     {
-                        List<Models.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
+                        List<Db.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
                         var result = await this.AttachmentProvider.PutAttachmentAsync(attachments);
                         if (result.IsSuccess)
                         {
@@ -136,9 +126,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                 return BadRequest($"Internal server error: {ex}");
             }
         }
-        /// <summary>
-        /// Delete an existing attachment.
-        /// </summary>
+        //delete existing Attachment
         [HttpDelete("Delete")]
         public async Task<IActionResult> DeleteAttachment(int Id)
         {

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

@@ -4,19 +4,14 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </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" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -8,12 +8,5 @@ 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/Dockerfile

@@ -1,47 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-# Use the ASP.NET base image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-# Use the SDK image for building
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-
-# Copy the project file and restore dependencies
-COPY ["DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj", "DamageAssesment.Api.Attachments/"]
-RUN dotnet restore "DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj"
-
-# Copy the source code
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Attachments"
-
-# Build the application
-RUN dotnet build "DamageAssesment.Api.Attachments.csproj" -c Release -o /app/build
-
-# Publish the application
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Attachments.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-# Set up the final image
-FROM base AS final
-WORKDIR /app
-
-# Copy the published files
-COPY --from=publish /app/publish .
-
-# Create directories for attachments and set permissions
-RUN mkdir -p /app/DMS_Attachments/Active && \
-    mkdir -p /app/DMS_Attachments/Deleted && \
-    chown -R www-data:www-data /app/DMS_Attachments
-
-# Update appsettings.json with the correct paths for attachments
-RUN sed -i 's#"folderpath": "DMS_Attachments/Active"#"folderpath": "/app/DMS_Attachments/Active"#' appsettings.json && \
-    sed -i 's#"Deletepath": "DMS_Attachments/Deleted"#"Deletepath": "/app/DMS_Attachments/Deleted"#' appsettings.json
-
-## Set up the volume and copy the XML comments
-#VOLUME /xmlcomments
-#COPY ["DamageAssesment.Api.Attachments/bin/Release/net6.0/DamageAssesment.Api.Attachments.xml", "/xmlcomments/"]
-#
-# Specify the entry point for the container
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Attachments.dll"]

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

@@ -6,13 +6,12 @@ namespace DamageAssesment.Api.Attachments.Interfaces
     {
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync();
         Task<(bool IsSuccess, Models.Attachment Attachment, string ErrorMessage)> GetAttachmentByIdAsync(int Id);
-        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments);
-        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments);
+        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Db.Attachment> Attachments);
+        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Db.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);
         Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter();
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentInfo(List<AnswerInfo> answers);
-       
     }
 }

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

@@ -4,9 +4,9 @@ namespace DamageAssesment.Api.Attachments.Interfaces
 {
     public interface IUploadService
     {
-        List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
-        List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
-        public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
+        List<Db.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
+        List<Db.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
+        public List<Db.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)
-        //{
-        //    this.AnswerId = answerId;
-        //    this.URI = uri;
-        //}
+        public Attachment(int answerId, string uri)
+        {
+            this.AnswerId = answerId;
+            this.URI = uri;
+        }
     }
 }

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

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

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -4,7 +4,6 @@ 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);
 
@@ -13,14 +12,7 @@ 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(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.AddSwaggerGen();
 builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
@@ -42,14 +34,7 @@ var app = builder.Build();
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
-    app.UseSwaggerUI(options => {
-       //switch for local environment
-        // options.SwaggerEndpoint("/swagger/v1/swagger.json", "");
-        options.SwaggerEndpoint("/attachments/swagger/v1/swagger.json", "");
-     
-    });
-
-
+    app.UseSwaggerUI();
 }
 
 app.UseAuthorization();

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,15 +65,14 @@ namespace DamageAssesment.Api.Attachments.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Db.Attachment> Attachments)
         {
             try
             {
                 logger?.LogInformation("Query Attachment");
-                List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
-                AttachmentDbContext.Attachments.AddRange(attachments);
-                await AttachmentDbContext.SaveChangesAsync();
-                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
+                AttachmentDbContext.Attachments.AddRange(Attachments);
+                AttachmentDbContext.SaveChanges();
+                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachments);
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -83,15 +82,14 @@ namespace DamageAssesment.Api.Attachments.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Db.Attachment> Attachments)
         {
             try
             {
                 logger?.LogInformation("Query Attachment");
-                List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
-                AttachmentDbContext.Attachments.UpdateRange(attachments);
-                await AttachmentDbContext.SaveChangesAsync();
-                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
+                AttachmentDbContext.Attachments.UpdateRange(Attachments);
+                AttachmentDbContext.SaveChanges();
+                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachments);
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -110,7 +108,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachments.Count > 0)
                 {
                     AttachmentDbContext.Attachments.RemoveRange(Attachments);
-                    await AttachmentDbContext.SaveChangesAsync();
+                    AttachmentDbContext.SaveChanges();
                 }
                 return (true, AttachmentId, "");
             }
@@ -143,7 +141,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachments.Count > 0)
                 {
                     AttachmentDbContext.Attachments.RemoveRange(Attachments);
-                    await AttachmentDbContext.SaveChangesAsync();
+                    AttachmentDbContext.SaveChanges();
                 }
                 return (true, AttachmentId, "");
             }
@@ -154,7 +152,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
             {
@@ -183,7 +181,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 }
                 Attachment.IsDeleted = true;
                 AttachmentDbContext.Attachments.Update(Attachment);
-                await AttachmentDbContext.SaveChangesAsync();
+                AttachmentDbContext.SaveChanges();
                 return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id} is deleted");
             }
             catch (Exception ex)
@@ -206,11 +204,10 @@ 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<Models.Attachment> attachments = uploadservice.UploadAttachment(1, 0, answerInfos);
+                List<Db.Attachment> attachments = uploadservice.UploadAttachment(1, 0, answerInfos);
                 if (attachments.Count > 0)
                 {
-                    List<Db.Attachment> Attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(attachments);
-                    AttachmentDbContext.Attachments.AddRange(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<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
+        public List<Db.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<Models.Attachment> attachments = new List<Models.Attachment>();
+            List<Db.Attachment> attachments = new List<Db.Attachment>();
             foreach (IFormFile item in postedFile)
             {
                 
@@ -55,15 +55,15 @@ namespace DamageAssesment.Api.Attachments.Providers
                 {
                     item.CopyTo(stream);
                 }
-                attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
+                attachments.Add(new Db.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
             }
 
             return attachments;
         }
 
-        public List<Models.Attachment> UploadAttachment(int responseId, int counter,List<AnswerInfo> answers)
+        public List<Db.Attachment> UploadAttachment(int responseId, int counter,List<AnswerInfo> answers)
         {
-            List<Models.Attachment> attachments = new List<Models.Attachment>();
+            List<Db.Attachment> attachments = new List<Db.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 Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
+                        attachments.Add(new Db.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
                     }
                 }
                 return attachments;
             }
             catch (Exception ex) {
-                return new List<Models.Attachment>();
+                return new List<Db.Attachment>();
             }
 
            
         }
-        public List<Models.Attachment> UpdateAttachments(int responseId,List<AnswerInfo> answers,IEnumerable<Models.Attachment> attachments)
+        public List<Db.Attachment> UpdateAttachments(int responseId,List<AnswerInfo> answers,IEnumerable<Models.Attachment> attachments)
         {
-            List<Models.Attachment> Dbattachments = new List<Models.Attachment>();
+            List<Db.Attachment> Dbattachments = new List<Db.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 Models.Attachment { Id=attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
+                    Dbattachments.Add(new Db.Attachment { Id=attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
                 }
             }
             return Dbattachments;

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json

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

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

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DamageAssesment.Api.Documents\DamageAssesment.Api.Documents.csproj" />
+    <ProjectReference Include="..\DamageAssesment.Api.Documents\DamageAssesment.Api.DocuLinks.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -17,10 +17,10 @@ namespace DamageAssesment.Api.Documents.Test
             var mockDocumentService = new Mock<IDocumentsProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en")).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsbyFormsandLanguageAsync("", "");
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "");
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -31,10 +31,10 @@ namespace DamageAssesment.Api.Documents.Test
             var mockDocumentService = new Mock<IDocumentsProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en")).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsbyFormsandLanguageAsync("", "");
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "");
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -44,10 +44,10 @@ namespace DamageAssesment.Api.Documents.Test
             var mockDocumentService = new Mock<IDocumentsProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse();
-            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en")).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync();
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms","en");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -58,10 +58,10 @@ namespace DamageAssesment.Api.Documents.Test
             var mockDocumentService = new Mock<IDocumentsProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en")).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync();
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("forms","en");
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -72,10 +72,10 @@ namespace DamageAssesment.Api.Documents.Test
             var mockDocumentService = new Mock<IDocumentsProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.GetDocumentAsync(1)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(1,"forms","en")).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1, "forms", "en");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -86,9 +86,9 @@ namespace DamageAssesment.Api.Documents.Test
             var mockDocumentService = new Mock<IDocumentsProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockDocumentService.Setup(service => service.GetDocumentAsync(99)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(99, "forms", "en")).ReturnsAsync(mockResponse);
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.GetDocumentAsync(99);
+            var result = (NotFoundResult)await DocumentProvider.GetDocumentAsync(99, "forms", "en");
             Assert.Equal(404, result.StatusCode);
         }
         [Fact(DisplayName = "Post Document - Ok case")]
@@ -129,11 +129,11 @@ namespace DamageAssesment.Api.Documents.Test
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputDocument = await MockData.getInputDocumentData();
             var DocumentResponse = await MockData.GetDocumentsInfo(1);
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.UpdateDocument(DocumentResponse);
+            var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1,DocumentResponse);
 
-            Assert.Equal(204, result.StatusCode);
+            Assert.Equal(404, result.StatusCode);
         }
 
         [Fact(DisplayName = "Put Document - BadRequest case")]
@@ -143,9 +143,9 @@ namespace DamageAssesment.Api.Documents.Test
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputDocument = await MockData.getInputDocumentData();
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(null);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99,null);
             Assert.Equal(400, result.StatusCode);
         }
 

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

@@ -11,12 +11,16 @@ namespace DamageAssesment.Api.Documents.Test
     public class MockData
     {
 
-        public static async Task<(bool, List<Documents.Models.Document>, string)> getOkResponse()
+        public static async Task<(bool, List<Documents.Models.MultiLanDocument>, string)> getOkResponse()
         {
-            List<Documents.Models.Document> list = new List<Documents.Models.Document>();
+            List<Documents.Models.MultiLanDocument> list = new List<Documents.Models.MultiLanDocument>();
             
             for (int i = 1; i < 4; i++)
             {
+                Dictionary<string, string> dicttitle = new Dictionary<string, string>();
+                Dictionary<string, string> dictdesc = new Dictionary<string, string>(); 
+                dicttitle.Add("en", "test"); dicttitle.Add("fr", "tester");
+                dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester");
                 List<Documents.Models.DocumentsTranslation> documentsTranslations = new List<DocumentsTranslation>();
                 documentsTranslations.Add(new DocumentsTranslation()
                 {
@@ -24,7 +28,7 @@ namespace DamageAssesment.Api.Documents.Test
                     title = "tel"+i,
                     description = "Sample"+i
                 });
-                list.Add(new Documents.Models.Document()
+                list.Add(new Documents.Models.MultiLanDocument()
                 {
 
                     Id = i,
@@ -33,32 +37,33 @@ namespace DamageAssesment.Api.Documents.Test
                     url = "testurl" + i,
                     Path = "testpath" + i,
                     IsActive = true,
-                    documentsTranslations= documentsTranslations,
+                    titles= dicttitle,
+                    description=dictdesc,
                     dateCreated = DateTime.Now,
                     dateUpdated = DateTime.Now
                 });
             }
             return (true, list, null);
         }
-        public static async Task<(bool, Documents.Models.Document, string)> getOkResponse(int Id)
+        public static async Task<(bool, Documents.Models.MultiLanDocument, string)> getOkResponse(int Id)
         {
             var Documents = await getOkResponse();
             var Document = Documents.Item2.FirstOrDefault(s => s.Id == Id);
             return (true, Document, null);
         }
 
-        public static async Task<(bool, Documents.Models.Document, string)> getBadRequestResponse()
+        public static async Task<(bool, Documents.Models.MultiLanDocument, string)> getBadRequestResponse()
         {
             return (false, null, "Bad Request");
         }
 
-        public static async Task<(bool, Documents.Models.Document, string)> getNotFoundResponse()
+        public static async Task<(bool, Documents.Models.MultiLanDocument, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Documents.Models.Document>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Documents.Models.MultiLanDocument>, string)> getNoContentResponse()
         {
-            IEnumerable<Documents.Models.Document> list = new List<Documents.Models.Document>();
+            IEnumerable<Documents.Models.MultiLanDocument> list = new List<Documents.Models.MultiLanDocument>();
             return (false, list, null);
         }
         public static async Task<Documents.Models.DocumentInfo> GetDocumentsInfo(int id)

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

@@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Documents.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class DocumentsController : ControllerBase
     {
@@ -21,54 +20,131 @@ namespace DamageAssesment.Api.Documents.Controllers
             this.uploadService = uploadService; 
 
         }
+        /// <summary>
+        /// Get all document link type.
+        /// </summary>
+        [HttpGet]
+        [Route("doculinks/types")]
+        public async Task<IActionResult> GetLinkTypesAsync()
+        {
+            var result = await this.documentsProvider.GetLinkTypesAsync();
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkTypes);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get a document link type by id.
+        /// </summary>
+        [HttpGet]
+        [Route("doculinks/types/{id}")]
+        public async Task<IActionResult> GetLinkTypeAsync(int id)
+        {
+            var result = await this.documentsProvider.GetLinkTypeAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkType);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// Update a existing document link type.
+        /// </summary>
+        [HttpPut]
+        [Route("doculinks/types")]
+        public async Task<IActionResult> UpdateLinkType(Models.LinkType linkType)
+        {
+            if (linkType != null)
+            {
+                var result = await this.documentsProvider.UpdateLinkTypeAsync(linkType);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.LinkType);
+                }
+                if (result.ErrorMessage == "Not Found")
+                    return NotFound(result.ErrorMessage);
+
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
+        }
+        /// <summary>
+        /// Create a new document link type.
+        /// </summary>
+        [HttpPost]
+        [Route("doculinks/types")]
+        public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
+        {
+            if (linkType != null)
+            {
+                var result = await this.documentsProvider.PostLinkTypeAsync(linkType);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.LinkType);
+                }
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
+        }
+        /// <summary>
+        /// Delete a  existing document link type by id.
+        /// </summary>
+        [HttpDelete]
+        [Route("doculinks/types/{id}")]
+        public async Task<IActionResult> DeleteLinkType(int id)
+        {
+            var result = await this.documentsProvider.DeleteLinkTypeAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkType);
+            }
+            return NotFound();
+        }
+            /// <summary>
+            /// Get all documents.
+            /// </summary>
+            /// 
+            [Route("doculinks")]
+        [Route("doculinks/{linktype:alpha}")]
+        [Route("doculinks/{linktype:alpha}/{language:alpha}")]
+        [HttpGet]
+        public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language)
+        {
+            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.documents);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get all documents.
+        /// </summary>
+        /// 
+        //[Route("doculinks/{language:alpha}")]
+        //[Route("doculinks")]
+        //[HttpGet]
+        //public async Task<IActionResult> GetDocumentsAsync(string? language)
+        //{
+        //    var result = await this.documentsProvider.GetdocumentsAsync(language);
+        //    if (result.IsSuccess)
+        //    {
+        //        return Ok(result.documents);
+        //    }
+        //    return NoContent();
+        //}
 
         /// <summary>
-        /// Get all documnets.
+        /// Get a document by id.
         /// </summary>
-        [HttpGet("{language}/{LinkType}/documents")]
-        public async Task<IActionResult> GetDocumentsbyFormsandLanguageAsync(string language,string LinkType)
+        [HttpGet]
+        [Route("doculinks/{id}")]
+        [Route("doculinks/{id}/{linktype:alpha}")]
+        [Route("doculinks/{id}/{linktype:alpha}/{language:alpha}")]
+        public async Task<IActionResult> GetDocumentAsync(int id,string? linktype, string? language)
         {
-            var result = await this.documentsProvider.GetDocumnetsByLinkAsync(language, LinkType);
-            if (result.IsSuccess)
-            {
-                return Ok(result.documents);
-            }
-            return NoContent();
-        }
-        /// <summary>
-        /// Get all documnets.
-        /// </summary>
-        [HttpGet("{LinkType}/documents")]
-        public async Task<IActionResult> GetDocumentsbyFormAsync(string LinkType)
-        {
-            var result = await this.documentsProvider.GetDocumnetsByLinkAsync(null, LinkType);
-            if (result.IsSuccess)
-            {
-                return Ok(result.documents);
-            }
-            return NoContent();
-        }
-        /// <summary>
-        /// Get all documnets.
-        /// </summary>
-        [HttpGet("documents")]
-        public async Task<IActionResult> GetDocumentsAsync()
-        {
-            var result = await this.documentsProvider.GetDocumnetsAsync();
-            if (result.IsSuccess)
-            {
-                return Ok(result.documents);
-            }
-            return NoContent();
-        }
-
-        /// <summary>
-        /// Get a documnet by id.
-        /// </summary>
-        [HttpGet("documents/{id}")]
-        public async Task<IActionResult> GetDocumentAsync(int id)
-        {
-            var result = await this.documentsProvider.GetDocumentAsync(id);
+            var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
             if (result.IsSuccess)
             {
                 return Ok(result.Document);
@@ -78,30 +154,32 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// <summary>
         /// Upload new document.
         /// </summary>
-        [HttpPut("documents")]
-        public async Task<IActionResult> UpdateDocument(DocumentInfo documentInfo)
+        [HttpPut]
+        [Route("doculinks/{id}")]
+        public async Task<IActionResult> UpdateDocument(int id,DocumentInfo documentInfo)
         {
             if (documentInfo != null)
             {
-                var dbdoc = await this.documentsProvider.GetDocumentAsync(documentInfo.Id);
+                var dbdoc = await this.documentsProvider.GetDocumentByidAsync(id);
                 if (dbdoc.IsSuccess)
                 {
                     Models.Document document = uploadService.UpdateDocuments(dbdoc.Document, documentInfo);
-                    var result = await this.documentsProvider.UpdateDocumentAsync(document);
+                    var result = await this.documentsProvider.UpdateDocumentAsync(id,document);
                     if (result.IsSuccess)
                     {
                         return Ok(result.Document);
                     }
                     return NoContent();
                 }
-                return NoContent();
+                return NotFound();
             }
             return BadRequest(documentInfo);
         }
         /// <summary>
         /// update existing document.
         /// </summary>
-        [HttpPost("documents")]
+        [HttpPost]
+        [Route("doculinks")]
         public async Task<IActionResult> CreateDocument(DocumentInfo documentInfo)
         {
             try
@@ -125,9 +203,10 @@ namespace DamageAssesment.Api.Documents.Controllers
             }
         }
         /// <summary>
-        /// Delete documnet by id.
+        /// Delete document by id.
         /// </summary>
-        [HttpDelete("documents/{id}")]
+        [HttpDelete]
+        [Route("doculinks/{id}")]
         public async Task<IActionResult> DeleteDocument(int id)
         {
             // database soft delete
@@ -140,83 +219,6 @@ namespace DamageAssesment.Api.Documents.Controllers
             }
             return NotFound();
         }
-        /// <summary>
-        /// Get all document link type.
-        /// </summary>
-        [HttpGet("LinkTypes")]
-        public async Task<IActionResult> GetLinkTypesAsync()
-        {
-            var result = await this.documentsProvider.GetLinkTypesAsync();
-            if (result.IsSuccess)
-            {
-                return Ok(result.LinkTypes);
-            }
-            return NoContent();
-        }
-        /// <summary>
-        /// Get a document link type by id.
-        /// </summary>
-        [HttpGet("LinkTypes/{id}")]
-        public async Task<IActionResult> GetLinkTypeAsync(int id)
-        {
-            var result = await this.documentsProvider.GetLinkTypeAsync(id);
-            if (result.IsSuccess)
-            {
-                return Ok(result.LinkType);
-            }
-            return NotFound();
-        }
-        /// <summary>
-        /// Update a existing document link type.
-        /// </summary>
-        [HttpPut("LinkTypes")]
-        public async Task<IActionResult> UpdateLinkType(Models.LinkType linkType)
-        {
-            if (linkType != null)
-            {
-                var result = await this.documentsProvider.UpdateLinkTypeAsync(linkType);
-                if (result.IsSuccess)
-                {
-                    return Ok(result.LinkType);
-                }
-                if (result.ErrorMessage == "Not Found")
-                    return NotFound(result.ErrorMessage);
-
-                return BadRequest(result.ErrorMessage);
-            }
-            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
-        }
-        /// <summary>
-        /// Create a new document link type.
-        /// </summary>
-        [HttpPost("LinkTypes")]
-        public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
-        {
-            if (linkType != null)
-            {
-                var result = await this.documentsProvider.PostLinkTypeAsync(linkType);
-                if (result.IsSuccess)
-                {
-                    return Ok(result.LinkType);
-                }
-                return BadRequest(result.ErrorMessage);
-            }
-            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
-        }
-        /// <summary>
-        /// Delete a  existing document link type by id.
-        /// </summary>
-        [HttpDelete("LinkTypes/{id}")]
-        public async Task<IActionResult> DeleteLinkType(int id)
-        {
-            var result = await this.documentsProvider.DeleteLinkTypeAsync(id);
-            if (result.IsSuccess)
-            {
-                return Ok(result.LinkType);
-            }
-            return NotFound();
-        }
-
-
+        
     }
 }

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

@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -9,6 +9,7 @@ namespace DamageAssesment.Api.Documents.Db
         public int Id { get; set; }
         [ForeignKey("LinkType")]
         public int linkTypeId { get; set; }
+        public LinkType? LinkType { get; set; }
         public string docName { get; set; }
 
         public string url { get; set; }

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

@@ -4,12 +4,13 @@ namespace DamageAssesment.Api.Documents.Interfaces
 {
     public interface IDocumentsProvider : ILinkTypesProvider
     {
-        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> GetDocumentAsync(int Id);
-        Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsAsync();
-        Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsByLinkAsync(string Language,string LinkType);
-        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> PostDocumentAsync(Models.Document Document);
-        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> UpdateDocumentAsync(Models.Document Document);
-        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> DeleteDocumentAsync(int Id);
+        Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> GetDocumentAsync(int id, string? linktype, string? language);
+        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> GetDocumentByidAsync(int id);
+       // Task<(bool IsSuccess, IEnumerable<Models.MultiLanDocument> documents, string ErrorMessage)> GetDocumnetsAsync(string? language);
+        Task<(bool IsSuccess, IEnumerable<Models.MultiLanDocument> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language);
+        Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> PostDocumentAsync(Models.Document Document);
+        Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> UpdateDocumentAsync(int id,Models.Document Document);
+        Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> DeleteDocumentAsync(int id);
         Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
 
 

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

@@ -2,7 +2,17 @@
 
 namespace DamageAssesment.Api.Documents.Models
 {
-    public class Document
+    public class Document : BaseDocument
+    {
+        public List<DocumentsTranslation> documentsTranslations { get; set; }
+    }
+    public class MultiLanDocument:BaseDocument
+    {
+        public object titles { get; set; }
+        public object description { get; set; }
+        public string LinkType { get; set; }
+    }
+    public class BaseDocument
     {
         public int Id { get; set; }
 
@@ -14,6 +24,5 @@ namespace DamageAssesment.Api.Documents.Models
         public bool IsActive { get; set; }
         public DateTime dateCreated { get; set; }
         public DateTime dateUpdated { get; set; }
-        public List<DocumentsTranslation> documentsTranslations { get; set; }
     }
 }

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

@@ -6,6 +6,8 @@ namespace DamageAssesment.Api.Documents.Profiles
     {
         public DocumentProfile()
         {
+            CreateMap<Db.Document, Models.MultiLanDocument>().ForMember(dest => dest.LinkType,
+                opt => opt.MapFrom(src => src.LinkType.TypeText)); ;
             CreateMap<Db.Document, Models.Document>();
             CreateMap<Models.Document, Db.Document>();
             CreateMap<Db.LinkType, Models.LinkType>();

DamageAssesmentApi/DamageAssesment.Api.Documents/Program.cs

@@ -2,12 +2,20 @@ using DamageAssesment.Api.Documents.Db;
 using DamageAssesment.Api.Documents.Interfaces;
 using DamageAssesment.Api.Documents.Providers;
 using Microsoft.EntityFrameworkCore;
+using System.Reflection;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 
 builder.Services.AddControllers();
+builder.Services.AddSwaggerGen(c =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    c.IncludeXmlComments(xmlPath);
+});
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();

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

@@ -7,6 +7,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System;
 using System.Diagnostics.Eventing.Reader;
+using System.Reflection.Metadata;
 
 namespace DamageAssesment.Api.Documents.Providers
 {
@@ -54,29 +55,55 @@ namespace DamageAssesment.Api.Documents.Providers
                 DocumentDbContext.SaveChanges();
             }
         }
-        public async Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsByLinkAsync(string Language, string LinkType)
+        public List<Models.DocumentsTranslation> GetDocumentTranslations(int id, string? language)
+        {
+            List<Models.DocumentsTranslation> QuestionTranslations;
+            if (string.IsNullOrEmpty(language))
+            {
+                QuestionTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
+                    DocumentDbContext.DocumentsTranslations.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+            }
+            else
+            {
+                QuestionTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
+                DocumentDbContext.DocumentsTranslations.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList());
+            }
+            return QuestionTranslations;
+        }
+        public MultiLanDocument CreateMultiLanguageObject(List<Models.DocumentsTranslation> questions)
+        {
+            MultiLanDocument MultiLanguage = new MultiLanDocument();
+            Dictionary<string, string> dicttitle = new Dictionary<string, string>();
+            Dictionary<string, string> dictdesc = new Dictionary<string, string>();
+            foreach (Models.DocumentsTranslation item in questions)
+            {
+                dicttitle.Add(item.Language, item.title);
+                dictdesc.Add(item.Language, item.description);
+            }
+            MultiLanguage.titles = dicttitle;
+            MultiLanguage.description = dictdesc;
+            return MultiLanguage;
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanDocument> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language)
         {
 
             try
             {
                 logger?.LogInformation("Query Question");
                 var documents=new List<Db.Document>();
-                if(String.IsNullOrEmpty(LinkType))
-                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive).ToListAsync();
+                if(String.IsNullOrEmpty(linkType))
+                    documents = await DocumentDbContext.Documents.Include(a=>a.LinkType).AsNoTracking().Where(q => q.IsActive).ToListAsync();
                 else
-                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive &&
-                     q.linkTypeId == (DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.TypeText.ToLower() == LinkType.ToLower()).Select(a => a.Id).FirstOrDefault())).ToListAsync();
+                    documents = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive &&
+                     q.linkTypeId == (DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.TypeText.ToLower() == linkType.ToLower()).Select(a => a.Id).FirstOrDefault())).ToListAsync();
                 if (documents != null)
                 {
-                    var result = mapper.Map<IEnumerable<Db.Document>, IEnumerable<Models.Document>>(documents);
+                    var result = mapper.Map<List<Db.Document>, List<Models.MultiLanDocument>>(documents);
                     foreach (var item in result)
                     {
-                        if(!String.IsNullOrEmpty(Language))
-                            item.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
-                                    DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == item.Id && (a.Language.ToLower() == Language.ToLower())).ToList());
-                        else
-                        item.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
-                                DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == item.Id).ToList());
+                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
+                        item.titles = multilan.titles;
+                        item.description = multilan.description;
                     }
                     return (true, result, null);
                 }
@@ -89,43 +116,44 @@ namespace DamageAssesment.Api.Documents.Providers
             }
 
         }
-        public async Task<(bool IsSuccess, IEnumerable<Models.Document> documents, string ErrorMessage)> GetDocumnetsAsync()
-        {
+        //public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanDocument> documents, string ErrorMessage)> GetDocumnetsAsync(string? language)
+        //{
 
-            try
-            {
-                logger?.LogInformation("Query Question");
-                var documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive).ToListAsync();
-                if (documents != null)
-                {
-                    logger?.LogInformation($"{documents.Count} Document(s) found");
-                    var result = mapper.Map<IEnumerable<Db.Document>, IEnumerable<Models.Document>>(documents);
-                    foreach (var item in result)
-                    {
-                        item.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
-                                DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == item.Id).ToList());
-                    }
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
+        //    try
+        //    {
+        //        logger?.LogInformation("Query Question");
+        //        var documents = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive).ToListAsync();
+        //        if (documents != null)
+        //        {
+        //            logger?.LogInformation($"{documents.Count} Document(s) found");
+        //            var result = mapper.Map<List<Db.Document>, List<Models.MultiLanDocument>>(documents);
+        //            foreach (var item in result)
+        //            {
+        //                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
+        //                item.titles = multilan.titles;
+        //                item.description = multilan.description;
+        //            }
+        //            return (true, result, null);
+        //        }
+        //        return (false, null, "Not found");
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        logger?.LogError(ex.ToString());
+        //        return (false, null, ex.Message);
+        //    }
 
-        }
-        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> GetDocumentAsync(int Id)
+        //}
+        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> GetDocumentByidAsync(int id)
         {
             try
             {
                 logger?.LogInformation("Query LinkType");
-                var Document = await DocumentDbContext.Documents.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id && q.IsActive);
+                var Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().FirstOrDefaultAsync(q => q.Id == id && q.IsActive);
                 if (Document != null)
                 {
                     logger?.LogInformation($"{Document} customer(s) found");
-                    var result = mapper.Map<Db.Document, Models.Document>(Document);
+                    var result = mapper.Map<Db.Document, Models.Document>(Document); 
                     result.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
                             DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
                     return (true, result, null);
@@ -138,7 +166,37 @@ namespace DamageAssesment.Api.Documents.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> PostDocumentAsync(Models.Document Document)
+        //added linktype filter 
+        public async Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> GetDocumentAsync(int id, string? linkType, string? language)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                //var Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().FirstOrDefaultAsync(q => q.Id == id && q.IsActive);
+                var Document = new Db.Document();
+                if (String.IsNullOrEmpty(linkType))
+                    Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive&&q.Id==id).FirstOrDefaultAsync();
+                else
+                    Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive && q.Id == id &&
+                     q.linkTypeId == (DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.TypeText.ToLower() == linkType.ToLower()).Select(a => a.Id).FirstOrDefault())).FirstOrDefaultAsync();
+                if (Document != null)
+                {
+                    logger?.LogInformation($"{Document} customer(s) found");
+                    var result = mapper.Map<Db.Document, Models.MultiLanDocument>(Document);
+                    var multilan = CreateMultiLanguageObject(GetDocumentTranslations(result.Id, language));
+                    result.titles = multilan.titles;
+                    result.description = multilan.description;
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> PostDocumentAsync(Models.Document Document)
         {
             try
             {
@@ -149,8 +207,11 @@ namespace DamageAssesment.Api.Documents.Providers
                 dbtranslation.ForEach(i => i.DocumentId = document.Id);
                 DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
                 DocumentDbContext.SaveChanges();
-                Document.Id = document.Id;
-                return (true, Document, null);
+                var result = mapper.Map<Db.Document, Models.MultiLanDocument>(document);
+                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(document.Id, ""));
+                result.titles = multilan.titles;
+                result.description = multilan.description;
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -159,15 +220,16 @@ namespace DamageAssesment.Api.Documents.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> UpdateDocumentAsync(Models.Document Document)
+        public async Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> UpdateDocumentAsync(int id,Models.Document Document)
         {
             try
             {
                 if (Document != null)
                 {
-                    var existing = DocumentDbContext.Documents.AsNoTracking().FirstOrDefault(x => x.Id == Document.Id);
+                    var existing = DocumentDbContext.Documents.AsNoTracking().FirstOrDefault(x => x.Id == id);
                     if (existing != null)
                     {
+                        Document.Id = existing.Id;
                         var document = mapper.Map<Models.Document, Db.Document>(Document);
                         DocumentDbContext.Documents.Update(document);
                         DocumentDbContext.SaveChanges();
@@ -176,7 +238,13 @@ namespace DamageAssesment.Api.Documents.Providers
                             DocumentDbContext.DocumentsTranslations.RemoveRange(oldtranslations);
                         var dbtranslation = mapper.Map<List<Models.DocumentsTranslation>, List<Db.DocumentsTranslation>>(Document.documentsTranslations);
                         dbtranslation.ForEach(i => i.DocumentId = Document.Id);
-                        return (true, Document, "Successful");
+                        DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
+                        DocumentDbContext.SaveChanges();
+                        var result = mapper.Map<Db.Document, Models.MultiLanDocument>(document);
+                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(document.Id, ""));
+                        result.titles = multilan.titles;
+                        result.description = multilan.description;
+                        return (true, result, "Successful");
                     }
                     else
                     {
@@ -198,20 +266,24 @@ namespace DamageAssesment.Api.Documents.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> DeleteDocumentAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> DeleteDocumentAsync(int id)
         {
 
             try
             {
-                Db.Document Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
+                Db.Document Document = DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
                 if (Document == null)
                 {
                     return (false, null, "Not Found");
                 }
+                var result = mapper.Map<Db.Document, Models.MultiLanDocument>(Document);
+                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(Document.Id, ""));
+                result.titles = multilan.titles;
+                result.description = multilan.description;
                 Document.IsActive = false;
                 DocumentDbContext.Documents.Update(Document);
                 DocumentDbContext.SaveChanges();
-                return (true, mapper.Map<Db.Document, Models.Document>(Document), $"DocumentId {Id} deleted Successfuly");
+                return (true, result, $"DocumentId {id} deleted Successfuly");
             }
             catch (Exception ex)
             {
@@ -257,7 +329,6 @@ namespace DamageAssesment.Api.Documents.Providers
             }
 
         }
-
         public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int Id)
         {
             try

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("Emp1",mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.UpdateEmployee("Emp1",mockInputEmployee);
+            var result = (OkObjectResult)await EmployeeProvider.UpdateEmployee(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("Emp1", mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundObjectResult)await EmployeeProvider.UpdateEmployee("Emp1", mockInputEmployee);
+            var result = (NotFoundObjectResult)await EmployeeProvider.UpdateEmployee(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("Emp1", mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (BadRequestObjectResult)await EmployeeProvider.UpdateEmployee("Emp1", mockInputEmployee);
+            var result = (BadRequestObjectResult)await EmployeeProvider.UpdateEmployee(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, Models.Employee, string)> getNotFoundResponse()
+        public static async Task<(bool, Employees.Models.Employee, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Models.Employee>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Employees.Models.Employee>, string)> getNoContentResponse()
         {
             IEnumerable<Employees.Models.Employee> list = new List<Employees.Models.Employee>();
             return (false, list, null);
         }
 
-        public static async Task<Models.Employee> getInputEmployeeData()
+        public static async Task<Employees.Db.Employee> getInputEmployeeData()
         {
-            return new Models.Employee { Id = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" };
+            return new Employees.Db.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

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

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

@@ -1,20 +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>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </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.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile

@@ -1,39 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-# Use the ASP.NET base image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-# Use the SDK image for building
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-
-# Copy the project file and restore dependencies
-COPY ["DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj", "DamageAssesment.Api.Employees/"]
-RUN dotnet restore "DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj"
-
-# Copy the source code
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Employees"
-
-# Build the application
-RUN dotnet build "DamageAssesment.Api.Employees.csproj" -c Release -o /app/build
-
-# Publish the application
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Employees.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-# Set up the final image
-FROM base AS final
-WORKDIR /app
-
-# Copy the published files
-COPY --from=publish /app/publish .
-
-## Set up the volume and copy the XML comments
-#VOLUME /xmlcomments
-#COPY ["DamageAssesment.Api.Employees.xml", "/xmlcomments/DamageAssesment.Api.Employees.xml"]
-
-# Specify the entry point for the container
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Employees.dll"]

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

@@ -4,9 +4,8 @@
     {
         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(Models.Employee Employee);
-        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(string Id, Models.Employee Employee);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Db.Employee Employee);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(Db.Employee Employee);
         Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(string Id);
-        void SeedData();
     }
 }

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

@@ -4,10 +4,18 @@ 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,7 +2,6 @@ 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);
 
@@ -11,15 +10,7 @@ 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(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.AddSwaggerGen();
 builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<EmployeeDbContext>(option =>
@@ -32,21 +23,8 @@ var app = builder.Build();
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
-    using (var serviceScope = app.Services.CreateScope())
-    {
-        var services = serviceScope.ServiceProvider;
-        var employeeProvider = services.GetRequiredService<IEmployeesProvider>();
-        employeeProvider.SeedData();
-    }
-
     app.UseSwagger();
-    app.UseSwaggerUI(options =>
-    {
-        //switch for local environment
-       // options.SwaggerEndpoint("/swagger/v1/swagger.json", "");
-        options.SwaggerEndpoint("/employees/swagger/v1/swagger.json", "");
-       
-    });
+    app.UseSwaggerUI();
 }
 
 app.UseAuthorization();

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

@@ -1,30 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Employees": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5135"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "publishAllPorts": true
-    }
-  },
+{
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
@@ -33,5 +7,25 @@
       "applicationUrl": "http://localhost:14425",
       "sslPort": 0
     }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Employees": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5135",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
   }
-}
+}

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,18 +65,17 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Models.Employee Employee)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Db.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();
-                    return (true, Employee, null);
+                    var result = mapper.Map<Db.Employee, Models.Employee>(Employee);
+                    return (true, result, null);
                 }
                 return (false, null, "Employee is already exits");
             }
@@ -86,20 +85,19 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(string Id , Models.Employee Employee)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(Db.Employee Employee)
         {
             try
             {
                 if (Employee != null)
                 {
-                    var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id.ToLower() == Id.ToLower()).FirstOrDefaultAsync();
+                    var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id.ToLower() == Employee.Id.ToLower()).FirstOrDefaultAsync();
 
                     if (_employee != null)
                     {
-                        Db.Employee vEmployee = mapper.Map<Models.Employee, Db.Employee>(Employee);
-                        EmployeeDbContext.Employees.Update(vEmployee);
+                        EmployeeDbContext.Employees.Update(Employee);
                         EmployeeDbContext.SaveChanges();
-                        return (true, Employee, "Successful");
+                        return (true, mapper.Map<Db.Employee, Models.Employee>(Employee), "Successful");
                     }
                     else
                     {
@@ -145,7 +143,7 @@ namespace DamageAssesment.Api.Employees.Providers
             return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id.ToLower() == id.ToLower()) > 0;
         }
 
-        public void SeedData()
+        private void SeedData()
         {
             if (!EmployeeDbContext.Employees.Any())
             {
@@ -153,8 +151,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 = "es" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32) ,IsActive = true, PreferredLanguage = "es" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { 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 = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32) ,IsActive = true, PreferredLanguage = "sp" });
                 EmployeeDbContext.SaveChanges();
             }
 

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

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

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>

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

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

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

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

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

@@ -4,8 +4,7 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Locations.Controllers
 {
-    [Route("Locations")]
-    //[Route("[controller]")]
+    [Route("api")]
     [ApiController]
     public class LocationsController : ControllerBase
     {
@@ -15,12 +14,8 @@ namespace DamageAssesment.Api.Locations.Controllers
         {
             this.LocationProvider = LocationsProvider;
         }
-        /// <summary>
-        /// Get all locations.
-        /// </summary>
-
-        //[HttpGet("locations")]
-        [HttpGet]
+        // Get all Locations
+        [HttpGet("Locations")]
         public async Task<ActionResult> GetLocationsAsync()
         {
 
@@ -32,11 +27,8 @@ namespace DamageAssesment.Api.Locations.Controllers
             return NotFound();
 
         }
-        /// <summary>
-        /// Get all locations based on locationdId.
-        /// </summary>
-
-        [HttpGet("{id}")]
+        // Get all Location based on Id
+        [HttpGet("Locations/{id}")]
         public async Task<ActionResult> GetLocationByIdAsync(string id)
         {
 
@@ -48,16 +40,13 @@ namespace DamageAssesment.Api.Locations.Controllers
             return NotFound();
 
         }
-        /// <summary>
-        /// Update a Location.
-        /// </summary>
-
-        [HttpPut("{locations}")]
-        public async Task<IActionResult> UpdateLocation(Models.Location location)
+        // Update Location entity
+        [HttpPut("Locations")]
+        public async Task<IActionResult> UpdateLocation(Db.Location Location)
         {
-            if (location != null)
+            if (Location != null)
             {
-                var result = await this.LocationProvider.UpdateLocationAsync(location);
+                var result = await this.LocationProvider.UpdateLocationAsync(Location);
                 if (result.IsSuccess)
                 {
                     return Ok(result.ErrorMessage);
@@ -66,12 +55,9 @@ namespace DamageAssesment.Api.Locations.Controllers
             }
             return NotFound();
         }
-        /// <summary>
-        /// Save a new location.
-        /// </summary>
-
-        [HttpPost("{locations}")]
-        public async Task<IActionResult> CreateLocation(Models.Location Location)
+        //save new location
+        [HttpPost("Locations")]
+        public async Task<IActionResult> CreateLocation(Db.Location Location)
         {
             if (Location != null)
             {
@@ -84,11 +70,8 @@ namespace DamageAssesment.Api.Locations.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = Location.Id }, Location);
         }
-        /// <summary>
-        /// Delete an existing location.
-        /// </summary>
-
-        [HttpDelete("{id}")]
+        //delete existing location
+        [HttpDelete("Locations/{id}")]
         public async Task<IActionResult> DeleteLocation(string id)
         {
             var result = await this.LocationProvider.DeleteLocationAsync(id);

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

@@ -3,8 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Locations.Controllers
 {
-    //[Route("api/[controller]")]
-    [Route("[controller]")]
+    [Route("api/[controller]")]
     [ApiController]
     public class RegionsController : ControllerBase
     {
@@ -14,10 +13,8 @@ namespace DamageAssesment.Api.Locations.Controllers
         {
             this.regionProvider = regionProvider;
         }
-        /// <summary>
-        /// Get all regions.2
-        /// </summary>
 
+        // Get all Regions
         [HttpGet]
         public async Task<ActionResult> GetRegionsAsync()
         {
@@ -28,9 +25,6 @@ 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)
@@ -42,11 +36,8 @@ namespace DamageAssesment.Api.Locations.Controllers
             }
             return NotFound();
         }
-        /// <summary>
-        /// POST request for creating a new region.
-        /// </summary>
 
-        [HttpPost("{region}")]
+        [HttpPost]
         public async Task<ActionResult> PostRegionAsync(Models.Region region)
         {
             var result = await this.regionProvider.PostRegionAsync(region);
@@ -56,11 +47,8 @@ namespace DamageAssesment.Api.Locations.Controllers
             }
             return BadRequest(result.ErrorMessage);
         }
-        /// <summary>
-        /// PUT request for updating an existing region.
-        /// </summary>
 
-        [HttpPut("{region}")]
+        [HttpPut]
         public async Task<ActionResult> PutRegionAsync(Models.Region region)
         {
             var result = await this.regionProvider.PutRegionAsync(region);
@@ -73,10 +61,6 @@ 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,17 +4,12 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </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.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile

@@ -1,39 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-# Use the ASP.NET base image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-# Use the SDK image for building
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-
-# Copy the project file and restore dependencies
-COPY ["DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj", "DamageAssesment.Api.Locations/"]
-RUN dotnet restore "DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj"
-
-# Copy the source code
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Locations"
-
-# Build the application
-RUN dotnet build "DamageAssesment.Api.Locations.csproj" -c Release -o /app/build
-
-# Publish the application
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Locations.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-# Set up the final image
-FROM base AS final
-WORKDIR /app
-
-# Copy the published files
-COPY --from=publish /app/publish .
-
-## Set up the volume and copy the XML comments
-#VOLUME /xmlcomments
-#COPY ["DamageAssesment.Api.Locations.xml", "/xmlcomments/DamageAssesment.Api.Locations.xml"]
-
-# Specify the entry point for the container
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Locations.dll"]

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

@@ -6,9 +6,8 @@ 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(Models.Location Location);
-        Task<(bool IsSuccess, string ErrorMessage)> UpdateLocationAsync(Models.Location Location);
+        Task<(bool IsSuccess, Models.Location Question, string ErrorMessage)> PostLocationAsync(Db.Location Location);
+        Task<(bool IsSuccess, string ErrorMessage)> UpdateLocationAsync(Db.Location Location);
         Task<(bool IsSuccess, string ErrorMessage)> DeleteLocationAsync(string Id);
-        void SeedData();
     }
 }

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

@@ -7,6 +7,5 @@
         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,7 +2,6 @@ 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);
 
@@ -11,14 +10,8 @@ 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(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.AddSwaggerGen();
+
 builder.Services.AddScoped<ILocationsProvider, LocationsProvider>();
 builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
@@ -31,25 +24,8 @@ var app = builder.Build();
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
-    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.UseSwagger();
-    app.UseSwaggerUI(options =>
-    {
-        //switch for local environment
-       // options.SwaggerEndpoint("/swagger/v1/swagger.json","");
-        options.SwaggerEndpoint("locations/swagger/v1/swagger.json", ""); 
-       
-
-    });
+    app.UseSwaggerUI();
 }
 
 app.UseAuthorization();

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

@@ -1,30 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Locations": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5213"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "publishAllPorts": true
-    }
-  },
+{
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
@@ -33,5 +7,25 @@
       "applicationUrl": "http://localhost:20458",
       "sslPort": 0
     }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Locations": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5213",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
   }
-}
+}

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

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

@@ -1,6 +1,7 @@
 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
@@ -16,7 +17,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)
@@ -149,7 +150,7 @@ namespace DamageAssesment.Api.Locations.Providers
             }
         }
 
-        public void SeedData()
+        private void SeedData()
         {
             if (!locationDbContext.Regions.Any())
             {

DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.json

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

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

@@ -1,9 +1,13 @@
-using DamageAssesment.Api.Questions.Interfaces;
+using DamageAssesment.Api.Questions.Db;
+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")]
+    [Route("api")]
     [ApiController]
     public class QuestionsController : ControllerBase
     {
@@ -15,52 +19,33 @@ namespace DamageAssesment.Api.Questions.Controllers
             this.questionsProvider = questionsProvider;
 
         }
-
-        /// <summary>
-        /// GET request for retrieving questions, e.g api/fr/Questions (default returns all language). 
-        /// </summary>
-
         // get all questions
-        [Route("{Language}/Questions")]
-        [Route("Questions")]
-        [HttpGet]
-        public async Task<IActionResult> GetQuestionsAsync(string? Language)
+        [HttpGet("Questions")]
+        public async Task<IActionResult> GetQuestionsAsync()
         {
-            var result = await this.questionsProvider.GetQuestionsAsync(Language);
+            var result = await this.questionsProvider.GetQuestionsAsync();
             if (result.IsSuccess)
             {
                 return Ok(result.Questions);
             }
             return NoContent();
         }
-
         //Get questions based on question id
-        /// <summary>
-        /// GET request for retrieving a question by ID.
-        /// </summary>
-        [Route("{Language}/Questions/{id}")]
-        [Route("Questions/{id}")]
-        [HttpGet]
-        public async Task<IActionResult> GetQuestionAsync(int id, string? Language)
+        [HttpGet("Questions/{id}")]
+        public async Task<IActionResult> GetQuestionAsync(int id)
         {
-            var result = await this.questionsProvider.GetQuestionAsync(id,Language);
+            var result = await this.questionsProvider.GetQuestionAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Question);
             }
             return NotFound();
         }
-
         //get all questions based on survey id
-        /// <summary>
-        /// GET request for retrieving survey questions based on a survey ID.
-        /// Uri: {Optional language}/GetSurveyQuestions/{surveyId} :Default returns question in all languages 
-        /// </summary>
-        [Route("{Language}/GetSurveyQuestions/{surveyId}")]
-        [Route("GetSurveyQuestions/{surveyId}")]
-        [HttpGet]
+        [HttpGet("GetSurveyQuestions/{surveyId}")]
         public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? Language)
         {
+            if (string.IsNullOrEmpty(Language)) Language = "en";
             var result = await this.questionsProvider.GetSurveyQuestionAsync(surveyId, Language);
             if (result.IsSuccess)
             {
@@ -68,10 +53,7 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return NotFound();
         }
-        /// <summary>
-        /// PUT request for updating a question (multilingual).
-        /// </summary>
-
+        //update existing question
         [HttpPut("Questions")]
         public async Task<IActionResult> UpdateQuestion(Models.Question question)
         {
@@ -89,10 +71,7 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
         }
-        /// <summary>
-        /// POST request for creating a new question (multilingual).
-        /// </summary>
-
+        //save new question
         [HttpPost("Questions")]
         public async Task<IActionResult> CreateQuestion(Models.Question question)
         {
@@ -107,10 +86,7 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
         }
-        /// <summary>
-        /// DELETE request for deleting a question based on ID.
-        /// </summary>
-
+        // delete existing question
         [HttpDelete("Questions/{id}")]
         public async Task<IActionResult> DeleteQuestion(int id)
         {
@@ -122,10 +98,8 @@ namespace DamageAssesment.Api.Questions.Controllers
             return NotFound();
         }
 
-        /// <summary>
-        /// GET request for retrieving question categories.
-        /// </summary>
 
+        // get all questions
         [HttpGet("QuestionCategories")]
         public async Task<IActionResult> GetQuestionCategoriesAsync()
         {
@@ -136,10 +110,7 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return NoContent();
         }
-        /// <summary>
-        /// GET request for retrieving a question category by ID.
-        /// </summary>
-
+        //Get questions based on question id
         [HttpGet("QuestionCategories/{id}")]
         public async Task<IActionResult> GetQuestionCategoryAsync(int id)
         {
@@ -152,10 +123,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         }
 
 
-        /// <summary>
-        /// PUT request for updating a question category.
-        /// </summary>
-
+        //update existing question
         [HttpPut("QuestionCategories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
@@ -173,10 +141,7 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = questionCategory.Id }, questionCategory);
         }
-        /// <summary>
-        /// POST request for creating a new question category.
-        /// </summary>
-
+        //save new question
         [HttpPost("QuestionCategories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
@@ -191,10 +156,7 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = questionCategory.Id }, questionCategory);
         }
-        /// <summary>
-        /// DELETE request for deleting a question category based on ID.
-        /// </summary>
-
+        // delete existing question
         [HttpDelete("QuestionCategories/{id}")]
         public async Task<IActionResult> DeleteQuestionCategory(int id)
         {

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

@@ -1,20 +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>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </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.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -20,6 +20,7 @@ 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/QuestionDbContext.cs

@@ -14,21 +14,12 @@ namespace DamageAssesment.Api.Questions.Db
         {
 
         }
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-            modelBuilder.Entity<Question>()
-                .Property(item => item.Id)
-                .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();
-        }
+        //protected override void OnModelCreating(ModelBuilder modelBuilder)
+        //{
+        //    modelBuilder.Entity<Question>()
+        //        .HasOne(a => a.QuestionType)
+        //        .WithOne(b => b.Question)
+        //        .HasForeignKey<QuestionType>(b => b.QuestionTypeID);
+        //}
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile

@@ -1,38 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-# Use the ASP.NET base image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-# Use the SDK image for building
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-
-# Copy the project file and restore dependencies
-COPY ["DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj", "DamageAssesment.Api.Questions/"]
-RUN dotnet restore "DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj"
-
-# Copy the source code
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Questions"
-
-# Build the application
-RUN dotnet build "DamageAssesment.Api.Questions.csproj" -c Release -o /app/build
-
-# Publish the application
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Questions.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-# Set up the final image
-FROM base AS final
-WORKDIR /app
-
-# Copy the published files
-COPY --from=publish /app/publish .
-
-## Set up the volume and copy the XML comments
-#VOLUME /xmlcomments
-#COPY ["DamageAssesment.Api.Questions.xml", "/xmlcomments/DamageAssesment.Api.Questions.xml"]
-
-# Specify the entry point for the container
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Questions.dll"]

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

@@ -4,6 +4,5 @@
     {
         Task<(bool IsSuccess, Db.QuestionType QuestionType, string ErrorMessage)> GetQuestionTypeAsync(int Id);
         Task<(bool IsSuccess, IEnumerable<Db.QuestionType> QuestionTypes, string ErrorMessage)> GetQuestionTypesAsync();
-       
     }
 }

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

@@ -4,8 +4,8 @@ namespace DamageAssesment.Api.Questions.Interfaces
 {
     public interface IQuestionsProvider : IQuestionTypesProvider
     {
-        Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> GetQuestionAsync(int Id, string Language);
-        Task<(bool IsSuccess, IEnumerable<Models.Question> Questions, string ErrorMessage)> GetQuestionsAsync(string Language);
+        Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> GetQuestionAsync(int Id);
+        Task<(bool IsSuccess, IEnumerable<Models.Question> Questions, string ErrorMessage)> GetQuestionsAsync();
         Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string Language);
         Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
         Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
@@ -17,6 +17,5 @@ namespace DamageAssesment.Api.Questions.Interfaces
         Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory);
         Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory);
         Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id);
-        void SeedData();
     }
 }

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

@@ -17,6 +17,7 @@ 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/Program.cs

@@ -3,7 +3,6 @@ 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);
 
@@ -18,14 +17,7 @@ builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 
 
 builder.Services.AddEndpointsApiExplorer();
-//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.AddSwaggerGen();
 builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
     option.UseInMemoryDatabase("Questions");
@@ -35,20 +27,8 @@ var app = builder.Build();
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
-    using (var serviceScope = app.Services.CreateScope())
-    {
-        var services = serviceScope.ServiceProvider;
-        var questionProvider = services.GetRequiredService<IQuestionsProvider>();
-        questionProvider.SeedData();
-    }
-
     app.UseSwagger();
-    app.UseSwaggerUI(options => {
-        //switch for local environment
-       // options.SwaggerEndpoint("/swagger/v1/swagger.json", "");
-       options.SwaggerEndpoint("/questions/swagger/v1/swagger.json", "");
-    
-    });
+    app.UseSwaggerUI();
 }
 
 app.UseAuthorization();

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

@@ -1,30 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Questions": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5133"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "publishAllPorts": true
-    }
-  },
+{
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
@@ -33,5 +7,25 @@
       "applicationUrl": "http://localhost:60754",
       "sslPort": 0
     }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Questions": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5133",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
   }
-}
+}

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

@@ -21,52 +21,57 @@ namespace DamageAssesment.Api.Questions.Providers
             this.questionDbContext = questionDbContext;
             this.logger = logger;
             this.mapper = mapper;
-           // SeedData();
+            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 = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 8, QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 9, QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 7, QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "sp" });
+                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 = 9, QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "sp" });
                 questionDbContext.SaveChanges();
             }
             if (!questionDbContext.Questions.Any())
             {
-                questionDbContext.Questions.Add(new Db.Question() { Id = 1,  QuestionTypeId = 2, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1 });
-                questionDbContext.Questions.Add(new Db.Question() { Id = 2,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false,  CategoryId = 1 });
-                questionDbContext.Questions.Add(new Db.Question() { Id = 3,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true,  CategoryId = 2 });
+                questionDbContext.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 = 2,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, QuestionGroup = "group1", 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.SaveChanges();
             }
             if (!questionDbContext.QuestionTypes.Any())
             {
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 1, TypeText = "RadioButton" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 2, TypeText = "CheckBox" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 3, TypeText = "TextBox" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 1, TypeText = "Text 1" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 2, TypeText = "Text 2" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 3, TypeText = "Text 3" });
+                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 = "Flooding", CategoryImage= "https://example.com/images/img1.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 2, CategoryName = "Electrical", CategoryImage = "https://example.com/images/img2.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 3, CategoryName = "Structural", CategoryImage = "https://example.com/images/img3.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 4, CategoryName = "Utility", CategoryImage = "https://example.com/images/img4.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory()   { Id = 5, CategoryName = "Debris", CategoryImage = "https://example.com/images/img5.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 1, CategoryName = "Category 1", CategoryImage="img1" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 2, CategoryName = "Category 2", CategoryImage = "img1" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 3, CategoryName = "Category 3", CategoryImage = "img1" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 4, CategoryName = "Category 4", CategoryImage = "img1" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory()   { Id = 5, CategoryName = "Category 5", CategoryImage = "img1" });
                 questionDbContext.SaveChanges();
             }
+
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Question> Questions, string ErrorMessage)> GetQuestionsAsync(string Language)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Question> Questions, string ErrorMessage)> GetQuestionsAsync()
         {
             try
             {
@@ -77,20 +82,10 @@ namespace DamageAssesment.Api.Questions.Providers
 
                     //logger?.LogInformation($"{question} customer(s) found");
                     var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.Question>>(questions);
-
-
                     foreach (var question in result)
                     {
-                        if (string.IsNullOrEmpty(Language))
-                        {
-                            question.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                            questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == question.Id).ToList());
-                        }
-                        else
-                        {
-                            question.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                            questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == question.Id && a.Language == Language).ToList());
-                        }
+                        question.Questions=mapper.Map<List<Db.QuestionsTranslation>,List<Models.QuestionsTranslation>>(
+                            questionDbContext.QuestionsTranslations.Where(a=>a.QuestionId==question.Id).ToList());
                     }
                     return (true, result, null);
                 }
@@ -102,7 +97,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> GetQuestionAsync(int Id, string Language)
+        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> GetQuestionAsync(int Id)
         {
             try
             {
@@ -112,17 +107,8 @@ namespace DamageAssesment.Api.Questions.Providers
                 {
                     logger?.LogInformation($"{question} customer(s) found");
                     var result = mapper.Map<Db.Question, Models.Question>(question);
-
-                    if (string.IsNullOrEmpty(Language))
-                    {
-                        result.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                                questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == result.Id).ToList());
-                    }
-                    else
-                    {
-                        result.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                     questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == result.Id && a.Language == Language).ToList());
-                    }
+                    result.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                            questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == result.Id).ToList());
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -133,23 +119,12 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public List<Models.Question> GetSurveyQuestion(List<Models.Question> questions, string Language)
+        public List<Models.Question>  GetSurveyQuestion(List<Models.Question> questions,string Language)
         {
-            if (string.IsNullOrEmpty(Language))
+            foreach (var item in questions)
             {
-                foreach (var item in questions)
-                {
-                    item.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                                questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == item.Id).ToList());
-                }
-            }
-            else
-            {
-                foreach (var item in questions)
-                {
-                    item.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                                questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == item.Id && a.Language == Language).ToList());
-                }
+                item.Questions= mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                            questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == item.Id && a.Language== Language).ToList());
             }
             return questions;
         }
@@ -158,12 +133,12 @@ namespace DamageAssesment.Api.Questions.Providers
             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();
-                    var questioncategories = await questionDbContext.QuestionCategories.Where(a => CategoryIds.Contains(a.Id)).ToListAsync();
+                    List<int> CategoryIds=questions.Select(a=>a.CategoryId).Distinct().ToList();
+                    var questioncategories = await questionDbContext.QuestionCategories.Where(a =>CategoryIds.Contains(a.Id)).ToListAsync();
                     //logger?.LogInformation($"{question} customer(s) found");
                     foreach (var item in questioncategories)
                     {
@@ -194,11 +169,11 @@ namespace DamageAssesment.Api.Questions.Providers
                 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();
+                questionDbContext.SaveChanges(); 
                 Question.Id = dbquestion.Id;
                 return (true, Question, null);
             }
@@ -217,7 +192,7 @@ 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);
@@ -256,6 +231,8 @@ namespace DamageAssesment.Api.Questions.Providers
             }
         }
 
+
+
         //Question Category Logic
 
         public async Task<(bool IsSuccess, IEnumerable<Models.QuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync()
@@ -307,7 +284,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 // Question.QuestionType = GetQuestionType(Question.QuestionTypeId);
                 questionDbContext.QuestionCategories.Add(dbQuestionCategory);
                 questionDbContext.SaveChanges();
-                QuestionCategory.Id = dbQuestionCategory.Id;
+                QuestionCategory.Id=dbQuestionCategory.Id;
                 return (true, QuestionCategory, null);
             }
             catch (Exception ex)

DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json

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

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

@@ -1,4 +1,11 @@
-using System.Text;
+using DamageAssesment.Api.Questions.Db;
+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
 {
@@ -11,7 +18,7 @@ namespace DamageAssesment.Api.Questions.Test
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Questions.Models.Question { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=i });
+                list.Append(new Questions.Models.Question { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, QuestionGroup = "group1",CategoryId=i });
             }
             return (true, list, null);
         }
@@ -24,7 +31,7 @@ namespace DamageAssesment.Api.Questions.Test
             for (int i = 0; i < 10; i++)
             {
                 List<Models.Question> question = new List<Models.Question>();
-                question.Add(new Models.Question { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = i });
+                question.Add(new 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.SurveyQuestions
                 {
                     CategoryId = i,
@@ -72,7 +79,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, CategoryId=1};
+            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};
 
         }
 

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

@@ -1,7 +1,16 @@
+
+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
@@ -13,10 +22,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getOkResponse();
-            mockQuestionService.Setup(service => service.GetQuestionsAsync(null)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionsAsync()).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionsAsync(null);
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionsAsync();
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -26,10 +35,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockQuestionService.Setup(service => service.GetQuestionsAsync(null)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionsAsync()).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NoContentResult)await QuestionProvider.GetQuestionsAsync(null);
+            var result = (NoContentResult)await QuestionProvider.GetQuestionsAsync();
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -39,10 +48,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getOkResponse(1);
-            mockQuestionService.Setup(service => service.GetQuestionAsync(1,null)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionAsync(1)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionAsync(1,null);
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionAsync(1);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -52,10 +61,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockQuestionService.Setup(service => service.GetQuestionAsync(99,null)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionAsync(99)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NotFoundResult)await QuestionProvider.GetQuestionAsync(99,null);
+            var result = (NotFoundResult)await QuestionProvider.GetQuestionAsync(99);
             Assert.Equal(404, result.StatusCode);
         }
 

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.UsersAccess.Bases
+namespace DamageAssesment.Api.SurveyResponses.Bases
 {
     public class ServiceProviderBase
     {

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

@@ -6,7 +6,7 @@ using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.SurveyResponses.Controllers
 {
-    [Route("Responses")]
+    [Route("api")]
     [ApiController]
     public class SurveyResponsesController : ControllerBase
     {
@@ -16,11 +16,8 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         {
             this.surveyResponseProvider = surveyResponseProvider;
         }
-        /// <summary>
-        /// GET request for retrieving survey responses.
-        /// </summary>
 
-        [HttpGet]
+        [HttpGet("SurveyResponses")]
         public async Task<ActionResult> GetSurveyResponsesAsync()
         {
             var result = await this.surveyResponseProvider.GetSurveyResponsesAsync();
@@ -34,11 +31,8 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
 
             return BadRequest(result.ErrorMessage);
         }
-        /// <summary>
-        /// GET request for retrieving survey responses by survey ID.
-        /// </summary>
-       
-        [HttpGet("surveys/{surveyId}")]
+
+        [HttpGet("SurveyResponses/{surveyId}")]
         public async Task<ActionResult> GetSurveyResponsesAsync(int surveyId)
         {
             var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyId);
@@ -48,13 +42,8 @@ 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("{surveyId}/{locationId}")]
+        [HttpGet("Responses/{surveyId}/{locationId}")]
         public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, string locationId)
         {
             var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyId, locationId);
@@ -65,14 +54,8 @@ 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("ByAnswers/{surveyId}/{questionId}/{answer}")]
+        [HttpGet("ResponsesByAnswer/{surveyId}/{questionId}/{answer}")]
         public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyId, int questionId, string answer)
         {       
             var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyId, questionId, answer);
@@ -83,12 +66,8 @@ 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("ByRegion/{surveyId}")]
+        [HttpGet("AnswersByRegion/{surveyId}")]
         public async Task<ActionResult> GetAnswersByRegionAsync(int surveyId)
         {
             var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyId);
@@ -98,12 +77,8 @@ 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("ByMaintenanceCenter/{surveyId}")]
+        [HttpGet("AnswersByMaintenanceCenter/{surveyId}")]
         public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyId)
         {
             var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyId);
@@ -113,15 +88,11 @@ 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/{Id}")]
-        public async Task<ActionResult> GetSurveyResponseByIdAsync(int Id)
+        [HttpGet("SurveyResponse/{responseId}")]
+        public async Task<ActionResult> GetSurveyResponseByIdAsync(int responseId)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(Id);
+            var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(responseId);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponse);
@@ -129,12 +100,8 @@ 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]
+        [HttpPost("SurveyResponses")]
         public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse)
         {
             var result = await this.surveyResponseProvider.PostSurveyResponseAsync(surveyResponse);
@@ -144,13 +111,8 @@ 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("{Id}")]
+        [HttpPut("SurveyResponses/{Id}")]
         public async Task<ActionResult> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse)
         {
             var result = await this.surveyResponseProvider.PutSurveyResponseAsync(Id, surveyResponse);
@@ -163,11 +125,8 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
 
             return BadRequest(result.ErrorMessage);
         }
-        /// <summary>
-        /// DELETE request for deleting an existing survey response.
-        /// </summary>
-       
-        [HttpDelete("{Id}")]
+
+        [HttpDelete("SurveyResponses/{Id}")]
         public async Task<ActionResult> DeleteSurveyResponseAsync(int Id)
         {
             var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(Id);
@@ -177,15 +136,17 @@ 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("Answers")]
-        public async Task<ActionResult> PostSurveyAnswersAsync(Request request)
+        [HttpPost("SurveyResponses/Answers")]
+        public async Task<ActionResult> PostSurveyAnswersAsync(AnswerRequest answers)
         {
-            var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(request);
+            /* var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(surveyAnswers);
+             if (result.IsSuccess)
+             {
+                 return Ok(result.SurveyResponse);
+             }
+             return BadRequest(result.ErrorMessage);*/
+            var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(answers);
 
             if (result.IsSuccess)
                 return Ok(result.SurveyResponse);

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

@@ -4,18 +4,14 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </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="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>

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

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

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

@@ -10,13 +10,5 @@ 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/Dockerfile

@@ -1,41 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-# Use the ASP.NET base image
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-# Use the SDK image for building
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-
-# Copy the project file and restore dependencies
-COPY ["DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.SurveyResponses.csproj", "DamageAssesment.Api.SurveyResponses/"]
-RUN dotnet restore "DamageAssesment.Api.SurveyResponses/DamageAssesment.Api.SurveyResponses.csproj"
-
-# Copy the source code
-COPY . .
-
-# Change the working directory to the project directory
-WORKDIR "/src/DamageAssesment.Api.SurveyResponses"
-
-# Build the application
-RUN dotnet build "DamageAssesment.Api.SurveyResponses.csproj" -c Release -o /app/build
-
-# Publish the application
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.SurveyResponses.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-# Set up the final image
-FROM base AS final
-WORKDIR /app
-
-# Copy the published files from the publish stage
-COPY --from=publish /app/publish .
-
-## Set up the volume and copy the XML comments
-#VOLUME /xmlcomments
-#COPY ["DamageAssesment.Api.SurveyResponses.xml", "/xmlcomments/DamageAssesment.Api.SurveyResponses.xml"]
-#
-# Specify the entry point for the container
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.SurveyResponses.dll"]

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

@@ -1,9 +0,0 @@
-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(Request request);
+        Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.AnswerRequest answers);
 
     }
 }

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

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

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/Request.cs

@@ -1,10 +0,0 @@
-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,11 +4,25 @@ 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 IEnumerable<SurveyTranslation> Titles { get; set; }
+
+        //public DateTime CreatedDate { get; set; }
+
+        //[StringLength(6)]
+        //public string EmployeeID { get; set; }
+
     }
 }

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

@@ -5,14 +5,24 @@ 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 string? ClientDevice { get; set; }
-        public string? KeyAnswerResult { get; set; }
-        public double? Longitute { get; set; }
-        public double? Latitude { get; set; }
+
+        //public DateTime? CreatedDate { get; set; }
+
+        //[StringLength(50)]
+        //public string ClientDevice { get; set; }
+
+        //[StringLength(250)]
+        //public string KeyAnswerResult { get; set; }
     }
 }

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

@@ -1,13 +0,0 @@
-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,10 +1,9 @@
 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;
@@ -19,29 +18,39 @@ builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 
 builder.Services.AddScoped<ISurveysResponse, SurveyResponsesProvider>();
-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.AddScoped<ILogger, Logger>();
 
-builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
+builder.Services.AddHttpClient<IAnswerServiceProvider, AnswerServiceProvider>().
+    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
+    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker) ));
+
+builder.Services.AddHttpClient<ILocationServiceProvider, LocationServiceProvider>().
     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(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.AddSwaggerGen();
 builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
 {
     option.UseInMemoryDatabase("SurveyResponses");
@@ -52,12 +61,7 @@ var app = builder.Build();
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
-    app.UseSwaggerUI(options => { 
-        //switch for local environment
-       // options.SwaggerEndpoint("/swagger/v1/swagger.json", ""); 
-        options.SwaggerEndpoint("/surveyresponses/swagger/v1/swagger.json", ""); 
-    
-    });
+    app.UseSwaggerUI();
 }
 
 app.UseAuthorization();

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

@@ -1,30 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.SurveyResponses": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5104"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "publishAllPorts": true
-    }
-  },
+{
   "$schema": "https://json.schemastore.org/launchsettings.json",
   "iisSettings": {
     "windowsAuthentication": false,
@@ -33,5 +7,25 @@
       "applicationUrl": "http://localhost:58856",
       "sslPort": 0
     }
+  },
+  "profiles": {
+    "DamageAssesment.Api.SurveyResponses": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5104",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
   }
-}
+}

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

@@ -0,0 +1,87 @@
+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/AttachmentServiceProvider.cs

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

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

@@ -1,6 +1,6 @@
-using DamageAssesment.Api.UsersAccess.Bases;
-using DamageAssesment.Api.UsersAccess.Interfaces;
-using DamageAssesment.Api.UsersAccess.Models;
+using DamageAssesment.Api.SurveyResponses.Bases;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Models;
 using Newtonsoft.Json;
 using System.Reflection;
 

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

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

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

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

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

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