merge with docker-branch

.gitignore

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

DamageAssesmentApi/.dockerignore

@@ -0,0 +1,25 @@
+**/.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/Controllers/AnswersController.cs

@@ -1,9 +1,11 @@
 using DamageAssesment.Api.Answers.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.OpenApi.Any;
 
 namespace DamageAssesment.Api.Answers.Controllers
 {
+    //[Route("api")]
     [ApiController]
     public class AnswersController: ControllerBase
     {
@@ -15,7 +17,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers
         /// </summary>
-        [Authorize(Roles = "admin")]
+        
         [HttpGet("Answers")]
         public async Task<ActionResult> GetAnswersAsync() {
         
@@ -31,7 +33,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Get an answer based on answerId.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
+
         [HttpGet("Answers/{Id}")]
         public async Task<ActionResult> GetAnswerByIdAsync(int Id)
         {
@@ -47,11 +49,10 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers based on responseId.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpGet("Answers/ByResponse/{responseid}")]
-        public async Task<IActionResult> GetAnswersByResponseId(int responseid)
+        [HttpGet("AnswersByResponse/{ResponseId}")]
+        public async Task<IActionResult> GetAnswersByResponseId(int ResponseId)
         {
-            var result = await this.answerProvider.GetAnswersAsync(responseid);
+            var result = await this.answerProvider.GetAnswersAsync(ResponseId);
             if(result.IsSuccess)
             {
                 return Ok(result.Answers);
@@ -61,11 +62,11 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers based on questionId.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpGet("Answers/ByQuestion/{questionid}")]
-        public async Task<IActionResult> AnswersByQuestionId(int questionid)
+
+        [HttpGet("AnswersByQuestion/{QuestionId}")]
+        public async Task<IActionResult> AnswersByQuestionId(int QuestionId)
         {
-            var result = await this.answerProvider.GetAnswersByQuestionAsync(questionid);
+            var result = await this.answerProvider.GetAnswersByQuestionAsync(QuestionId);
             if (result.IsSuccess)
             {
                 return Ok(result.Answers);
@@ -75,7 +76,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Update an existing answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpPut("Answers")]
         public async Task<IActionResult> UpdateAnswer(Models.Answer answer)
         {
@@ -96,7 +97,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Save a new answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpPost("Answers")]
         public async Task<IActionResult> CreateAnswer(Models.Answer answer)
         {
@@ -114,7 +115,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         ///  Delete an existing answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpDelete("Answers/{id}")]
         public async Task<IActionResult> DeleteAnswer(int id)
         {

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

@@ -1,10 +1,12 @@
-<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>
@@ -12,6 +14,7 @@
     <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/Dockerfile

@@ -0,0 +1,39 @@
+#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/Program.cs

@@ -1,73 +1,28 @@
 using DamageAssesment.Api.Answers.Db;
 using DamageAssesment.Api.Answers.Interfaces;
 using DamageAssesment.Api.Answers.Providers;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
+using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using System.Reflection;
-using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(item =>
-{
-    item.RequireHttpsMetadata = true;
-    item.SaveToken = true;
-    item.TokenValidationParameters = new TokenValidationParameters()
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        ClockSkew = TimeSpan.Zero
-    };
-});
+
 // Add services to the container.
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-builder.Services.AddSwaggerGen(options =>
+builder.Services.AddSwaggerGen(c =>
 {
+  
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
+    c.IncludeXmlComments(xmlPath);
+  
 
-    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
-    {
-        Name = "Bearer",
-        BearerFormat = "JWT",
-        Scheme = "bearer",
-        Description = "Specify the authorization token.",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.Http,
-    };
-
-    options.AddSecurityDefinition("jwt_auth", securityDefinition);
-
-    // Make sure swagger UI requires a Bearer token specified
-    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
-    {
-        Reference = new OpenApiReference()
-        {
-            Id = "jwt_auth",
-            Type = ReferenceType.SecurityScheme
-        }
-    };
-
-    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
-    {
-        {securityScheme, new string[] { }},
-    };
-
-    options.AddSecurityRequirement(securityRequirements);
 });
 builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
@@ -82,10 +37,23 @@ 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();
+    app.UseSwaggerUI(
+        options =>
+    {
+        //switch for local environment
+        //options.SwaggerEndpoint("/swagger/v1/swagger.json", "");
+        options.SwaggerEndpoint("/answers/swagger/v1/swagger.json","" );
+        
+    } );
 }
-app.UseAuthentication();
+
 app.UseAuthorization();
 
 app.MapControllers();

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

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

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

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

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

@@ -5,6 +5,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,6 +16,7 @@
     <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/Dockerfile

@@ -0,0 +1,47 @@
+#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

@@ -13,5 +13,6 @@ namespace DamageAssesment.Api.Attachments.Interfaces
         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/Program.cs

@@ -1,75 +1,25 @@
 using DamageAssesment.Api.Attachments.Db;
 using DamageAssesment.Api.Attachments.Interfaces;
 using DamageAssesment.Api.Attachments.Providers;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.FileProviders;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.OpenApi.Models;
 using System.Reflection;
-using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(item =>
-{
-    item.RequireHttpsMetadata = true;
-    item.SaveToken = true;
-    item.TokenValidationParameters = new TokenValidationParameters()
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        ClockSkew = TimeSpan.Zero
-    };
-});
+
 // Add services to the container.
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-builder.Services.AddSwaggerGen(options =>
+builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
-
-    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
-    {
-        Name = "Bearer",
-        BearerFormat = "JWT",
-        Scheme = "bearer",
-        Description = "Specify the authorization token.",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.Http,
-    };
-
-    options.AddSecurityDefinition("jwt_auth", securityDefinition);
-
-    // Make sure swagger UI requires a Bearer token specified
-    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
-    {
-        Reference = new OpenApiReference()
-        {
-            Id = "jwt_auth",
-            Type = ReferenceType.SecurityScheme
-        }
-    };
-
-    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
-    {
-        {securityScheme, new string[] { }},
-    };
-
-    options.AddSecurityRequirement(securityRequirements);
+    c.IncludeXmlComments(xmlPath);
 });
 builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
@@ -92,10 +42,16 @@ var app = builder.Build();
 if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
-    app.UseSwaggerUI();
+    app.UseSwaggerUI(options => {
+       //switch for local environment
+        // options.SwaggerEndpoint("/swagger/v1/swagger.json", "");
+        options.SwaggerEndpoint("/attachments/swagger/v1/swagger.json", "");
+     
+    });
+
+
 }
 
-app.UseAuthentication();
 app.UseAuthorization();
 app.UseHttpsRedirection();
 

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

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DamageAssesment.Api.Documents\DamageAssesment.Api.DocuLinks.csproj" />
+    <ProjectReference Include="..\DamageAssesment.Api.Documents\DamageAssesment.Api.Documents.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.GetdocumentsByLinkAsync("forms","en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "");
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsbyFormsandLanguageAsync("", "");
 
             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.GetdocumentsByLinkAsync("forms","en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "");
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsbyFormsandLanguageAsync("", "");
 
             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.GetdocumentsByLinkAsync("forms","en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms","en");
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync();
 
             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.GetdocumentsByLinkAsync("forms", "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumnetsAsync()).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("forms","en");
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync();
 
             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,"forms","en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(1)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1, "forms", "en");
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1);
 
             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, "forms", "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(99)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.GetDocumentAsync(99, "forms", "en");
+            var result = (NotFoundResult)await DocumentProvider.GetDocumentAsync(99);
             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(1,mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1,DocumentResponse);
+            var result = (NoContentResult)await DocumentProvider.UpdateDocument(DocumentResponse);
 
-            Assert.Equal(404, result.StatusCode);
+            Assert.Equal(204, 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(99,mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99,null);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(null);
             Assert.Equal(400, result.StatusCode);
         }
 

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

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

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

@@ -2,12 +2,12 @@
 using DamageAssesment.Api.Documents.Interfaces;
 using DamageAssesment.Api.Documents.Models;
 using DamageAssesment.Api.Documents.Providers;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Documents.Controllers
 {
+    [Route("api")]
     [ApiController]
     public class DocumentsController : ControllerBase
     {
@@ -21,104 +21,14 @@ namespace DamageAssesment.Api.Documents.Controllers
             this.uploadService = uploadService; 
 
         }
-        /// <summary>
-        /// Get all document link type.
-        /// </summary>
-        [HttpGet]
-        [Authorize(Roles = "admin")]
-        [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>
-        [Authorize(Roles = "admin")]
-        [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>
-        [Authorize(Roles = "admin")]
-        [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.
+        /// Get all documnets.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPost]
-        [Route("doculinks/types")]
-        public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
+        [HttpGet("{language}/{LinkType}/documents")]
+        public async Task<IActionResult> GetDocumentsbyFormsandLanguageAsync(string language,string 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>
-        [Authorize(Roles = "admin")]
-        [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>
-        
-        [Authorize(Roles = "admin")]
-        [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);
+            var result = await this.documentsProvider.GetDocumnetsByLinkAsync(language, LinkType);
             if (result.IsSuccess)
             {
                 return Ok(result.documents);
@@ -126,33 +36,39 @@ namespace DamageAssesment.Api.Documents.Controllers
             return NoContent();
         }
         /// <summary>
-        /// Get all documents.
+        /// Get all documnets.
         /// </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();
-        //}
+        [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 document by id.
+        /// Get a documnet by id.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [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)
+        [HttpGet("documents/{id}")]
+        public async Task<IActionResult> GetDocumentAsync(int id)
         {
-            var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
+            var result = await this.documentsProvider.GetDocumentAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Document);
@@ -162,34 +78,30 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// <summary>
         /// Upload new document.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPut]
-        [Route("doculinks/{id}")]
-        public async Task<IActionResult> UpdateDocument(int id,DocumentInfo documentInfo)
+        [HttpPut("documents")]
+        public async Task<IActionResult> UpdateDocument(DocumentInfo documentInfo)
         {
             if (documentInfo != null)
             {
-                var dbdoc = await this.documentsProvider.GetDocumentByidAsync(id);
+                var dbdoc = await this.documentsProvider.GetDocumentAsync(documentInfo.Id);
                 if (dbdoc.IsSuccess)
                 {
                     Models.Document document = uploadService.UpdateDocuments(dbdoc.Document, documentInfo);
-                    var result = await this.documentsProvider.UpdateDocumentAsync(id,document);
+                    var result = await this.documentsProvider.UpdateDocumentAsync(document);
                     if (result.IsSuccess)
                     {
                         return Ok(result.Document);
                     }
                     return NoContent();
                 }
-                return NotFound();
+                return NoContent();
             }
             return BadRequest(documentInfo);
         }
         /// <summary>
         /// update existing document.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPost]
-        [Route("doculinks")]
+        [HttpPost("documents")]
         public async Task<IActionResult> CreateDocument(DocumentInfo documentInfo)
         {
             try
@@ -213,11 +125,9 @@ namespace DamageAssesment.Api.Documents.Controllers
             }
         }
         /// <summary>
-        /// Delete document by id.
+        /// Delete documnet by id.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpDelete]
-        [Route("doculinks/{id}")]
+        [HttpDelete("documents/{id}")]
         public async Task<IActionResult> DeleteDocument(int id)
         {
             // database soft delete
@@ -230,6 +140,83 @@ 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/DASA_Documents/Active/Document_1.txt

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

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

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

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

@@ -9,7 +9,6 @@ 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,13 +4,12 @@ namespace DamageAssesment.Api.Documents.Interfaces
 {
     public interface IDocumentsProvider : ILinkTypesProvider
     {
-        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, 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, int counter, string message)> GetDocumentCounter();
 
 

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

@@ -2,17 +2,7 @@
 
 namespace DamageAssesment.Api.Documents.Models
 {
-    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 class Document
     {
         public int Id { get; set; }
 
@@ -24,5 +14,6 @@ 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,8 +6,6 @@ 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,73 +2,15 @@ using DamageAssesment.Api.Documents.Db;
 using DamageAssesment.Api.Documents.Interfaces;
 using DamageAssesment.Api.Documents.Providers;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.IdentityModel.Tokens;
-using System.Reflection;
-using System.Text;
-using Microsoft.OpenApi.Models;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(item =>
-{
-    item.RequireHttpsMetadata = true;
-    item.SaveToken = true;
-    item.TokenValidationParameters = new TokenValidationParameters()
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        ClockSkew = TimeSpan.Zero
-    };
-});
+
 builder.Services.AddControllers();
-builder.Services.AddSwaggerGen(options =>
-{
-    // Include XML comments from your assembly
-    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
-    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
-
-    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
-    {
-        Name = "Bearer",
-        BearerFormat = "JWT",
-        Scheme = "bearer",
-        Description = "Specify the authorization token.",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.Http,
-    };
-
-    options.AddSecurityDefinition("jwt_auth", securityDefinition);
-
-    // Make sure swagger UI requires a Bearer token specified
-    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
-    {
-        Reference = new OpenApiReference()
-        {
-            Id = "jwt_auth",
-            Type = ReferenceType.SecurityScheme
-        }
-    };
-
-    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
-    {
-        {securityScheme, new string[] { }},
-    };
-
-    options.AddSecurityRequirement(securityRequirements);
-});
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-//builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen();
 builder.Services.AddScoped<IDocumentsProvider, documentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
@@ -86,7 +28,6 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
-app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -14,7 +14,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5136",
+      "applicationUrl": "http://localhost:5133",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

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

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

DamageAssesmentApi/DamageAssesment.Api.Documents/appsettings.json

@@ -6,12 +6,8 @@
     }
   },
   "AllowedHosts": "*",
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
-  },
   "Fileupload": {
     "folderpath": "DASA_Documents/Active",
     "Deletepath": "DASA_Documents/Deleted"
   }
 }
-

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

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

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

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

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

@@ -1,10 +1,10 @@
 using DamageAssesment.Api.Employees.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Employees.Controllers
 {
+    //[Route("api")]
     [ApiController]
     public class EmployeesController : ControllerBase
     {
@@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// <summary>
         /// GET request for retrieving employees.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpGet("Employees")]
         public async Task<ActionResult> GetEmployeesAsync()
         {
@@ -36,12 +36,12 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// <summary>
         /// GET request for retrieving an employee by ID.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpGet("Employees/{id}")]
-        public async Task<ActionResult> GetEmployeeByIdAsync(int id)
+        
+        [HttpGet("Employees/{Id}")]
+        public async Task<ActionResult> GetEmployeeByIdAsync(string Id)
         {
 
-            var result = await EmployeeProvider.GetEmployeeByIdAsync(id);
+            var result = await EmployeeProvider.GetEmployeeByIdAsync(Id);
             if (result.IsSuccess)
             {
                 return Ok(result.Employee);
@@ -49,18 +49,17 @@ namespace DamageAssesment.Api.Employees.Controllers
             return NotFound();
 
         }
-
+   
         /// <summary>
         /// PUT request for updating an existing employee.
         /// </summary>
         /// <param name="Employee">The updated employee object.</param>
-        [Authorize(Roles = "admin")]
-        [HttpPut("Employees/{id}")]
-        public async Task<IActionResult> UpdateEmployee(int id, Models.Employee Employee)
+        [HttpPut("Employees")]
+        public async Task<IActionResult> UpdateEmployee(string Id, Models.Employee Employee)
         {
             if (Employee != null)
             {
-                var result = await this.EmployeeProvider.UpdateEmployeeAsync(id,Employee);
+                var result = await this.EmployeeProvider.UpdateEmployeeAsync(Id,Employee);
                 if (result.IsSuccess)
                 {
                     return Ok(result.Employee);
@@ -77,7 +76,6 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// POST request for creating a new employee.
         /// </summary>
         /// <param name="Employee">The employee information for creating a new employee.</param>
-        [Authorize(Roles = "admin")]
         [HttpPost("Employees")]
         public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
         {
@@ -90,15 +88,14 @@ namespace DamageAssesment.Api.Employees.Controllers
                 }
                 return BadRequest(result.ErrorMessage);
             }
-            return CreatedAtRoute("DefaultApi", new { Id = Employee.Id }, Employee);
+            return CreatedAtRoute("DefaultApi", new { id = Employee.Id }, Employee);
         }
         /// <summary>
         /// DELETE request for deleting an existing employee.
         /// </summary>
         /// <param name="id">The ID of the employee to be deleted.</param>
-        [Authorize(Roles = "admin")]
         [HttpDelete("Employees/{id}")]
-        public async Task<IActionResult> DeleteEmployee(int id)
+        public async Task<IActionResult> DeleteEmployee(string id)
         {
             var result = await this.EmployeeProvider.DeleteEmployeeAsync(id);
             if (result.IsSuccess)

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

@@ -5,6 +5,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,6 +14,7 @@
     <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/Employee.cs

@@ -5,9 +5,7 @@ namespace DamageAssesment.Api.Employees.Db
     public class Employee
     {
         [Key]
-        public int Id { get; set; }
-        [StringLength(50)]
-        public string EmployeeCode { get; set; }
+        public string Id { get; set; }
 
         [StringLength(50)]
         public string Name { get; set; }
@@ -19,7 +17,7 @@ namespace DamageAssesment.Api.Employees.Db
 
         [StringLength(50)]
         public string Email { get; set; }
-        public bool IsActive { get; set; }
+        public bool IsActive {get;set;}
         public string? PreferredLanguage { get; set; } = "en";
     }
 }

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile

@@ -0,0 +1,39 @@
+#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

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -1,74 +1,23 @@
 using DamageAssesment.Api.Employees.Db;
 using DamageAssesment.Api.Employees.Interfaces;
 using DamageAssesment.Api.Employees.Providers;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.OpenApi.Models;
 using System.Reflection;
-using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(item =>
-{
-    item.RequireHttpsMetadata = true;
-    item.SaveToken = true;
-    item.TokenValidationParameters = new TokenValidationParameters()
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        ClockSkew = TimeSpan.Zero
-    };
-});
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-builder.Services.AddSwaggerGen(options =>
+builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
-
-    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
-    {
-        Name = "Bearer",
-        BearerFormat = "JWT",
-        Scheme = "bearer",
-        Description = "Specify the authorization token.",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.Http,
-    };
-
-    options.AddSecurityDefinition("jwt_auth", securityDefinition);
-
-    // Make sure swagger UI requires a Bearer token specified
-    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
-    {
-        Reference = new OpenApiReference()
-        {
-            Id = "jwt_auth",
-            Type = ReferenceType.SecurityScheme
-        }
-    };
-
-    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
-    {
-        {securityScheme, new string[] { }},
-    };
-
-    options.AddSecurityRequirement(securityRequirements);
+    c.IncludeXmlComments(xmlPath);
 });
 
 builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
@@ -83,18 +32,23 @@ var app = builder.Build();
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
-    app.UseSwagger();
-    app.UseSwaggerUI();
-
     using (var serviceScope = app.Services.CreateScope())
     {
         var services = serviceScope.ServiceProvider;
-        var employeesProvider = services.GetRequiredService<IEmployeesProvider>();
-        employeesProvider.SeedData();
+        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.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,23 +1,14 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "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"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5135"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -26,6 +17,21 @@
       "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,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:14425",
+      "sslPort": 0
     }
   }
-}
+}

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

@@ -8,5 +8,10 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+  "settings": {
+    "endpoint1": "xxx",
+    "endpoint2": "xxx",
+    "endpoint3": "xxx"
+  }
 }

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

@@ -40,11 +40,11 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task GetLocationsByIdAsync_ShouldReturnStatusCode200()
         {
             var mockLocationService = new Mock<ILocationsProvider>();
-            var mockResponse = await MockData.getOkResponseLocation(1);
-            mockLocationService.Setup(service => service.GetLocationByIdAsync(1)).ReturnsAsync(mockResponse);
+            var mockResponse = await MockData.getOkResponseLocation("Loc1");
+            mockLocationService.Setup(service => service.GetLocationByIdAsync("Loc1")).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (OkObjectResult)await locationProvider.GetLocationByIdAsync(1);
+            var result = (OkObjectResult)await locationProvider.GetLocationByIdAsync("Loc1");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -55,10 +55,10 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocationNotFoundResponse();
-            mockLocationService.Setup(service => service.GetLocationByIdAsync(1)).ReturnsAsync(mockResponse);
+            mockLocationService.Setup(service => service.GetLocationByIdAsync("Loc1")).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (NotFoundResult)await locationProvider.GetLocationByIdAsync(1);
+            var result = (NotFoundResult)await locationProvider.GetLocationByIdAsync("Loc1");
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -68,8 +68,8 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task PostLocationAsync_ShouldReturnStatusCode200()
         {
             var mockLocationService = new Mock<ILocationsProvider>();
-            var mockResponse = await MockData.getOkResponseLocation(1);
-            var mockInputLocation = new Models.Location { Id = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            var mockResponse = await MockData.getOkResponseLocation("Loc1");
+            var mockInputLocation = new Models.Location { Id = "Loc1", RegionId = "R1", Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
             mockLocationService.Setup(service => service.PostLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
@@ -83,11 +83,11 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocationNotFoundResponse();
-            var mockInputLocation = new Models.Location { Id = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            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 = (BadRequestObjectResult)await locationProvider.CreateLocation(mockInputLocation);
+            var result = (BadRequestResult)await locationProvider.CreateLocation(mockInputLocation);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -98,11 +98,11 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocation(true, "update success");
-            var mockInputLocation = new Models.Location { Id = 1, LocationCode ="Loc1", RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
-            mockLocationService.Setup(service => service.UpdateLocationAsync(1,mockInputLocation)).ReturnsAsync(mockResponse);
+            var 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(1,mockInputLocation);
+            var result = (OkObjectResult)await locationProvider.UpdateLocation(mockInputLocation);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -112,11 +112,11 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocation(false, null);
-            var mockInputLocation = new Models.Location { Id = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
-            mockLocationService.Setup(service => service.UpdateLocationAsync(1,mockInputLocation)).ReturnsAsync(mockResponse);
+            var 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(1,mockInputLocation);
+            var result = (NotFoundResult)await locationProvider.UpdateLocation(mockInputLocation);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -127,10 +127,10 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocation(true, "delete success");
-            mockLocationService.Setup(service => service.DeleteLocationAsync(1)).ReturnsAsync(mockResponse);
+            mockLocationService.Setup(service => service.DeleteLocationAsync("Loc1")).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (OkObjectResult)await locationProvider.DeleteLocation(1);
+            var result = (OkObjectResult)await locationProvider.DeleteLocation("Loc1");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -140,10 +140,10 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockLocationService = new Mock<ILocationsProvider>();
             var mockResponse = await MockData.getLocation(false, null);
-            mockLocationService.Setup(service => service.DeleteLocationAsync(1)).ReturnsAsync(mockResponse);
+            mockLocationService.Setup(service => service.DeleteLocationAsync("Loc1")).ReturnsAsync(mockResponse);
 
             var locationProvider = new LocationsController(mockLocationService.Object);
-            var result = (NotFoundResult)await locationProvider.DeleteLocation(1);
+            var result = (NotFoundResult)await locationProvider.DeleteLocation("Loc1");
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -180,11 +180,11 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task GetRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
-            mockRegionService.Setup(service => service.GetRegionByIdAsync(1)).ReturnsAsync(mockResponse);
+            var mockResponse = await MockData.getOkResponse("1");
+            mockRegionService.Setup(service => service.GetRegionByIdAsync("1")).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.GetRegionAsync(1);
+            var result = (OkObjectResult)await regionProvider.GetRegionAsync("1");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -194,10 +194,10 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockRegionService.Setup(service => service.GetRegionByIdAsync(99999)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.GetRegionByIdAsync("99")).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundResult)await regionProvider.GetRegionAsync(99);
+            var result = (NotFoundResult)await regionProvider.GetRegionAsync("99");
             Assert.Equal(404, result.StatusCode);
         }
 
@@ -205,7 +205,7 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task PostRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("1");
             var mockInputRegion = await MockData.getInputRegionData();
             mockRegionService.Setup(service => service.PostRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
 
@@ -233,12 +233,12 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task PutRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("1");
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(1,mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.PutRegionAsync(1,mockInputRegion);
+            var result = (OkObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -249,10 +249,10 @@ namespace DamageAssesment.Api.Locations.Test
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(1, mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundObjectResult)await regionProvider.PutRegionAsync(1,mockInputRegion);
+            var result = (NotFoundObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -263,10 +263,10 @@ namespace DamageAssesment.Api.Locations.Test
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(1, mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (BadRequestObjectResult)await regionProvider.PutRegionAsync(1, mockInputRegion);
+            var result = (BadRequestObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -275,12 +275,12 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task DeleteRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse(1);
+            var mockResponse = await MockData.getOkResponse("1");
 
-            mockRegionService.Setup(service => service.DeleteRegionAsync(1)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.DeleteRegionAsync("1")).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.DeleteRegionAsync(1);
+            var result = (OkObjectResult)await regionProvider.DeleteRegionAsync("1");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -291,10 +291,10 @@ namespace DamageAssesment.Api.Locations.Test
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
 
-            mockRegionService.Setup(service => service.DeleteRegionAsync(1)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.DeleteRegionAsync("1")).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundResult)await regionProvider.DeleteRegionAsync(1);
+            var result = (NotFoundResult)await regionProvider.DeleteRegionAsync("1");
 
             Assert.Equal(404, result.StatusCode);
         }

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

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

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

@@ -1,14 +1,16 @@
 using DamageAssesment.Api.Locations.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Locations.Controllers
 {
+    [Route("Locations")]
+    //[Route("[controller]")]
     [ApiController]
     public class LocationsController : ControllerBase
     {
         private ILocationsProvider LocationProvider;
+
         public LocationsController(ILocationsProvider LocationsProvider)
         {
             this.LocationProvider = LocationsProvider;
@@ -16,25 +18,26 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// Get all locations.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpGet("Locations")]
+
+        //[HttpGet("locations")]
+        [HttpGet]
         public async Task<ActionResult> GetLocationsAsync()
         {
 
             var result = await LocationProvider.GetLocationsAsync();
             if (result.IsSuccess)
             {
-                return Ok(result.Locations);
+                return Ok(result.locations);
             }
-            return NoContent();
+            return NotFound();
 
         }
         /// <summary>
         /// Get all locations based on locationdId.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpGet("Locations/{id}")]
-        public async Task<ActionResult> GetLocationByIdAsync(int id)
+
+        [HttpGet("{id}")]
+        public async Task<ActionResult> GetLocationByIdAsync(string id)
         {
 
             var result = await LocationProvider.GetLocationByIdAsync(id);
@@ -48,16 +51,16 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// Update a Location.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPut("Locations/{id}")]
-        public async Task<IActionResult> UpdateLocation(int id, Models.Location Location)
+
+        [HttpPut("{locations}")]
+        public async Task<IActionResult> UpdateLocation(Models.Location location)
         {
-            if (Location != null)
+            if (location != null)
             {
-                var result = await this.LocationProvider.UpdateLocationAsync(id, Location);
+                var result = await this.LocationProvider.UpdateLocationAsync(location);
                 if (result.IsSuccess)
                 {
-                    return Ok(result.Location);
+                    return Ok(result.ErrorMessage);
                 }
                 return NotFound();
             }
@@ -66,8 +69,8 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// Save a new location.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPost("Locations")]
+
+        [HttpPost("{locations}")]
         public async Task<IActionResult> CreateLocation(Models.Location Location)
         {
             if (Location != null)
@@ -75,23 +78,23 @@ namespace DamageAssesment.Api.Locations.Controllers
                 var result = await this.LocationProvider.PostLocationAsync(Location);
                 if (result.IsSuccess)
                 {
-                    return Ok(result.Location);
+                    return Ok(result.Question);
                 }
-                return BadRequest(result.ErrorMessage);
+                return NotFound();
             }
-            return BadRequest();
+            return CreatedAtRoute("DefaultApi", new { id = Location.Id }, Location);
         }
         /// <summary>
         /// Delete an existing location.
         /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpDelete("Locations/{id}")]
-        public async Task<IActionResult> DeleteLocation(int id)
+
+        [HttpDelete("{id}")]
+        public async Task<IActionResult> DeleteLocation(string id)
         {
             var result = await this.LocationProvider.DeleteLocationAsync(id);
             if (result.IsSuccess)
             {
-                return Ok(result.Location);
+                return Ok(result.ErrorMessage);
             }
             return NotFound();
         }

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

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

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

@@ -5,6 +5,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,6 +14,7 @@
     <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/Db/Location.cs

@@ -6,20 +6,18 @@ namespace DamageAssesment.Api.Locations.Db
     public class Location
     {
         [Key]
-        public int Id { get; set; }
-        [ForeignKey("Region")]
-        public int RegionId { get; set; }
         [StringLength(4)]
-        public string LocationCode { get; set; }
+        public string Id { get; set; }
 
         [StringLength(50)]
         public string Name { get; set; }
 
-        [StringLength(4)]
+        [StringLength(1)]
         public string MaintenanceCenter { get; set; }
 
         [StringLength(2)]
         public string SchoolType { get; set; }
-
+        [ForeignKey("Region")]
+        public string RegionId { get; set; }
     }
 }

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

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

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

@@ -5,12 +5,15 @@ namespace DamageAssesment.Api.Locations.Db
     public class Region
     {
         [Key]
-        public int Id { get; set; }
-  
+        [StringLength(2)]
+        public string Id { get; set; }
+
         [StringLength(50)]
         public string Name { get; set; }
 
         [StringLength(5)]
         public string Abbreviation { get; set; }
+
+       // public ICollection<Location> Locations { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile

@@ -0,0 +1,39 @@
+#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

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

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

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

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -1,73 +1,23 @@
 using DamageAssesment.Api.Locations.Db;
 using DamageAssesment.Api.Locations.Interfaces;
 using DamageAssesment.Api.Locations.Providers;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.OpenApi.Models;
 using System.Reflection;
-using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(item =>
-{
-    item.RequireHttpsMetadata = true;
-    item.SaveToken = true;
-    item.TokenValidationParameters = new TokenValidationParameters()
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        ClockSkew = TimeSpan.Zero
-    };
-});
+
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-builder.Services.AddSwaggerGen(options =>
+builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
-
-    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
-    {
-        Name = "Bearer",
-        BearerFormat = "JWT",
-        Scheme = "bearer",
-        Description = "Specify the authorization token.",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.Http,
-    };
-
-    options.AddSecurityDefinition("jwt_auth", securityDefinition);
-
-    // Make sure swagger UI requires a Bearer token specified
-    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
-    {
-        Reference = new OpenApiReference()
-        {
-            Id = "jwt_auth",
-            Type = ReferenceType.SecurityScheme
-        }
-    };
-
-    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
-    {
-        {securityScheme, new string[] { }},
-    };
-
-    options.AddSecurityRequirement(securityRequirements);
+    c.IncludeXmlComments(xmlPath);
 });
 builder.Services.AddScoped<ILocationsProvider, LocationsProvider>();
 builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
@@ -76,17 +26,11 @@ builder.Services.AddDbContext<LocationDbContext>(option =>
 {
     option.UseInMemoryDatabase("Locations");
 });
-
-
 var app = builder.Build();
-// Add services to the container.
 
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
-    app.UseSwagger();
-    app.UseSwaggerUI();
-
     using (var serviceScope = app.Services.CreateScope())
     {
         var services = serviceScope.ServiceProvider;
@@ -95,9 +39,19 @@ if (app.Environment.IsDevelopment())
         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.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,23 +1,14 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "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"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5213"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -26,6 +17,21 @@
       "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,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:20458",
+      "sslPort": 0
     }
   }
-}
+}

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

@@ -20,16 +20,17 @@ namespace DamageAssesment.Api.Locations.Providers
             //SeedData();
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Location> Locations, string ErrorMessage)> GetLocationsAsync()
+        public async Task<(bool IsSuccess, IEnumerable<Models.Location> locations, string ErrorMessage)> GetLocationsAsync()
         {
+
             try
             {
-                logger?.LogInformation("Query Location");
-                var locations = await locationDbContext.Locations.AsNoTracking().ToListAsync();
-                if (locations != null)
+                logger?.LogInformation("Query Question");
+                var Location = await locationDbContext.Locations.AsNoTracking().ToListAsync();
+                if (Location != null)
                 {
-                    logger?.LogInformation($"{locations.Count} Locations(s) found");
-                    var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(locations);
+                    logger?.LogInformation($"{Location.Count} Locations(s) found");
+                    var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(Location);
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -39,18 +40,19 @@ namespace DamageAssesment.Api.Locations.Providers
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
+
         }
 
-        public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> GetLocationByIdAsync(int Id)
+        public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> GetLocationByIdAsync(string Id)
         {
             try
             {
                 logger?.LogInformation("Query Location");
-                var location = await locationDbContext.Locations.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
-                if (location != null)
+                var Location = await locationDbContext.Locations.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                if (Location != null)
                 {
-                    logger?.LogInformation($"{location}  found");
-                    var result = mapper.Map<Db.Location, Models.Location>(location);
+                    logger?.LogInformation($"{Location} customer(s) found");
+                    var result = mapper.Map<Db.Location, Models.Location>(Location);
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -61,21 +63,21 @@ namespace DamageAssesment.Api.Locations.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> PostLocationAsync(Models.Location location)
+        public async Task<(bool IsSuccess, Models.Location Question, string ErrorMessage)> PostLocationAsync(Models.Location Location)
         {
             try
             {
-                if (!LocationCodeExists(location.LocationCode))
+                logger?.LogInformation("Query Location");
+                if (!LocationExists(Location.Id))
                 {
-                    Db.Location _location = mapper.Map<Models.Location, Db.Location>(location);
+                    Db.Location _location = mapper.Map<Models.Location, Db.Location>(Location);
                     locationDbContext.Locations.Add(_location);
-                    await locationDbContext.SaveChangesAsync();
-                    location.Id = _location.Id;
-                    return (true, location, null);
+                    locationDbContext.SaveChanges();
+                    return (true, Location, null);
                 }
                 else
                 {
-                    return (false, null, "Location code is already exists");
+                    return (false, null, "Location is Already exists");
                 }
             }
             catch (Exception ex)
@@ -84,67 +86,57 @@ namespace DamageAssesment.Api.Locations.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> UpdateLocationAsync(int Id, Models.Location location)
+        public async Task<(bool IsSuccess, string ErrorMessage)> UpdateLocationAsync(Models.Location Location)
         {
             try
             {
-                if (LocationExists(Id))
-                {
-                    Db.Location _location = mapper.Map<Models.Location, Db.Location>(location);
-                    locationDbContext.Entry(_location).State = EntityState.Modified;
-                    await locationDbContext.SaveChangesAsync();
-                    return (true, location, "Record updated successfully");
-                }
-                else
-                {
-                    return (false, null, "Location is not exists");
-                }
+                Db.Location _location = mapper.Map<Models.Location, Db.Location>(Location);
+                locationDbContext.Entry(_location).State = EntityState.Modified;
+                locationDbContext.SaveChanges();
+                return (true, "Record updated successfully");
             }
             catch (Exception ex)
             {
+
                 logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
+                return (false, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> DeleteLocationAsync(int Id)
+        public async Task<(bool IsSuccess, string ErrorMessage)> DeleteLocationAsync(string Id)
         {
             try
             {
-                Db.Location location = locationDbContext.Locations.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
-                if (location == null)
+                Db.Location Location = locationDbContext.Locations.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
+                if (Location == null)
                 {
-                    return (false, null, "record not found");
+                    return (false, "record not found");
                 }
-                locationDbContext.Locations.Remove(location);
-                await locationDbContext.SaveChangesAsync();
-                return (true, mapper.Map<Db.Location, Models.Location>(location), "Record deleted successfully");
+                locationDbContext.Locations.Remove(Location);
+                locationDbContext.SaveChanges();
+                return (true, "Record deleted successfully");
             }
             catch (Exception ex)
             {
+
                 logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
+                return (false, ex.Message);
             }
         }
 
-        private bool LocationExists(int id)
+        private bool LocationExists(string id)
         {
             return locationDbContext.Locations.AsNoTracking().Count(e => e.Id == id) > 0;
         }
-
-        private bool LocationCodeExists(string locationCode)
-        {
-            return locationDbContext.Locations.AsNoTracking().Count(e => e.LocationCode.ToLower() == locationCode.ToLower()) > 0;
-        }
         public void SeedData()
         {
             if (!locationDbContext.Locations.Any())
             {
-                locationDbContext.Locations.Add(new Db.Location() { Id = 1, LocationCode = "Loc1", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 1", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = 2, LocationCode = "Loc2", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 2", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = 3, LocationCode = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = 4, LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = 6, LocationCode = "Loc6", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc1", RegionId = "1", Name = "BOB GRAHAM EDUCATION CENTER 1", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc2", RegionId = "2", Name = "BOB GRAHAM EDUCATION CENTER 2", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc3", RegionId = "3", Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc4", RegionId = "1", Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc5", RegionId = "2", Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc6", RegionId = "3", Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
                 locationDbContext.SaveChanges();
             }
 

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

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

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

@@ -1,9 +1,9 @@
 using DamageAssesment.Api.Questions.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
 {
+    //[Route("api")]
     [ApiController]
     public class QuestionsController : ControllerBase
     {
@@ -11,20 +11,22 @@ namespace DamageAssesment.Api.Questions.Controllers
 
         public QuestionsController(IQuestionsProvider questionsProvider)
         {
+
             this.questionsProvider = questionsProvider;
+
         }
+
         /// <summary>
-        /// GET request for retrieving questions.
+        /// GET request for retrieving questions, e.g api/fr/Questions (default returns all language). 
         /// </summary>
 
-        //get all questions
-        [Authorize(Roles = "admin,survey,user,report")]
+        // get all questions
+        [Route("{Language}/Questions")]
         [Route("Questions")]
-        [Route("Questions/{language:alpha}")]
         [HttpGet]
-        public async Task<IActionResult> GetQuestionsAsync(string? language)
+        public async Task<IActionResult> GetQuestionsAsync(string? Language)
         {
-            var result = await this.questionsProvider.GetQuestionsAsync(language);
+            var result = await this.questionsProvider.GetQuestionsAsync(Language);
             if (result.IsSuccess)
             {
                 return Ok(result.Questions);
@@ -36,13 +38,12 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// GET request for retrieving a question by ID.
         /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [Route("Questions/{id}/{language:alpha}")]
-        [Route("Questions/{id:int}")]
+        [Route("{Language}/Questions/{id}")]
+        [Route("Questions/{id}")]
         [HttpGet]
-        public async Task<IActionResult> GetQuestionByIdAsync(int id, string? language)
+        public async Task<IActionResult> GetQuestionAsync(int id, string? Language)
         {
-            var result = await this.questionsProvider.GetQuestionAsync(id, language);
+            var result = await this.questionsProvider.GetQuestionAsync(id,Language);
             if (result.IsSuccess)
             {
                 return Ok(result.Question);
@@ -55,13 +56,12 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving survey questions based on a survey ID.
         /// Uri: {Optional language}/GetSurveyQuestions/{surveyId} :Default returns question in all languages 
         /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [Route("Questions/BySurvey/{surveyId:int}")]
-        [Route("Questions/BySurvey/{surveyId:int}/{language:alpha}")]
+        [Route("{Language}/GetSurveyQuestions/{surveyId}")]
+        [Route("GetSurveyQuestions/{surveyId}")]
         [HttpGet]
-        public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? language)
+        public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? Language)
         {
-            var result = await this.questionsProvider.GetSurveyQuestionAsync(surveyId, language);
+            var result = await this.questionsProvider.GetSurveyQuestionAsync(surveyId, Language);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyQuestions);
@@ -72,7 +72,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// PUT request for updating a question (multilingual).
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpPut("Questions")]
         public async Task<IActionResult> UpdateQuestion(Models.Question question)
         {
@@ -94,7 +93,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question (multilingual).
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpPost("Questions")]
         public async Task<IActionResult> CreateQuestion(Models.Question question)
         {
@@ -113,7 +111,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question based on ID.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpDelete("Questions/{id}")]
         public async Task<IActionResult> DeleteQuestion(int id)
         {
@@ -129,12 +126,10 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving question categories.
         /// </summary>
 
-        [Authorize(Roles = "admin,user,report")]
-        [HttpGet("Questions/Categories")]
-        [HttpGet("Questions/Categories/{language:alpha}")]
-        public async Task<IActionResult> GetQuestionCategoriesAsync(string? language)
+        [HttpGet("QuestionCategories")]
+        public async Task<IActionResult> GetQuestionCategoriesAsync()
         {
-            var result = await this.questionsProvider.GetQuestionCategoriesAsync(language);
+            var result = await this.questionsProvider.GetQuestionCategoriesAsync();
             if (result.IsSuccess)
             {
                 return Ok(result.QuestionCategories);
@@ -144,12 +139,11 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// GET request for retrieving a question category by ID.
         /// </summary>
-        [Authorize(Roles = "admin,report")]
-        [HttpGet("Questions/Categories/{id:int}")]
-        [HttpGet("Questions/Categories/{id:int}/{language:alpha}")]
-        public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language)
+
+        [HttpGet("QuestionCategories/{id}")]
+        public async Task<IActionResult> GetQuestionCategoryAsync(int id)
         {
-            var result = await this.questionsProvider.GetQuestionCategoryAsync(id, language);
+            var result = await this.questionsProvider.GetQuestionCategoryAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.QuestionCategory);
@@ -161,8 +155,8 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// PUT request for updating a question category.
         /// </summary>
-        [Authorize(Roles = "admin,survey,report")]
-        [HttpPut("Questions/Categories")]
+
+        [HttpPut("QuestionCategories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -183,8 +177,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question category.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
-        [HttpPost("Questions/Categories")]
+        [HttpPost("QuestionCategories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -202,8 +195,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question category based on ID.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
-        [HttpDelete("Questions/Categories/{id}")]
+        [HttpDelete("QuestionCategories/{id}")]
         public async Task<IActionResult> DeleteQuestionCategory(int id)
         {
             var result = await this.questionsProvider.DeleteQuestionCategoryAsync(id);

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

@@ -5,6 +5,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,6 +14,7 @@
     <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/CategoryTranslation.cs

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

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

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

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

@@ -10,7 +10,6 @@ namespace DamageAssesment.Api.Questions.Db
         public DbSet<Db.QuestionType> QuestionTypes { get; set; }
         public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; }
         public DbSet<Db.QuestionCategory> QuestionCategories { get; set; }
-        public DbSet<Db.CategoryTranslation> CategoryTranslations { get; set; }
         public QuestionDbContext(DbContextOptions options) : base(options)
         {
 
@@ -30,9 +29,6 @@ namespace DamageAssesment.Api.Questions.Db
             modelBuilder.Entity<QuestionCategory>()
                 .Property(item => item.Id)
                 .ValueGeneratedOnAdd();
-            modelBuilder.Entity<CategoryTranslation>()
-                .Property(item => item.Id)
-                .ValueGeneratedOnAdd();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile

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

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

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

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

@@ -1,18 +1,23 @@
-namespace DamageAssesment.Api.Questions.Models
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Questions.Models
 {
-     public class Question: BaseQuestion
-    {
-        public List<QuestionsTranslation> Questions { get; set; }
-    }
-    public class BaseQuestion
+    public class Question
     {
         public int Id { get; set; }
+        public List<QuestionsTranslation> Questions { get; set; }
+
+        //public int QuestionTypeID { get; set; }
+
         public string TypeText { get; set; } = string.Empty;
+
         public int QuestionNumber { get; set; }
         public bool IsRequired { get; set; }
         public bool Comment { get; set; }
+
         public bool Key { get; set; }
-        public int SurveyId { get; set; }
+        public int? SurveyId { get; set; }
         public int CategoryId { get; set; }
+        // public int? Survey_SurveyID { get; set; }
     }
 }

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

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

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

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

@@ -1,33 +1,12 @@
 using DamageAssesment.Api.Questions.Db;
 using DamageAssesment.Api.Questions.Interfaces;
 using DamageAssesment.Api.Questions.Providers;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
-using Microsoft.OpenApi.Models;
+using Microsoft.Extensions.Options;
 using System.Reflection;
-using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-// Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(item =>
-{
-    item.RequireHttpsMetadata = true;
-    item.SaveToken = true;
-    item.TokenValidationParameters = new TokenValidationParameters()
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        ClockSkew = TimeSpan.Zero
-    };
-});
+
 // Add services to the container.
 
 builder.Services.AddControllers();
@@ -37,43 +16,16 @@ builder.Services.AddControllers();
 builder.Services.AddScoped<IQuestionsProvider, QuestionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 
+
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-builder.Services.AddSwaggerGen(options =>
+builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
-
-    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
-    {
-        Name = "Bearer",
-        BearerFormat = "JWT",
-        Scheme = "bearer",
-        Description = "Specify the authorization token.",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.Http,
-    };
-
-    options.AddSecurityDefinition("jwt_auth", securityDefinition);
-
-    // Make sure swagger UI requires a Bearer token specified
-    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
-    {
-        Reference = new OpenApiReference()
-        {
-            Id = "jwt_auth",
-            Type = ReferenceType.SecurityScheme
-        }
-    };
-    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
-    {
-        {securityScheme, new string[] { }},
-    };
-    options.AddSecurityRequirement(securityRequirements);
+    c.IncludeXmlComments(xmlPath);
 });
-
 builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
     option.UseInMemoryDatabase("Questions");
@@ -83,17 +35,22 @@ var app = builder.Build();
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {
-    app.UseSwagger();
-    app.UseSwaggerUI();
-
     using (var serviceScope = app.Services.CreateScope())
     {
         var services = serviceScope.ServiceProvider;
         var questionProvider = services.GetRequiredService<IQuestionsProvider>();
         questionProvider.SeedData();
     }
+
+    app.UseSwagger();
+    app.UseSwaggerUI(options => {
+        //switch for local environment
+       // options.SwaggerEndpoint("/swagger/v1/swagger.json", "");
+       options.SwaggerEndpoint("/questions/swagger/v1/swagger.json", "");
+    
+    });
 }
-app.UseAuthentication();
+
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,23 +1,14 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "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"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5133"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -26,6 +17,21 @@
       "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,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:60754",
+      "sslPort": 0
     }
   }
-}
+}

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

@@ -2,7 +2,9 @@
 using DamageAssesment.Api.Questions.Db;
 using DamageAssesment.Api.Questions.Interfaces;
 using DamageAssesment.Api.Questions.Models;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace DamageAssesment.Api.Questions.Providers
 {
@@ -19,7 +21,7 @@ namespace DamageAssesment.Api.Questions.Providers
             this.questionDbContext = questionDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+           // SeedData();
         }
 
         public void SeedData()
@@ -55,89 +57,16 @@ namespace DamageAssesment.Api.Questions.Providers
 
             if (!questionDbContext.QuestionCategories.Any())
             {
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 1, IconName = "Flooding", IconLibrary= "https://example.com/images/img1.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 2, IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 3, IconName = "Structural", IconLibrary = "https://example.com/images/img3.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 4, IconName = "Utility", IconLibrary = "https://example.com/images/img4.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory()   { Id = 5, IconName = "Debris", IconLibrary = "https://example.com/images/img5.png" });
-                questionDbContext.SaveChanges();
-            }
-
-            if (!questionDbContext.CategoryTranslations.Any())
-            {
-
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 1, CategoryId = 1, Title = "Flooding", Language = "en" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 2, CategoryId = 2, Title = "Electrical", Language = "en" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 3, CategoryId = 3, Title = "Structural", Language = "en" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 4, CategoryId = 4, Title = "Utility", Language = "en" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 5, CategoryId = 5, Title = "Debris", Language = "en" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 6, CategoryId = 1, Title = "Inondation", Language = "fr" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 7, CategoryId = 2, Title = "Électrique", Language = "fr" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 8, CategoryId = 3, Title = "De construction", Language = "fr" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 9, CategoryId = 4, Title = "Utilitaire", Language = "fr" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 10, CategoryId = 5, Title = "Débris", Language = "fr" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 11, CategoryId = 1, Title = "Inundación", Language = "es" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 12, CategoryId = 2, Title = "Eléctrica", Language = "es" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 13, CategoryId = 3, Title = "Estructural", Language = "es" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 14, CategoryId = 4, Title = "Utilidad", Language = "es" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 15, CategoryId = 5, Title = "Escombros", Language = "es" });
+                questionDbContext.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.SaveChanges();
             }
         }
 
-        public List<Models.CategoryTranslation> GetCategoryTranslations(int id, string? language)
-        {
-            List<Models.CategoryTranslation> categoryTranslations = new List<Models.CategoryTranslation>();
-            if (string.IsNullOrEmpty(language))
-            {
-                categoryTranslations = mapper.Map<List<Db.CategoryTranslation>, List<Models.CategoryTranslation>>(
-                    questionDbContext.CategoryTranslations.AsNoTracking().Where(a => a.CategoryId == id).ToList());
-            }
-            else
-            {
-                categoryTranslations = mapper.Map<List<Db.CategoryTranslation>, List<Models.CategoryTranslation>>(
-                questionDbContext.CategoryTranslations.AsNoTracking().Where(a => a.CategoryId == id && a.Language == language).ToList());
-            }
-            return categoryTranslations;
-        }
-        public object CreateCategoryMultiLanguageObject(List<Models.CategoryTranslation> categoryTranslations)
-        {
-            object MultiLanguage = new object();
-            Dictionary<string, string> dict = new Dictionary<string, string>();
-            foreach (Models.CategoryTranslation item in categoryTranslations)
-            {
-                dict.Add(item.Language, item.Title);
-            }
-            MultiLanguage = dict;
-            return MultiLanguage;
-        }
-        public List<Models.QuestionsTranslation> GetQuestionsTranslations(int id, string? language)
-        {
-            List<Models.QuestionsTranslation> QuestionTranslations;
-            if (string.IsNullOrEmpty(language))
-            {
-                QuestionTranslations = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                    questionDbContext.QuestionsTranslations.AsNoTracking().Where(a => a.QuestionId == id).ToList());
-            }
-            else
-            {
-                QuestionTranslations = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
-                questionDbContext.QuestionsTranslations.AsNoTracking().Where(a => a.QuestionId == id && a.Language == language).ToList());
-            }
-            return QuestionTranslations;
-        }
-        public Dictionary<string, string> CreateMultiLanguageObject(List<Models.QuestionsTranslation> questions)
-        {
-            MultiLanguage MultiLanguage = new MultiLanguage();
-            Dictionary<string, string> dict = new Dictionary<string, string>();
-            foreach (Models.QuestionsTranslation item in questions)
-            {
-                dict.Add(item.Language, item.QuestionText);
-            }
-            //MultiLanguage.questionText = dict;
-            return dict;
-        }
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Question> Questions, string ErrorMessage)> GetQuestionsAsync(string Language)
         {
             try
             {
@@ -147,10 +76,21 @@ namespace DamageAssesment.Api.Questions.Providers
                 {
 
                     //logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.MultiLanguage>>(questions);
-                    foreach (var item in result)
+                    var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.Question>>(questions);
+
+
+                    foreach (var question in result)
                     {
-                        item.Text = CreateMultiLanguageObject(GetQuestionsTranslations(item.Id, language));
+                        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());
+                        }
                     }
                     return (true, result, null);
                 }
@@ -162,17 +102,27 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> GetQuestionAsync(int id, string language)
+        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> GetQuestionAsync(int Id, string Language)
         {
             try
             {
                 logger?.LogInformation("Query Question");
-                var question = await questionDbContext.Questions.Include("QuestionType").AsNoTracking().FirstOrDefaultAsync(q => q.Id == id);
+                var question = await questionDbContext.Questions.Include("QuestionType").AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
                 if (question != null)
                 {
                     logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);                    
-                    result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(id, language));
+                    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());
+                    }
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -183,15 +133,27 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public List<Models.MultiLanguage> GetSurveyQuestion(List<Models.MultiLanguage> questions, string language)
+        public List<Models.Question> GetSurveyQuestion(List<Models.Question> questions, string Language)
         {
-            foreach (var item in questions)
+            if (string.IsNullOrEmpty(Language))
             {
-                item.Text = CreateMultiLanguageObject(GetQuestionsTranslations(item.Id, language));
+                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());
+                }
             }
             return questions;
         }
-        public async Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int SurveyId, string language)
+        public async Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int SurveyId, string Language)
         {
             try
             {
@@ -208,9 +170,9 @@ namespace DamageAssesment.Api.Questions.Providers
                         surveyQuestionsList.Add(new SurveyQuestions()
                         {
                             CategoryId = item.Id,
-                            IconLibrary = item.IconLibrary,
-                            IconName = item.IconName,
-                            QuestionsText = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanguage>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language)
+                            CategoryImage = item.CategoryImage,
+                            CategoryName = item.CategoryName,
+                            Questions = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.Question>>(questions.Where(a => a.CategoryId == item.Id).ToList()), Language)
                         });
                     }
 
@@ -225,7 +187,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question)
+        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question)
         {
             try
             {
@@ -238,9 +200,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
                 questionDbContext.SaveChanges();
                 Question.Id = dbquestion.Id;
-                var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
-                result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id,""));
-                return (true, result, null);
+                return (true, Question, null);
             }
             catch (Exception ex)
             {
@@ -248,7 +208,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
+        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
         {
             try
             {
@@ -262,9 +222,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
                 questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
                 questionDbContext.SaveChanges();
-                var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
-                result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
-                return (true, result, null);
+                return (true, Question, null);
             }
             catch (Exception ex)
             {
@@ -273,23 +231,21 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id)
+        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> DeleteQuestionAsync(int Id)
         {
             try
             {
-                var question = await questionDbContext.Questions.Where(x => x.Id == id).FirstOrDefaultAsync();
+                var question = await questionDbContext.Questions.Where(x => x.Id == Id).FirstOrDefaultAsync();
 
                 if (question != null)
                 {
-                    var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);
-                    result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
                     questionDbContext.Questions.Remove(question);
                     questionDbContext.SaveChanges();
-                    return (true, result, $"QuestionID {id} deleted Successfuly");
+                    return (true, mapper.Map<Db.Question, Models.Question>(question), $"QuestionID {Id} deleted Successfuly");
                 }
                 else
                 {
-                    logger?.LogInformation($"QuestionID: {id} Not found");
+                    logger?.LogInformation($"QuestionID: {Id} Not found");
                     return (false, null, "Not Found");
                 }
             }
@@ -302,7 +258,7 @@ namespace DamageAssesment.Api.Questions.Providers
 
         //Question Category Logic
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanQuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync(string? language)
+        public async Task<(bool IsSuccess, IEnumerable<Models.QuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync()
         {
             try
             {
@@ -311,11 +267,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 if (questionCategories != null)
                 {
                     //logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<IEnumerable<Db.QuestionCategory>, IEnumerable<Models.MultiLanQuestionCategory>>(questionCategories);
-                    foreach (var category in result)
-                    {
-                        category.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(category.Id, language));
-                    }
+                    var result = mapper.Map<IEnumerable<Db.QuestionCategory>, IEnumerable<Models.QuestionCategory>>(questionCategories);
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -326,17 +278,16 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int id, string? language)
+        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int Id)
         {
             try
             {
                 logger?.LogInformation("Query Question");
-                var questioncategory = await questionDbContext.QuestionCategories.AsNoTracking().FirstOrDefaultAsync(q => q.Id == id);
+                var questioncategory = await questionDbContext.QuestionCategories.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
                 if (questioncategory != null)
                 {
                     logger?.LogInformation($"{questioncategory} customer(s) found");
-                    var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(questioncategory);
-                    result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, language));
+                    var result = mapper.Map<Db.QuestionCategory, Models.QuestionCategory>(questioncategory);
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -347,23 +298,17 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
+        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
         {
             try
             {
                 logger?.LogInformation("Query Question");
                 var dbQuestionCategory = mapper.Map<Models.QuestionCategory, Db.QuestionCategory>(QuestionCategory);
-                var dbCategorytranslations = mapper.Map<List<Models.CategoryTranslation>, List<Db.CategoryTranslation>>(QuestionCategory.Categories);
                 // Question.QuestionType = GetQuestionType(Question.QuestionTypeId);
                 questionDbContext.QuestionCategories.Add(dbQuestionCategory);
                 questionDbContext.SaveChanges();
                 QuestionCategory.Id = dbQuestionCategory.Id;
-                dbCategorytranslations.ForEach(i => i.CategoryId = QuestionCategory.Id);
-                questionDbContext.CategoryTranslations.AddRange(dbCategorytranslations);
-                questionDbContext.SaveChanges();
-                var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(dbQuestionCategory);
-                result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
-                return (true, result, null);
+                return (true, QuestionCategory, null);
             }
             catch (Exception ex)
             {
@@ -371,23 +316,15 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
+        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
         {
             try
             {
                 var dbQuestionCategory = mapper.Map<Models.QuestionCategory, Db.QuestionCategory>(QuestionCategory);
-                var dbCategorytranslations = mapper.Map<List<Models.CategoryTranslation>, List<Db.CategoryTranslation>>(QuestionCategory.Categories);
                 questionDbContext.Entry(dbQuestionCategory).State = EntityState.Modified;
-                QuestionCategory.Id = dbQuestionCategory.Id;
-                var oldcategories = questionDbContext.CategoryTranslations.Where(a => a.CategoryId == dbQuestionCategory.Id).ToList();
-                if (oldcategories != null)
-                    questionDbContext.CategoryTranslations.RemoveRange(oldcategories);
-                dbCategorytranslations.ForEach(i => i.CategoryId = QuestionCategory.Id);
-                questionDbContext.CategoryTranslations.AddRange(dbCategorytranslations);
+
                 questionDbContext.SaveChanges();
-                var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(dbQuestionCategory);
-                result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
-                return (true, result, null);
+                return (true, QuestionCategory, null);
             }
             catch (Exception ex)
             {
@@ -396,20 +333,18 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id)
+        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id)
         {
             try
             {
                 var questioncategory = await questionDbContext.QuestionCategories.Where(x => x.Id == Id).FirstOrDefaultAsync();
                 if (questioncategory != null)
                 {
-                    var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(questioncategory);
-                    result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
                     var question = await questionDbContext.Questions.Where(x => x.Id == Id).ToListAsync();
                     questionDbContext.Questions.RemoveRange(question);
                     questionDbContext.QuestionCategories.Remove(questioncategory);
                     questionDbContext.SaveChanges();
-                    return (true, result, $"QuestionID {Id} deleted Successfuly");
+                    return (true, mapper.Map<Db.QuestionCategory, Models.QuestionCategory>(questioncategory), $"QuestionID {Id} deleted Successfuly");
                 }
                 else
                 {

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/CategoryMockData.cs

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

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

@@ -5,13 +5,13 @@ namespace DamageAssesment.Api.Questions.Test
     public class MockData
     {
 
-        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanguage>, string)> getOkResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.Question>, string)> getOkResponse()
         {
-            IEnumerable<Questions.Models.MultiLanguage> list = new List<Questions.Models.MultiLanguage>();
+            IEnumerable<Questions.Models.Question> list = new List<Questions.Models.Question>();
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Questions.Models.MultiLanguage { 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, CategoryId=i });
             }
             return (true, list, null);
         }
@@ -23,38 +23,38 @@ namespace DamageAssesment.Api.Questions.Test
 
             for (int i = 0; i < 10; i++)
             {
-                List<Models.MultiLanguage> question = new List<Models.MultiLanguage>();
-                question.Add(new Models.MultiLanguage { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = i });
+                List<Models.Question> question = new List<Models.Question>();
+                question.Add(new Models.Question { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = i });
                 list.Append(new Questions.Models.SurveyQuestions
                 {
                     CategoryId = i,
-                    IconLibrary = "img" + i,
-                    IconName = "Category " + i,
-                    QuestionsText = question
+                    CategoryImage = "img" + i,
+                    CategoryName = "Category " + i,
+                    Questions = question
                 });
             }
             return (true, list, null);
         }
 
-        public static async Task<(bool, Questions.Models.MultiLanguage, string)> getOkResponse(int Id)
+        public static async Task<(bool, Questions.Models.Question, string)> getOkResponse(int Id)
         {
             var Questions = await getOkResponse();
             var Question = Questions.Item2.FirstOrDefault(s => s.Id == Id);
             return (true, Question, null);
         }
 
-        public static async Task<(bool, Questions.Models.MultiLanguage, string)> getBadRequestResponse()
+        public static async Task<(bool, Questions.Models.Question, string)> getBadRequestResponse()
         {
             return (false, null, "Bad Request");
         }
 
-        public static async Task<(bool, Questions.Models.MultiLanguage, string)> getNotFoundResponse()
+        public static async Task<(bool, Questions.Models.Question, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanguage>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.Question>, string)> getNoContentResponse()
         {
-            IEnumerable<Questions.Models.MultiLanguage> list = new List<Questions.Models.MultiLanguage>();
+            IEnumerable<Questions.Models.Question> list = new List<Questions.Models.Question>();
             return (false, list, null);
         }
         public static async Task<(bool, List<Questions.Models.SurveyQuestions>, string)> getNoSurveyContentResponse()

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

@@ -42,7 +42,7 @@ namespace DamageAssesment.Api.Questions.Test
             mockQuestionService.Setup(service => service.GetQuestionAsync(1,null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionByIdAsync(1,null);
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionAsync(1,null);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -55,7 +55,7 @@ namespace DamageAssesment.Api.Questions.Test
             mockQuestionService.Setup(service => service.GetQuestionAsync(99,null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NotFoundResult)await QuestionProvider.GetQuestionByIdAsync(99,null);
+            var result = (NotFoundResult)await QuestionProvider.GetQuestionAsync(99,null);
             Assert.Equal(404, result.StatusCode);
         }
 
@@ -188,10 +188,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getOkResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync("en")).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync()).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoriesAsync("en");
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoriesAsync();
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -201,10 +201,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getNoContentResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync("en")).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync()).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NoContentResult)await QuestionProvider.GetQuestionCategoriesAsync("en");
+            var result = (NoContentResult)await QuestionProvider.GetQuestionCategoriesAsync();
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -214,10 +214,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getOkResponse(1);
-            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(1, "en")).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(1)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoryAsync(1, "en");
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoryAsync(1);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -227,10 +227,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getNotFoundResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(99, "en")).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(99)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NotFoundResult)await QuestionProvider.GetQuestionCategoryAsync(99, "en");
+            var result = (NotFoundResult)await QuestionProvider.GetQuestionCategoryAsync(99);
             Assert.Equal(404, result.StatusCode);
         }
 

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

@@ -1,12 +0,0 @@
-using DamageAssesment.Api.Responses.Models;
-
-namespace DamageAssesment.Api.Responses.Interfaces
-{
-    public interface IAnswerServiceProvider
-    {
-        Task<List<Answer>> getAnswersAsync(string token);
-        Task<List<Models.Answer>> GetAnswersByResponseIdAsync(int responseId, string token);
-
-        Task<Models.Answer> PostAnswersAsync(Models.Answer answer, string token);
-    }
-}

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

@@ -1,10 +0,0 @@
-using DamageAssesment.Api.Responses.Models;
-
-namespace DamageAssesment.Api.Responses.Interfaces
-{
-    public interface IAttachmentServiceProvider
-    {
-        Task<List<Attachment>> getAttachmentsAsync(string token);
-        Task<IEnumerable<Attachment>> PostAttachmentsAsync(Models.AttachmentInfo attachmentInfo, string token);
-    }
-}

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

@@ -1,10 +0,0 @@
-using DamageAssesment.Api.Responses.Models;
-
-namespace DamageAssesment.Api.Responses.Interfaces
-{
-    public interface IEmployeeServiceProvider
-    {
-        Task<List<Employee>> getEmployeesAsync(string token);
-        Task<Employee> getEmployeeAsync(int employeeId, string token);
-    }
-}

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

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

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

@@ -1,9 +0,0 @@
-using DamageAssesment.Api.Responses.Models;
-
-namespace DamageAssesment.Api.Responses.Interfaces
-{
-    public interface ILocationServiceProvider
-    {
-        Task<List<Location>> getLocationsAsync(string token);
-    }
-}

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

@@ -1,11 +0,0 @@
-using DamageAssesment.Api.Responses.Models;
-
-namespace DamageAssesment.Api.Responses.Interfaces
-{
-    public interface IQuestionServiceProvider
-    {
-        Task<List<Question>> getQuestionsAsync(string token);
-        Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId, string token);
-        Task<Question> getQuestionsAsync(int questionId, string token);
-    }
-}

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

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

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

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

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

@@ -1,17 +0,0 @@
-using System.Collections.Generic;
-
-namespace DamageAssesment.Api.Responses.Models
-{
-     public class Question
-    {
-        public int Id { get; set; }
-        public string TypeText { get; set; }
-        public int QuestionNumber { get; set; }
-        public bool IsRequired { get; set; }
-        public bool Comment { get; set; }
-        public bool Key { get; set; }
-        public int SurveyId { get; set; }
-        public int CategoryId { get; set; }
-        public Dictionary<string, string> Text { get; set; }
-    }
-}

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

@@ -1,15 +0,0 @@
-namespace DamageAssesment.Api.Responses.Models
-{
-    public class Request
-    {
-        public int SurveyId { get; set; }
-        public int LocationId { get; set; }
-        public int EmployeeId { 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; } = DateTime.Now;
-        public List<AnswerRequest> Answers { get; set; }
-    }
-}

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

@@ -1,18 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace DamageAssesment.Api.Responses.Models
-{
-    public class SurveyResponse
-    {
-        public int Id { get; set; }
-        public int SurveyId { get; set; }
-        public int LocationId { get; set; }
-        public int 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; }
-    }
-}

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

@@ -1,51 +0,0 @@
-using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.Responses.Models;
-using Microsoft.AspNetCore.Mvc.Routing;
-using Newtonsoft.Json;
-
-namespace DamageAssesment.Api.Responses.Services
-{
-    public class EmployeeServiceProvider : ServiceProviderBase, IEmployeeServiceProvider
-    {
-        public EmployeeServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Employee"), configuration.GetValue<string>("EndPointSettings:EmployeeUrlBase"))
-        {
-        }
-
-        public async Task<List<Employee>> getEmployeesAsync(string token)
-        {
-            try
-            {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
-                var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString);
-
-                if (employees == null || !employees.Any())
-                    return new List<Employee>();
-                else return employees;
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError($"Exception Found : {ex.Message} - Ref: EmployeeServiceProvider.getEmployeesAsync()");
-                return new List<Employee>();
-            }
-        }
-
-        public async Task<Employee> getEmployeeAsync(int employeeId, string token)
-        {
-            try
-            {
-                url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:EmployeeById"), employeeId); 
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
-                var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString);
-
-                if (employee == null)
-                    return null;
-                else return employee;
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError($"Exception Found : {ex.Message} - Ref: EmployeeServiceProvider.getEmployeeAsync()");
-                return null;
-            }
-        }
-    }
-}

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

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

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

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json

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

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

@@ -1,23 +1,26 @@
-using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.Responses.Models;
-using Microsoft.AspNetCore.Authorization;
+using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.SurveyResponses.Models;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
 
-namespace DamageAssesment.Api.Responses.Controllers
+namespace DamageAssesment.Api.SurveyResponses.Controllers
 {
+    [Route("Responses")]
     [ApiController]
-    public class ResponsesController : ControllerBase
+    public class SurveyResponsesController : ControllerBase
     {
         private readonly ISurveysResponse surveyResponseProvider;
-        public ResponsesController(ISurveysResponse surveyResponseProvider)
+
+        public SurveyResponsesController(ISurveysResponse surveyResponseProvider)
         {
             this.surveyResponseProvider = surveyResponseProvider;
         }
         /// <summary>
         /// GET request for retrieving survey responses.
         /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpGet("Responses")]
+
+        [HttpGet]
         public async Task<ActionResult> GetSurveyResponsesAsync()
         {
             var result = await this.surveyResponseProvider.GetSurveyResponsesAsync();
@@ -34,11 +37,11 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <summary>
         /// GET request for retrieving survey responses by survey ID.
         /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpGet("Responses/BySurvey/{surveyid}")]
-        public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid)
+       
+        [HttpGet("surveys/{surveyId}")]
+        public async Task<ActionResult> GetSurveyResponsesAsync(int surveyId)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyid);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyId);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -48,13 +51,13 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <summary>
         /// GET request for retrieving survey responses by survey and location IDs.
         /// </summary>
-        /// <param name="surveyid">The ID of the survey for which responses are to be retrieved.</param>
-        /// <param name="locationid">The ID of the location for which responses are to be retrieved.</param>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpGet("Responses/{surveyid}/{locationid}")]
-        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid)
+        /// <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}")]
+        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, string locationId)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyId, locationId);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -68,11 +71,11 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <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>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpGet("Responses/ByAnswer/{surveyid}/{questionid}/{answer}")]
-        public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer)
-        {
-            var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyid, questionid, answer);
+
+        [HttpGet("ByAnswers/{surveyId}/{questionId}/{answer}")]
+        public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyId, int questionId, string answer)
+        {       
+            var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyId, questionId, answer);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -84,11 +87,11 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// 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>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpGet("Responses/ByRegion/{surveyid}")]
-        public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid)
+
+        [HttpGet("ByRegion/{surveyId}")]
+        public async Task<ActionResult> GetAnswersByRegionAsync(int surveyId)
         {
-            var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyid);
+            var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyId);
             if (result.IsSuccess)
             {
                 return Ok(result.Answers);
@@ -99,11 +102,11 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// GET request for retrieving survey responses by survey ID and maintenance center.
         /// </summary>
         /// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpGet("Responses/ByMaintenanceCenter/{surveyid}")]
-        public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid)
+
+        [HttpGet("ByMaintenanceCenter/{surveyId}")]
+        public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyId)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyid);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyId);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -114,11 +117,11 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// GET request for retrieving a survey response by response ID.
         /// </summary>
         /// <param name="responseId">The ID of the survey response to be retrieved.</param>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpGet("Responses/{id}")]
-        public async Task<ActionResult> GetSurveyResponseByIdAsync(int id)
+
+        [HttpGet("SurveyResponse/{Id}")]
+        public async Task<ActionResult> GetSurveyResponseByIdAsync(int Id)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(id);
+            var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(Id);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponse);
@@ -130,8 +133,8 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// POST request for creating a new survey response.
         /// </summary>
         /// <param name="surveyResponse">The survey response object to be created.</param>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpPost("Responses")]
+
+        [HttpPost]
         public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse)
         {
             var result = await this.surveyResponseProvider.PostSurveyResponseAsync(surveyResponse);
@@ -146,11 +149,11 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// </summary>
         /// <param name="Id">The ID of the survey response to be updated.</param>
         /// <param name="surveyResponse">The updated survey response object.</param>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpPut("Responses/{id}")]
-        public async Task<ActionResult> PutSurveyResponseAsync(int id, Models.SurveyResponse surveyResponse)
+
+        [HttpPut("{Id}")]
+        public async Task<ActionResult> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse)
         {
-            var result = await this.surveyResponseProvider.PutSurveyResponseAsync(id, surveyResponse);
+            var result = await this.surveyResponseProvider.PutSurveyResponseAsync(Id, surveyResponse);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponse);
@@ -163,11 +166,11 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <summary>
         /// DELETE request for deleting an existing survey response.
         /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpDelete("Responses/{id}")]
-        public async Task<ActionResult> DeleteSurveyResponseAsync(int id)
+       
+        [HttpDelete("{Id}")]
+        public async Task<ActionResult> DeleteSurveyResponseAsync(int Id)
         {
-            var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(id);
+            var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(Id);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponse);
@@ -178,8 +181,8 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// POST request for submitting survey with multiple answers.
         /// </summary>
         /// <param name="request">The answers to be submitted for the survey.</param>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [HttpPost("Responses/Answers")]
+
+        [HttpPost("Answers")]
         public async Task<ActionResult> PostSurveyAnswersAsync(Request request)
         {
             var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(request);

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

@@ -5,6 +5,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,6 +15,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
     <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

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.Responses.Db
+namespace DamageAssesment.Api.SurveyResponses.Db
 {
     public class SurveyResponse
     {
@@ -10,12 +10,14 @@ namespace DamageAssesment.Api.Responses.Db
 
         [ForeignKey("Survey")]
         public int SurveyId { get; set; }
+
+        [StringLength(4)]
         [ForeignKey("Location")]
-        public int LocationId { get; set; }
+        public string LocationId { get; set; }
 
         [StringLength(6)]
         [ForeignKey("Employee")]
-        public int EmployeeId { get; set; }
+        public string EmployeeId { get; set; }
 
         public DateTime? CreatedDate { get; set; } = DateTime.Now;
 

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

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