Group by issue in responses

date as optional date.

DamageAssesmentApi/.dockerignore

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

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

@@ -1,7 +1,6 @@
 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
 {
@@ -16,7 +15,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers
         /// </summary>
-        
+        [Authorize(Roles = "admin")]
         [HttpGet("answers")]
         public async Task<ActionResult> GetAnswersAsync() {
         
@@ -32,7 +31,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)
         {
@@ -48,6 +47,7 @@ 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)
         {
@@ -61,7 +61,7 @@ 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)
         {
@@ -75,7 +75,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 +96,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 +114,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,12 +1,10 @@
-<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>
@@ -14,7 +12,6 @@
     <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.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

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

DamageAssesmentApi/DamageAssesment.Api.Answers/Dockerfile

@@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj", "DamageAssesment.Api.Answers/"]
-RUN dotnet restore "DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Answers"
-RUN dotnet build "DamageAssesment.Api.Answers.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Answers.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Answers.dll"]

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -1,23 +1,73 @@
 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.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(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    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);
 });
 builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
@@ -35,7 +85,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

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

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

@@ -1,6 +1,7 @@
 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;
@@ -21,7 +22,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Get all attachments.
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpGet("attachments")]
         public async Task<ActionResult> GetAttachmentsAsync()
         {
@@ -37,6 +38,7 @@ 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)
         {
@@ -80,7 +82,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)
         {
@@ -107,7 +109,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)
         {
@@ -136,8 +138,84 @@ namespace DamageAssesment.Api.Attachments.Controllers
             }
         }
         /// <summary>
+        /// download an existing attachment.
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpGet("attachments/download/{id}")]
+        public async Task<IActionResult> downloadfile(int id)
+        {
+            try
+            {
+                var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id);
+                if (!result.IsSuccess)
+                    return NotFound();
+                string path = await UploadService.GetFile(result.Attachment.URI);
+                if (path == null)
+                    return NotFound();
+                var contentType = GetContentType(result.Attachment.FileName);
+                if (contentType == "application/octet-stream")
+                    return PhysicalFile(path, contentType, result.Attachment.FileName);
+                return PhysicalFile(path, contentType, enableRangeProcessing: true);// result.Attachment.FileName);
+            }
+            catch (Exception ex)
+            {
+                // Handle the exception here or log it
+                return StatusCode(500, "An error occurred: " + ex.Message);
+            }
+            //try
+            //{
+            //    var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id);
+            //    if(!result.IsSuccess) 
+            //        return NotFound();
+            //    byte[] fileContent = await UploadService.DownloadFile(result.Attachment.URI);
+            //    if (fileContent == null || fileContent.Length == 0)
+            //        return NotFound();
+            //    var contentType = "application/octet-stream";
+            //    return File(fileContent, contentType, result.Attachment.FileName);
+            //}
+            //catch (Exception ex)
+            //{
+            //    // Handle the exception here or log it
+            //    return StatusCode(500, "An error occurred: " + ex.Message);
+            //}
+        }
+        private string GetContentType(string fileName)
+        {
+            // You can add more content types based on the file extensions
+            switch (Path.GetExtension(fileName).ToLower())
+            {
+                //case ".txt":
+                //    return "text/plain";
+                case ".jpg":
+                case ".jpeg":
+                    return "image/jpeg";
+                case ".png":
+                    return "image/png";
+                case ".gif":
+                    return "image/gif";
+                case ".bmp":
+                    return "image/bmp";
+                case ".webp":
+                    return "image/webp";
+                case ".csv":
+                    return "text/csv";
+                case ".pdf":
+                    return "application/pdf";
+                case ".docx":
+                case ".doc":
+                    return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+                case ".xlsx":
+                case ".xls":
+                    return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+                // Add more cases as needed
+                default:
+                    return "application/octet-stream";
+            }
+        }
+        /// <summary>
         /// Delete an existing attachment.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpDelete("attachments/{id}")]
         public async Task<IActionResult> DeleteAttachment(int id)
         {

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

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

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

@@ -5,8 +5,6 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,7 +14,6 @@
     <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.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

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

DamageAssesmentApi/DamageAssesment.Api.Attachments/Dockerfile

@@ -1,29 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj", "DamageAssesment.Api.Attachments/"]
-RUN dotnet restore "DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Attachments"
-RUN dotnet build "DamageAssesment.Api.Attachments.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Attachments.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-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
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Attachments.dll"]

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

@@ -9,6 +9,7 @@ namespace DamageAssesment.Api.Attachments.Interfaces
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments);
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments);
         Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> DeleteAttachmentAsync(int Id);
+        Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id);
         Task<(bool IsSuccess, int counter, string Path)> DeleteAttachmentsAsync(int responseId, int answerId);
         Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds);
         Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter();

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

@@ -7,6 +7,8 @@ namespace DamageAssesment.Api.Attachments.Interfaces
         List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
         List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
         public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
+        Task<byte[]> DownloadFile(string path);
+        Task<string> GetFile(string path);
         void Deletefile(string path);
         void Movefile(string path);
     }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -1,26 +1,77 @@
 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(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    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);
 });
+builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
@@ -45,6 +96,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
+app.UseAuthentication();
 app.UseAuthorization();
 app.UseHttpsRedirection();
 

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

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

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

@@ -14,13 +14,17 @@ namespace DamageAssesment.Api.Attachments.Providers
         private ILogger<AttachmentsProvider> logger;
         private IUploadService uploadservice;
         private IMapper mapper; 
-
-        public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice)
+        private readonly IHttpContextAccessor httpContextAccessor;
+        private string baseUrl;
+        public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
         {
             this.AttachmentDbContext = AttachmentDbContext;
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
+            this.httpContextAccessor = httpContextAccessor;
+            baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
+            baseUrl = baseUrl + "/attachments/download";
             SeedData();
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
@@ -32,6 +36,10 @@ namespace DamageAssesment.Api.Attachments.Providers
                 var Attachment = await AttachmentDbContext.Attachments.AsNoTracking().Where(a => !a.IsDeleted).ToListAsync();
                 if (Attachment != null)
                 {
+                    foreach (var attachment in Attachment)
+                    {
+                        attachment.URI = $"{baseUrl}/{attachment.Id}";
+                    }
                     logger?.LogInformation($"{Attachment.Count} Attachments(s) found");
                     var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachment);
                     return (true, result, null);
@@ -54,6 +62,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachment != null)
                 {
                     logger?.LogInformation($"{Attachment} customer(s) found");
+                    Attachment.URI = $"{baseUrl}/{Attachment.Id}";
                     var result = mapper.Map<Db.Attachment, Models.Attachment>(Attachment);
                     return (true, result, null);
                 }
@@ -73,6 +82,10 @@ namespace DamageAssesment.Api.Attachments.Providers
                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
                 AttachmentDbContext.Attachments.AddRange(attachments);
                 await AttachmentDbContext.SaveChangesAsync();
+                foreach (var attachment in attachments)
+                {
+                    attachment.URI = $"{baseUrl}/{attachment.Id}";
+                }
                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
@@ -91,6 +104,10 @@ namespace DamageAssesment.Api.Attachments.Providers
                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
                 AttachmentDbContext.Attachments.UpdateRange(attachments);
                 await AttachmentDbContext.SaveChangesAsync();
+                foreach (var attachment in attachments)
+                {
+                    attachment.URI = $"{baseUrl}/{attachment.Id}";
+                }
                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
@@ -197,6 +214,24 @@ namespace DamageAssesment.Api.Attachments.Providers
         {
             return AttachmentDbContext.Attachments.AsNoTracking().Count(e => e.Id == id && !e.IsDeleted) > 0;
         }
+        public async Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id)
+        {
+            try
+            {
+                Db.Attachment Attachment = AttachmentDbContext.Attachments.Where(a => a.Id == Id).AsNoTracking().FirstOrDefault();
+                if (Attachment == null)
+                {
+                    return (false, null, "Not Found");
+                }
+                return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id}");
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
 
         private void SeedData()
         {

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

@@ -24,6 +24,41 @@ namespace DamageAssesment.Api.Attachments.Providers
             uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
         }
+        public async Task<string> GetFile(string path)
+        {
+            try
+            {
+                if (System.IO.File.Exists(path))
+                {
+                    return path;
+                }
+
+                return null; // File not found
+            }
+            catch (Exception ex)
+            {
+                // Handle or log the exception as needed
+                throw;
+            }
+
+        }
+        public async Task<byte[]> DownloadFile(string path)
+        {
+            try
+            {
+                if (System.IO.File.Exists(path))
+                {
+                    return await System.IO.File.ReadAllBytesAsync(path);
+                }
+
+                return null; // File not found
+            }
+            catch (Exception ex)
+            {
+                // Handle or log the exception as needed
+                throw;
+            }
+        }
         public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
         {
             var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
@@ -89,7 +124,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                     {
                         counter++;
 
-                        var UserfileName = Path.GetFileName(file.FileName);
+                        var UserfileName = Path.GetFileName(file.FileName+ file.FileExtension);
                         var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
                         var dbPath = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
@@ -126,7 +161,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 foreach (var file in item.postedFiles)
                 {
                     Models.Attachment attachment= attachments.Where(a=>a.Id == file.AttachmentId).FirstOrDefault();
-                    var UserfileName = Path.GetFileName(file.FileName);
+                    var UserfileName = Path.GetFileName(file.FileName + file.FileExtension);
                     var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
                     var dbPath = Path.Combine(fullDirectoryPath, fileName);
                     File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));

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

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

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

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

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

@@ -197,7 +197,29 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1);
             Assert.Equal(404, result.StatusCode);
         }
+        [Fact(DisplayName = "Update Document IsActive- Ok case")]
+        public async Task UpdateDocumentAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponse(1);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
 
+            Assert.Equal(200, result.StatusCode);
+        }
+        [Fact(DisplayName = "Update Document IsActive - NotFound case")]
+        public async Task UpdateDocumentAsync_ShouldReturnStatusCode404()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getNotFoundResponse();
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (NotFoundResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
+            Assert.Equal(404, result.StatusCode);
+        }
 
         // Link Type Test cases
 

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

@@ -32,7 +32,8 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 doclinksAttachments.Add(new DoculinkAttachments()
                 {
                     docName = "",Path="www.google.com",
-                    IsAttachments=false,CustomOrder=1
+                    Language = "en",
+                    IsAttachments =false,CustomOrder=1
                 });
                 list.Add(new DocuLinks.Models.ResDoculink()
                 {
@@ -74,6 +75,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
                     docName = "",
                     Path = "www.google.com",
                     IsAttachments = false,
+                    Language = "en",
                     CustomOrder = 1
                 });
                 list.Add(new DocuLinks.Models.ResDoculink()
@@ -138,6 +140,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 docName = "",
                 Path = "www.google.com",
                 IsAttachments = false,
+                Language = "en",
                 CustomOrder = 1
             });
             return new Models.Doculink
@@ -165,6 +168,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 docName = "",
                 Path = "www.google.com",
                 IsAttachments = false,
+                Language = "en",
                 CustomOrder = 1
             });
             List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();

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

@@ -2,8 +2,10 @@
 using DamageAssesment.Api.DocuLinks.Interfaces;
 using DamageAssesment.Api.DocuLinks.Models;
 using DamageAssesment.Api.DocuLinks.Providers;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using System.Data;
 
 namespace DamageAssesment.Api.DocuLinks.Controllers
 {
@@ -13,7 +15,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         private readonly IDoculinkProvider documentsProvider;
         private readonly IUploadService uploadService;
 
-        public DoculinkController(IDoculinkProvider documentsProvider,IUploadService uploadService)
+        public DoculinkController(IDoculinkProvider documentsProvider, IUploadService uploadService)
         {
 
             this.documentsProvider = documentsProvider;
@@ -24,6 +26,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// Get all Doculink type.
         /// </summary>
         [HttpGet]
+        [Authorize(Roles = "admin")]
         [Route("doculinks/types")]
         [Route("doculinks/types/{language:alpha}")]
         public async Task<IActionResult> GetLinkTypesAsync(string? language)
@@ -39,9 +42,10 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// Get a Doculink type by id.
         /// </summary>
         [HttpGet]
+        [Authorize(Roles = "admin")]
         [Route("doculinks/types/{id}")]
         [Route("doculinks/types/{id}/{language:alpha}")]
-        public async Task<IActionResult> GetLinkTypeAsync(int id,string? language)
+        public async Task<IActionResult> GetLinkTypeAsync(int id, string? language)
         {
             var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
             if (result.IsSuccess)
@@ -53,13 +57,14 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Update a existing Doculink type.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPut]
         [Route("doculinks/types/{id}")]
-        public async Task<IActionResult> UpdateLinkType(int id,Models.LinkType linkType)
+        public async Task<IActionResult> UpdateLinkType(int id, Models.LinkType linkType)
         {
             if (linkType != null)
             {
-                var result = await this.documentsProvider.UpdateLinkTypeAsync(id,linkType);
+                var result = await this.documentsProvider.UpdateLinkTypeAsync(id, linkType);
                 if (result.IsSuccess)
                 {
                     return Ok(result.LinkType);
@@ -74,6 +79,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Create a new Doculink type.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks/types")]
         public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
@@ -92,6 +98,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Delete a  existing Doculink type by id.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpDelete]
         [Route("doculinks/types/{id}")]
         public async Task<IActionResult> DeleteLinkType(int id)
@@ -104,14 +111,90 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
+        /// download an existing attachment.
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpGet("doculinks/download/{id}")]
+        public async Task<IActionResult> downloadfile(int id)
+        {
+            try
+            {
+                var result = await this.documentsProvider.GetDownloadAttachmentAsync(id);
+                if (!result.IsSuccess)
+                    return NotFound();
+                string path = await uploadService.GetFile(result.DoculinkAttachments.Path);
+                if (path == null)
+                    return NotFound();
+                var contentType = GetContentType(result.DoculinkAttachments.docName);
+                if (contentType == "application/octet-stream")
+                    return PhysicalFile(path, contentType, result.DoculinkAttachments.docName);
+                return PhysicalFile(path, contentType, enableRangeProcessing: true);
+            }
+            catch (Exception ex)
+            {
+                // Handle the exception here or log it
+                return StatusCode(500, "An error occurred: " + ex.Message);
+            }
+            //try
+            //{
+            //    var result = await this.documentsProvider.GetDownloadAttachmentAsync(id);
+            //    if (!result.IsSuccess)
+            //        return NotFound();
+            //    byte[] fileContent = await uploadService.DownloadFile(result.DoculinkAttachments.Path);
+            //    if (fileContent == null || fileContent.Length == 0)
+            //        return NotFound();
+            //    var contentType = "application/octet-stream";
+            //    return File(fileContent, contentType, result.DoculinkAttachments.docName);
+            //}
+            //catch (Exception ex)
+            //{
+            //    // Handle the exception here or log it
+            //    return StatusCode(500, "An error occurred: " + ex.Message);
+            //}
+        }
+        private string GetContentType(string fileName)
+        {
+            // You can add more content types based on the file extensions
+            switch (Path.GetExtension(fileName).ToLower())
+            {
+                //case ".txt":
+                //    return "text/plain";
+                case ".jpg":
+                case ".jpeg":
+                    return "image/jpeg";
+                case ".png":
+                    return "image/png";
+                case ".gif":
+                    return "image/gif";
+                case ".bmp":
+                    return "image/bmp";
+                case ".webp":
+                    return "image/webp";
+                case ".csv":
+                    return "text/csv";
+                case ".pdf":
+                    return "application/pdf";
+                case ".docx":
+                case ".doc":
+                    return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
+                case ".xlsx":
+                case ".xls":
+                    return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+                // Add more cases as needed
+                default:
+                    return "application/octet-stream";
+            }
+        }
+        /// <summary>
         /// Get all Doculink.
         /// </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,bool? isactive)
+        public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language, bool? isactive)
         {
             var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive);
             if (result.IsSuccess)
@@ -123,13 +206,14 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Get all active Doculink.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [Route("doculinks/active")]
         [Route("doculinks/active/{linktype:alpha}")]
         [Route("doculinks/active/{linktype:alpha}/{language:alpha}")]
         [HttpGet]
         public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
         {
-            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language,true);
+            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, true);
             if (result.IsSuccess)
             {
                 return Ok(result.documents);
@@ -139,6 +223,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Get all active Doculink.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [Route("doculinks/active/{linktypeid:int}")]
         [Route("doculinks/active/{linktypeid:int}/{language:alpha}")]
         [HttpGet]
@@ -154,11 +239,12 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Get a Doculink 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)
+        public async Task<IActionResult> GetDocumentAsync(int id, string? linktype, string? language)
         {
             var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
             if (result.IsSuccess)
@@ -168,11 +254,12 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// update existing doclink.
+        /// Upload new document.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPut]
         [Route("doculinks/{id}")]
-        public async Task<IActionResult> UpdateDocument(int id,ReqDoculink documentInfo)
+        public async Task<IActionResult> UpdateDocument(int id, ReqDoculink documentInfo)
         {
             if (documentInfo != null)
             {
@@ -180,7 +267,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 if (dbdoc.IsSuccess)
                 {
                     var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink= uploadService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
+                    Models.Doculink DocuLink = uploadService.UpdateDocuments(documents.counter, dbdoc.Document, documentInfo);
                     var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
                     if (result.IsSuccess)
                     {
@@ -193,8 +280,23 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return BadRequest(documentInfo);
         }
         /// <summary>
+        /// update existing doclink isactive field.
+        /// </summary>
+        [HttpPut]
+        [Route("doculinks/{id}/{isactive}")]
+        public async Task<IActionResult> UpdateIsActiveDocument(int id, bool isactive)
+        {
+            var result = await this.documentsProvider.UpdateDocumentAsync(id, isactive);
+            if (result.IsSuccess)
+            {
+                return Ok(result.Document);
+            }
+            return NotFound();
+        }
+        /// <summary>
         /// Create new doclink.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks")]
         public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo)
@@ -204,7 +306,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 if (documentInfo != null)
                 {
                     var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink= uploadService.UploadDocument(documents.counter, documentInfo);
+                    Models.Doculink DocuLink = uploadService.UploadDocument(documents.counter, documentInfo);
                     var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
                     if (result.IsSuccess)
                     {
@@ -220,8 +322,9 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             }
         }
         /// <summary>
-        /// Delete Doculink by id.
+        /// Delete document by id.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpDelete]
         [Route("doculinks/{id}")]
         public async Task<IActionResult> DeleteDocument(int id)

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_1.txt

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

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_2.txt

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

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

@@ -1,17 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="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">
@@ -24,7 +23,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

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

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

@@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
+    [Table("DoculinkAttachments")]
     public class DoculinkAttachments
     {
 
@@ -14,5 +15,6 @@ namespace DamageAssesment.Api.DocuLinks.Db
         public string Path { get; set; }
         public bool IsAttachments { get; set; }
         public int CustomOrder { get; set; }
+        public string Language { get; set; }
     }
 }

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

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile

@@ -1,30 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj", "DamageAssesment.Api.DocuLinks/"]
-RUN dotnet restore "DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.DocuLinks"
-RUN dotnet build "DamageAssesment.Api.DocuLinks.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.DocuLinks.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-# Create directories for attachments and set permissions
-RUN mkdir -p /app/DASA_Documents/Active && \
-    mkdir -p /app/DASA_Documents/Deleted && \
-    chown -R www-data:www-data /app/DASA_Documents
-
-# Update appsettings.json with the correct paths for attachments
-RUN sed -i 's#"folderpath": "DASA_Documents/Active"#"folderpath": "/app/DASA_Documents/Active"#' appsettings.json && \
-    sed -i 's#"Deletepath": "DASA_Documents/Deleted"#"Deletepath": "/app/DASA_Documents/Deleted"#' appsettings.json
-
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.DocuLinks.dll"]

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

@@ -11,7 +11,9 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
         Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document);
+        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, bool isactive);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
+        Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id);
         Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
 
 

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

@@ -7,6 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
         Models.Doculink UploadDocument( int counter, ReqDoculink documentInfo);
         public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
         void Deletefile(string path);
+        Task<byte[]> DownloadFile(string path);
+        Task<string> GetFile(string path);
         void Movefile(string path);
     }
 }

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

@@ -8,6 +8,7 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public string docName { get; set; }
         public string Path { get; set; }
         public bool IsAttachments { get; set; }
+        public string Language { get; set; }
         public int CustomOrder { get; set; }
     }
 }

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

@@ -7,6 +7,7 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public int Id { get; set; }
         public int linkTypeId { get; set; }
         public List<DoculinkTranslation> documentsTranslations { get; set; }
+        public bool IsActive { get; set; }
         public int CustomOrder { get; set; }
         public List<FileModel>? Files { get; set; }
     }
@@ -18,5 +19,6 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public int CustomOrder { get; set; }
         public string url { get;set; }
         public bool IsAttachments { get; set; }
+        public string Language { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -2,23 +2,74 @@ using DamageAssesment.Api.DocuLinks.Db;
 using DamageAssesment.Api.DocuLinks.Interfaces;
 using DamageAssesment.Api.DocuLinks.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(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    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.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
@@ -36,6 +87,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,14 +1,23 @@
-{
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:60754",
+      "sslPort": 0
+    }
+  },
   "profiles": {
-    "DamageAssesment.Api.Doculinks": {
+    "DamageAssesment.Api.Questions": {
       "commandName": "Project",
+      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5133",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5136"
+      }
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -17,24 +26,6 @@
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:14425",
-      "sslPort": 0
     }
   }
 }

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

@@ -2,13 +2,16 @@
 using DamageAssesment.Api.DocuLinks.Db;
 using DamageAssesment.Api.DocuLinks.Interfaces;
 using DamageAssesment.Api.DocuLinks.Models;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.Eventing.Reader;
 using System.Reflection.Metadata;
+using System.Runtime.CompilerServices;
 using System.Xml;
 using System.Xml.Linq;
 
@@ -22,13 +25,18 @@ namespace DamageAssesment.Api.DocuLinks.Providers
         private ILogger<DoculinkProvider> logger;
         private IUploadService uploadservice;
         private IMapper mapper;
+        private readonly IHttpContextAccessor httpContextAccessor;
+        private string baseUrl;
 
-        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice)
+        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
         {
             this.DocumentDbContext = DocumentDbContext;
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
+            this.httpContextAccessor = httpContextAccessor;
+            baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
+            baseUrl = baseUrl + "/doculinks/download";
             SeedData();
         }
 
@@ -71,11 +79,11 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     {
                         linkTypeId = 1;
 
-                        fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 };
+                        fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1, Language = "en"  };
                     }
                     else
-                        fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
-                    ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = linkTypeId, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
+                        fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1,Language="en" };
+                    ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
                     Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
                     DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
                     DocumentDbContext.SaveChanges();
@@ -170,7 +178,42 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             MultiLanguage = dicttitle;
             return MultiLanguage;
         }
+        private List<Models.DoculinkAttachments> GetDocumentAttachment(int id,string? language)
+        {
+            List<Db.DoculinkAttachments> doculinkAttachments = null;
+            if (string.IsNullOrEmpty(language))
+            {
+                doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList();
+            }
+            else
+            {
+                doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList();
+            }
+            foreach (var attachment in doculinkAttachments)
+            {
+                if (attachment.IsAttachments)
+                    attachment.Path = $"{baseUrl}/{attachment.Id}";
+            }
+            return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(doculinkAttachments);
+        }
+        public async Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id)
+        {
+            try
+            {
+                Db.DoculinkAttachments Attachment = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.Id == id).AsNoTracking().FirstOrDefault();
+                if (Attachment == null)
+                {
+                    return (false, null, "Not Found");
+                }
+                return (true, mapper.Map<Db.DoculinkAttachments, Models.DoculinkAttachments>(Attachment), $"Attachment {id}");
+            }
+            catch (Exception ex)
+            {
 
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
         public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
         {
 
@@ -192,8 +235,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         item.titles = multilan.titles;
                         item.description = multilan.description;
                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
+                        item.doclinksAttachments = GetDocumentAttachment(item.Id,language);
                     }
                    // List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
                     return (true, result, null);
@@ -228,8 +270,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         item.titles = multilan.titles;
                         item.description = multilan.description;
                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
+                        item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
                     }
                     //List<ResDoculinks> doculinks =  result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
                     return (true, result, null);
@@ -284,8 +325,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
                             DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
 
-                    result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+                    result.doclinksAttachments = GetDocumentAttachment(id, "");
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -317,8 +357,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
                     result.titles = multilan.titles;
                     result.description = multilan.description;
-                    result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+                    result.doclinksAttachments = GetDocumentAttachment(id, language);
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -349,7 +388,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, ""));
                 result.titles = multilan.titles;
                 result.description = multilan.description;
-                result.doclinksAttachments = Document.doclinksAttachments;
+                result.doclinksAttachments = GetDocumentAttachment(document.Id,"");
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -391,7 +430,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, ""));
                         result.titles = multilan.titles;
                         result.description = multilan.description;
-                        result.doclinksAttachments = Document.doclinksAttachments;
+                        result.doclinksAttachments = GetDocumentAttachment(document.Id, "");
                         return (true, result, "Successful");
                     }
                     else
@@ -414,6 +453,35 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 return (false, null, ex.Message);
             }
         }
+        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id,bool isactive)
+        {
+
+            try
+            {
+                Db.Doculink Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
+                if (Document == null)
+                {
+                    return (false, null, "Not Found");
+                }
+                Document.IsActive = isactive;
+                DocumentDbContext.Documents.Update(Document);
+                DocumentDbContext.SaveChanges();
+                var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document);
+                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(Document.Id, ""));
+                result.titles = multilan.titles;
+                result.description = multilan.description;
+                result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, ""));
+                result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                    DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+                return (true, result, $"DocumentId {id} deleted Successfuly");
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
         public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id)
         {
 

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

@@ -25,6 +25,41 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
         }
+        public async Task<string> GetFile(string path)
+        {
+            try
+            {
+                if (System.IO.File.Exists(path))
+                {
+                    return path;
+                }
+
+                return null; // File not found
+            }
+            catch (Exception ex)
+            {
+                // Handle or log the exception as needed
+                throw;
+            }
+
+        }
+        public async Task<byte[]> DownloadFile(string path)
+        {
+            try
+            {
+                if (System.IO.File.Exists(path))
+                {
+                    return await System.IO.File.ReadAllBytesAsync(path);
+                }
+
+                return null; // File not found
+            }
+            catch (Exception ex)
+            {
+                // Handle or log the exception as needed
+                throw;
+            }
+        }
 
         public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
         {
@@ -44,19 +79,20 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         counter++;
                         if (item.IsAttachments)
                         {
-                            UserfileName = Path.GetFileName(item.FileName);
+                            UserfileName = Path.GetFileName(item.FileName + item.FileExtension);
                             var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
                             path = Path.Combine(fullDirectoryPath, fileName);
                             File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
                         }
                         else
                             path = item.url;
-                        attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
+                        attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
                     }
                 }
                 Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
                     documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
-                    IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true};
+                    IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =documentInfo.IsActive
+                };
             
                 return Documents;
             }
@@ -85,21 +121,21 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     counter++;
                     if (item.IsAttachments)
                     {
-                        UserfileName = Path.GetFileName(item.FileName);
+                        UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
                         var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
                         path = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
                     }
                     else
                         path = item.url;
-                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
+                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
                 }
                 Models.Doculink Documents = new Models.Doculink()
                 {
                     Id = documentInfo.Id,
                     linkTypeId = documentInfo.linkTypeId,
                     documentsTranslations=documentInfo.documentsTranslations,
-                    IsActive = true,
+                    IsActive = documentInfo.IsActive,
                     IsDeleted=false,
                     CustomOrder = documentInfo.CustomOrder,
                     doclinksAttachments = attachments

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

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

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json

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

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

@@ -1,4 +1,5 @@
 using DamageAssesment.Api.Employees.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -18,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()
         {
@@ -35,7 +36,7 @@ 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)
         {
@@ -53,6 +54,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// 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)
         {
@@ -75,6 +77,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// POST request for creating a new employee.
         /// </summary>
         /// <param name="Employee">The employee information for creating a new employee.</param>
+        [Authorize(Roles = "admin")]
         [HttpPost("employees")]
         public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
         {
@@ -93,6 +96,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// DELETE request for deleting an existing employee.
         /// </summary>
         /// <param name="id">The ID of the employee to be deleted.</param>
+        [Authorize(Roles = "admin")]
         [HttpDelete("employees/{id}")]
         public async Task<IActionResult> DeleteEmployee(int id)
         {

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

@@ -5,8 +5,6 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +12,6 @@
     <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.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile

@@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj", "DamageAssesment.Api.Employees/"]
-RUN dotnet restore "DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Employees"
-RUN dotnet build "DamageAssesment.Api.Employees.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Employees.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Employees.dll"]

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -1,23 +1,74 @@
 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(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    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);
 });
 
 builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
@@ -43,6 +94,7 @@ if (app.Environment.IsDevelopment())
     }
 }
 
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

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

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

@@ -77,7 +77,8 @@ namespace DamageAssesment.Api.Employees.Providers
                     EmployeeDbContext.Employees.Add(_employee);
                     Employee.Id = _employee.Id;
                     EmployeeDbContext.SaveChanges();
-                    return (true, Employee, null);
+                    //return (true, Employee, null);
+                    return (true, mapper.Map<Db.Employee, Models.Employee>(_employee), null);
                 }
                 return (false, null, "Employee code is already exits");
             }

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

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

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

@@ -1,4 +1,5 @@
 using DamageAssesment.Api.Locations.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -15,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// Get all locations.
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpGet("locations")]
         public async Task<ActionResult> GetLocationsAsync()
         {
@@ -31,7 +32,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// Get all locations based on locationdId.
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpGet("locations/{id}")]
         public async Task<ActionResult> GetLocationByIdAsync(int id)
         {
@@ -47,7 +48,7 @@ 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)
         {
@@ -65,7 +66,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// Save a new location.
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpPost("locations")]
         public async Task<IActionResult> CreateLocation(Models.Location Location)
         {
@@ -83,7 +84,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// Delete an existing location.
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpDelete("locations/{id}")]
         public async Task<IActionResult> DeleteLocation(int id)
         {

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

@@ -1,4 +1,5 @@
 using DamageAssesment.Api.Locations.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Locations.Controllers
@@ -15,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// Get all regions.2
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpGet("regions")]
         public async Task<ActionResult> GetRegionsAsync()
         {
@@ -29,7 +30,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// GET request for retrieving a region by its ID.
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpGet("regions/{id}")]
         public async Task<ActionResult> GetRegionAsync(int id)
         {
@@ -43,7 +44,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// POST request for creating a new region.
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpPost("regions")]
         public async Task<ActionResult> PostRegionAsync(Models.Region region)
         {
@@ -57,7 +58,7 @@ 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)
         {
@@ -75,7 +76,7 @@ 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)
         {

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

@@ -5,8 +5,6 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +12,6 @@
     <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.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile

@@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj", "DamageAssesment.Api.Locations/"]
-RUN dotnet restore "DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Locations"
-RUN dotnet build "DamageAssesment.Api.Locations.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Locations.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Locations.dll"]

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -1,23 +1,73 @@
 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(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    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);
 });
 builder.Services.AddScoped<ILocationsProvider, LocationsProvider>();
 builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
@@ -26,7 +76,10 @@ 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())
@@ -44,6 +97,7 @@ if (app.Environment.IsDevelopment())
     }
 }
 
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

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

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

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

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

@@ -1,4 +1,6 @@
 using DamageAssesment.Api.Questions.Interfaces;
+using Microsoft.AspNetCore.Authorization;
+using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
@@ -10,16 +12,13 @@ namespace DamageAssesment.Api.Questions.Controllers
 
         public QuestionsController(IQuestionsProvider questionsProvider)
         {
-
             this.questionsProvider = questionsProvider;
-
         }
-
         /// <summary>
         /// GET request for retrieving questions.
         /// </summary>
-
-        // get all questions
+        //get all questions
+        [Authorize(Roles = "admin,survey,user,report")]
         [Route("questions")]
         [Route("questions/{language:alpha}")]
         [HttpGet]
@@ -37,6 +36,7 @@ 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}")]
         [HttpGet]
@@ -55,6 +55,7 @@ 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}")]
         [HttpGet]
@@ -71,6 +72,7 @@ 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)
         {
@@ -89,9 +91,51 @@ namespace DamageAssesment.Api.Questions.Controllers
             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
         }
         /// <summary>
+        /// POST request for creating a multiple question (multilingual).
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpPost("questions/multiple")]
+        public async Task<IActionResult> CreateQuestions(List<Models.Question> questions)
+        {
+            if (questions != null)
+            {
+                var result = await this.questionsProvider.PostQuestionsAsync(questions);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.Question);
+                }
+                if (result.ErrorMessage == "Not Found")
+                    return NotFound(result.ErrorMessage);
+
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi",questions);
+        }
+        /// <summary>
+        /// PUT request for update a multiple question (multilingual) for survey.
+        /// </summary>
+        [HttpPut("questions/multiple/{surveyid}")]
+        public async Task<IActionResult> CreateQuestions(int surveyid, List<Models.Question> questions)
+        {
+            if (questions != null)
+            {
+                var result = await this.questionsProvider.PutQuestionsAsync(surveyid,questions);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.Question);
+                }
+                if (result.ErrorMessage == "Not Found")
+                    return NotFound(result.ErrorMessage);
+
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi", questions);
+        }
+        /// <summary>
         /// POST request for creating a new question (multilingual).
         /// </summary>
 
+        [Authorize(Roles = "admin")]
         [HttpPost("questions")]
         public async Task<IActionResult> CreateQuestion(Models.Question question)
         {
@@ -110,6 +154,7 @@ 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)
         {
@@ -125,6 +170,7 @@ 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)
@@ -139,7 +185,7 @@ 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)
@@ -156,7 +202,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// PUT request for updating a question category.
         /// </summary>
-
+        [Authorize(Roles = "admin,survey,report")]
         [HttpPut("questions/categories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
@@ -178,6 +224,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question category.
         /// </summary>
 
+        [Authorize(Roles = "admin")]
         [HttpPost("questions/categories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
@@ -196,6 +243,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question category based on ID.
         /// </summary>
 
+        [Authorize(Roles = "admin")]
         [HttpDelete("questions/categories/{id}")]
         public async Task<IActionResult> DeleteQuestionCategory(int id)
         {

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

@@ -5,8 +5,6 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +12,6 @@
     <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.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

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

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

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

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

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

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile

@@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj", "DamageAssesment.Api.Questions/"]
-RUN dotnet restore "DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Questions"
-RUN dotnet build "DamageAssesment.Api.Questions.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Questions.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Questions.dll"]

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

@@ -8,6 +8,8 @@ namespace DamageAssesment.Api.Questions.Interfaces
         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, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions);
+        Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId,List<Models.Question> Questions);
         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id);
 

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

@@ -12,7 +12,7 @@
         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; }
     }
 }

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

@@ -5,6 +5,7 @@
         public int CategoryId { get; set; }
         public string IconName { get; set; }
         public string IconLibrary { get; set; }
+        public object CategoryNames { get; set; }
         public List<MultiLanguage> QuestionsText { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

@@ -1,11 +1,33 @@
 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 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();
@@ -17,13 +39,41 @@ builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-builder.Services.AddSwaggerGen(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    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);
 });
+
 builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
     option.UseInMemoryDatabase("Questions");
@@ -43,7 +93,7 @@ if (app.Environment.IsDevelopment())
         questionProvider.SeedData();
     }
 }
-
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

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

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

@@ -31,8 +31,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" });
                 questionDbContext.SaveChanges();
             }
-
-            if (!questionDbContext.QuestionCategories.Any())
+            if (!questionDbContext.QuestionsTranslations.Any())
             {
                 questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" });
                 questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
@@ -65,14 +64,51 @@ namespace DamageAssesment.Api.Questions.Providers
             if (!questionDbContext.Questions.Any())
             {
                 var question1 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
-                var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
+                var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
                 var question3 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
-                var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
+                var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
+                var question5 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
+                var question6 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
+                var question7 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 3 };
+                var question8 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 };
+                var question9 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = true, Key = true, CategoryId = 5 };
+                var question10 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = false, Key = true, CategoryId = 1 };
+                var question11 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 2 };
+                var question12 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 };
+                var question13 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 4 };
+                var question14 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 5 };
+                var question15 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 };
+                var question16 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 2 };
+                var question17 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 3 };
+                var question18 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 };
+                var question19 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 5 };
+                var question20 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
+                var question21 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 2 };
+                var question22 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 };
 
                 questionDbContext.Questions.Add(question1);
                 questionDbContext.Questions.Add(question2);
                 questionDbContext.Questions.Add(question3);
                 questionDbContext.Questions.Add(question4);
+                questionDbContext.Questions.Add(question5);
+                questionDbContext.Questions.Add(question6);
+                questionDbContext.Questions.Add(question7);
+                questionDbContext.Questions.Add(question8);
+                questionDbContext.Questions.Add(question9);
+                questionDbContext.Questions.Add(question10);
+                questionDbContext.Questions.Add(question11);
+                questionDbContext.Questions.Add(question12);
+                questionDbContext.Questions.Add(question13);
+                questionDbContext.Questions.Add(question14);
+                questionDbContext.Questions.Add(question15);
+                questionDbContext.Questions.Add(question16);
+                questionDbContext.Questions.Add(question17);
+                questionDbContext.Questions.Add(question18);
+                questionDbContext.Questions.Add(question19);
+                questionDbContext.Questions.Add(question20);
+                questionDbContext.Questions.Add(question21);
+                questionDbContext.Questions.Add(question22);
+
                 questionDbContext.SaveChanges();
             }
 
@@ -90,6 +126,64 @@ namespace DamageAssesment.Api.Questions.Providers
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Are the grounds flooded ?", Language = "en" });
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
+
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Can you open?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Is debris blocking access?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Are the grounds flooded?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "Is the access blocked by flooding?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Are any utility wires down?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Do you have damage to windows, doors, or walls?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Do you have roof damage?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Do you have major water intrusion?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Are any portable classrooms damaged and unusable?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Does your facility need to be secured/boarded?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Are you without commercial power?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Are you without water pressure?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Are you without telephones?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Are traffic signals damaged/missing?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "Are you without an operable fire alarm?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "Are you without an operable public address?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Do you have major debris?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Are there any problems or issues not addressed above that would impede you from opening? If yes, please explain below?", Language = "en" });
+
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Pouvez-vous ouvrir ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Est-ce que des débris bloquent l'accès ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "L'accès est-il bloqué par des inondations ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Des câbles d'utilité sont-ils tombés ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Avez-vous des dommages aux fenêtres, portes ou murs ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Avez-vous des dommages au toit ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Avez-vous une intrusion d'eau majeure ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Les salles de classe portables sont-elles endommagées et inutilisables ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Votre établissement a-t-il besoin d'être sécurisé/protégé ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Êtes-vous sans alimentation électrique commerciale ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Êtes-vous sans pression d'eau ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Êtes-vous sans téléphones ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Les feux de circulation sont-ils endommagés/absents ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "N'avez-vous pas d'alarme incendie fonctionnelle ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "N'avez-vous pas de système de sonorisation opérationnel ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Avez-vous une grande quantité de débris ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Y a-t-il des problèmes ou des problèmes non abordés ci-dessus qui vous empêcheraient d'ouvrir ? Si oui, veuillez expliquer ci-dessous.", Language = "fr" });
+
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "¿Puedes abrir ?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "¿Los escombros bloquean el acceso?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "¿Hay cables de utilidad caídos?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "¿Tienes daños en ventanas, puertas o paredes?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "¿Tienes daños en el techo?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "¿Tienes una gran intrusión de agua?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "¿Hay aulas portátiles dañadas e inutilizables?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "¿Tu instalación necesita ser asegurada/tabicada?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "¿No tienes energía comercial?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "¿No tienes presión de agua?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "¿No tienes teléfonos?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "¿Los semáforos están dañados/faltan?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "¿No tienes una alarma de incendios operativa?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "¿No tienes un sistema de megafonía operativo?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "¿Tienes una gran cantidad de escombros?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "¿Hay algún problema o asunto no abordado anteriormente que le impida abrir? Si es así, por favor explíquelo a continuación.", Language = "es" });
+
                 questionDbContext.SaveChanges();
             }
         }
@@ -219,6 +313,7 @@ namespace DamageAssesment.Api.Questions.Providers
                             CategoryId = item.Id,
                             IconLibrary = item.IconLibrary,
                             IconName = item.IconName,
+                            CategoryNames = CreateCategoryMultiLanguageObject(GetCategoryTranslations(item.Id, language)),
                             QuestionsText = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanguage>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language)
                         });
                     }
@@ -239,17 +334,71 @@ namespace DamageAssesment.Api.Questions.Providers
             try
             {
                 logger?.LogInformation("Query Question");
+                var result = InsertQuestion(Question);
+                return (true, result, null);
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        private Models.MultiLanguage InsertQuestion(Models.Question Question)
+        {
             var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
             var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
             dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
             questionDbContext.Questions.Add(dbquestion);
+            questionDbContext.SaveChanges();
             dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
             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);
+            result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
+            return result;
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions)
+        {
+            try
+            {
+                List<Models.MultiLanguage> results = new List<MultiLanguage>();
+                logger?.LogInformation("Query Question");
+                foreach (Models.Question Question in Questions)
+                {
+                    results.Add(InsertQuestion(Question));
+                }
+                return (true, results, null);
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+      
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId, List<Models.Question> Questions)
+        {
+            try
+            {
+                var questions=await questionDbContext.Questions.AsNoTracking().Where(a=>a.SurveyId == surveyId).ToListAsync();
+                if (questions != null)
+                {
+                    List<int> questionids=questions.Select(a=>a.Id).ToList();
+                    var questiontrans = await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x => questionids.Contains(x.QuestionId)).ToListAsync();
+                    if (questiontrans != null)
+                        questionDbContext.QuestionsTranslations.RemoveRange(questiontrans);
+                    questionDbContext.Questions.RemoveRange(questions);
+                    questionDbContext.SaveChanges();
+                }
+                List<Models.MultiLanguage> results = new List<MultiLanguage>();
+                logger?.LogInformation("Query Question");
+                foreach (Models.Question Question in Questions)
+                {
+                    Question.SurveyId = surveyId;
+                    results.Add(InsertQuestion(Question));
+                }
+                return (true, results, null);
             }
             catch (Exception ex)
             {
@@ -290,8 +439,11 @@ namespace DamageAssesment.Api.Questions.Providers
 
                 if (question != null)
                 {
+                    var questiontrans=await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x=>x.QuestionId== id).ToListAsync();
                     var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);
                     result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
+                    if(questiontrans!=null)
+                        questionDbContext.QuestionsTranslations.RemoveRange(questiontrans);
                     questionDbContext.Questions.Remove(question);
                     questionDbContext.SaveChanges();
                     return (true, result, $"QuestionID {id} deleted Successfuly");

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

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

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

@@ -75,8 +75,19 @@ namespace DamageAssesment.Api.Questions.Test
             return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1};
 
         }
-
-   
-
+        public static async Task<List<Questions.Models.Question>> getInputQuestionsData()
+        {
+            Models.QuestionsTranslation QuestionsTranslation = new Models.QuestionsTranslation()
+            {
+                Language = "en",
+                QuestionText = "Sample question"
+            };
+            List<Models.QuestionsTranslation> QuestionsTranslations = new List<Models.QuestionsTranslation>();
+            List<Models.Question> Questions = new List<Models.Question>();
+            QuestionsTranslations.Add(QuestionsTranslation);
+            Questions.Models.Question question = new Questions.Models.Question() { Id = 1, Questions = QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
+              Questions.Add(question);
+            return Questions;
+        }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

@@ -110,6 +110,33 @@ namespace DamageAssesment.Api.Questions.Test
 
             Assert.Equal(400, result.StatusCode);
         }
+        [Fact(DisplayName = "Post Questions - Ok case")]
+        public async Task PostQuestionsAsync_ShouldReturnStatusCode200()
+        {
+            var mockQuestionService = new Mock<IQuestionsProvider>();
+            var mockResponse = await MockData.getOkResponse();
+            var mockInputQuestion = await MockData.getInputQuestionsData();
+            mockQuestionService.Setup(service => service.PostQuestionsAsync(mockInputQuestion)).ReturnsAsync(mockResponse);
+
+            var QuestionProvider = new QuestionsController(mockQuestionService.Object);
+            var result = (OkObjectResult)await QuestionProvider.CreateQuestions(mockInputQuestion);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Post Questions - BadRequest case")]
+        public async Task PostQuestionsAsync_ShouldReturnStatusCode400()
+        {
+            var mockQuestionService = new Mock<IQuestionsProvider>();
+            var mockInputQuestion = await MockData.getInputQuestionData();
+            var mockResponse = await MockData.getBadRequestResponse();
+            mockQuestionService.Setup(service => service.UpdateQuestionAsync(mockInputQuestion)).ReturnsAsync(mockResponse);
+
+            var QuestionProvider = new QuestionsController(mockQuestionService.Object);
+            var result = (BadRequestObjectResult)await QuestionProvider.UpdateQuestion(mockInputQuestion);
+
+            Assert.Equal(400, result.StatusCode);
+        }
 
         [Fact(DisplayName = "Put Question - Ok case")]
         public async Task PutQuestionAsync_ShouldReturnStatusCode200()

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

@@ -25,17 +25,16 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
-
         [Fact(DisplayName = "Get Responses - BadRequest case")]
         public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
             Assert.Equal(400, result.StatusCode);
         }
@@ -46,7 +45,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -56,7 +55,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -70,7 +69,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -80,7 +79,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -91,7 +90,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
             mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -101,7 +100,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -113,7 +112,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
             mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -123,7 +122,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -134,7 +133,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -144,7 +143,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -155,7 +154,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -165,7 +164,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -177,7 +176,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
             Assert.Equal(200, result.StatusCode);
         }
@@ -188,7 +187,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (BadRequestObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
             Assert.Equal(400, result.StatusCode);
         }
@@ -199,7 +198,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
             Assert.Equal(200, result.StatusCode);
         }
@@ -210,7 +209,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse); ;
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (BadRequestObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
             Assert.Equal(400, result.StatusCode);
         }
@@ -221,7 +220,7 @@ namespace DamageAssesment.SurveyResponses.Test
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -231,7 +230,7 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse); ;
-            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (NotFoundResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
             Assert.Equal(404, result.StatusCode);
         }

DamageAssesmentApi/DamageAssesment.Api.Responses/Controllers/ResponsesController.cs

@@ -1,16 +1,17 @@
 using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Responses.Controllers
 {
     [ApiController]
-    public class SurveyResponsesController : ControllerBase
+    public class ResponsesController : ControllerBase
     {
         private readonly ISurveysResponse surveyResponseProvider;
         private readonly IExcelExportService excelExportService;
 
-        public SurveyResponsesController(ISurveysResponse surveyResponseProvider, IExcelExportService excelExportService)
+        public ResponsesController(ISurveysResponse surveyResponseProvider, IExcelExportService excelExportService)
         {
             this.surveyResponseProvider = surveyResponseProvider;
             this.excelExportService = excelExportService;
@@ -19,6 +20,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// GET request for retrieving survey responses.
         /// </summary>
 
+        [Authorize(Roles = "admin,survey,user,report")]
         [Route("responses/{employeeid:int}")]
         [Route("responses")]
         [HttpGet]
@@ -38,6 +40,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <summary>
         /// GET request for retrieving survey responses by survey ID.
         /// </summary>
+        [Authorize(Roles = "admin,survey,user,report")]
         [Route("responses/bysurvey/{surveyid:int}/{employeeid:int}")]
         [Route("responses/bysurvey/{surveyid:int}")]
         [HttpGet]
@@ -56,6 +59,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <param name="surveyid">The ID of the survey for which responses are to be retrieved.</param>
         /// <param name="locationid">The ID of the location for which responses are to be retrieved.</param>
 
+        [Authorize(Roles = "admin,survey,user,report")]
         [Route("responses/{surveyid:int}/{locationid:int}/{employeeid:int}")]
         [Route("responses/{surveyid:int}/{locationid:int}")]
         [HttpGet]
@@ -75,6 +79,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <param name="questionId">The ID of the question for which responses are to be retrieved.</param>
         /// <param name="answer">The answer for which responses are to be retrieved.</param>
 
+        [Authorize(Roles = "admin,survey,user,report")]
         [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}/{employeeid:int}")]
         [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}")]
         [HttpGet]
@@ -93,6 +98,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// </summary>
         /// <param name="surveyId">The ID of the survey for which answers are to be retrieved.</param>
 
+        [Authorize(Roles = "admin,survey,user,report")]
         [Route("responses/byregion/{surveyid:int}")]
         [Route("responses/byregion/{surveyid:int}/{employeeid}")]
         [HttpGet]
@@ -109,6 +115,7 @@ 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")]
         [Route("responses/bymaintenancecenter/{surveyid:int}/{employeeid:int}")]
         [Route("responses/bymaintenancecenter/{surveyid:int}")]
         [HttpGet]
@@ -126,6 +133,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// </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)
         {
@@ -142,6 +150,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// </summary>
         /// <param name="surveyResponse">The survey response object to be created.</param>
 
+        [Authorize(Roles = "admin,survey,user,report")]
         [HttpPost("responses")]
         public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse)
         {
@@ -158,6 +167,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <param name="Id">The ID of the survey response to be updated.</param>
         /// <param name="surveyResponse">The updated survey response object.</param>
 
+        [Authorize(Roles = "admin,survey,user,report")]
         [HttpPut("responses/{id}")]
         public async Task<ActionResult> PutSurveyResponseAsync(int id, Models.SurveyResponse surveyResponse)
         {
@@ -175,6 +185,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// 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)
         {
@@ -190,6 +201,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// </summary>
         /// <param name="request">The answers to be submitted for the survey.</param>
 
+        [Authorize(Roles = "admin,survey,user,report")]
         [HttpPost("responses/answers")]
         public async Task<ActionResult> PostSurveyAnswersAsync(Request request)
         {
@@ -203,6 +215,8 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <summary>
         /// Get All active surveys .
         /// </summary>
+
+        [Authorize(Roles = "admin,survey,user,report")]
         [Route("responses/surveys/active")]
         [Route("responses/surveys/active/{language:alpha}")]
         [Route("responses/surveys/active/{employeeid:int}")]
@@ -220,6 +234,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <summary>
         /// Export all survey response data based on survey id.
         /// </summary>
+        [Authorize(Roles = "admin,survey,user,report")]
         [HttpGet]
         [Route("responses/surveys/export/{surveyid}")]
         public async Task<ActionResult> GetExcelSurveysAsync(int surveyid, string language, bool IsAdmin = false)
@@ -250,6 +265,7 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <summary>
         /// Get all historical surveys .
         /// </summary>
+        [Authorize(Roles = "admin,survey,user,report")]
         [Route("responses/surveys/historic")]
         [Route("responses/surveys/historic/{language:alpha}")]
         [Route("responses/surveys/historic/{employeeid:int}")]

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

@@ -5,8 +5,6 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,7 +14,6 @@
     <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.19.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>

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

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

DamageAssesmentApi/DamageAssesment.Api.Responses/Dockerfile

@@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj", "DamageAssesment.Api.Responses/"]
-RUN dotnet restore "DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Responses"
-RUN dotnet build "DamageAssesment.Api.Responses.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Responses.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Responses.dll"]

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

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

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

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

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

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

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

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

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

@@ -4,6 +4,6 @@ namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface ILocationServiceProvider
     {
-        Task<List<Location>> getLocationsAsync();
+        Task<List<Location>> getLocationsAsync(string token);
     }
 }

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

@@ -4,9 +4,9 @@ namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface IQuestionServiceProvider
     {
-        Task<List<Question>> getQuestionsAsync(string language);
-        Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId);
-        Task<Question> getQuestionsAsync(int questionId);
-        Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language);
+        Task<List<Question>> getQuestionsAsync(string language,string token);
+        Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId, string token);
+        Task<Question> getQuestionsAsync(int questionId, string token);
+        Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language, string token);
     }
 }

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

@@ -4,6 +4,6 @@ namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface IRegionServiceProvider
     {
-        Task<List<Region>> getRegionsAsync();
+        Task<List<Region>> getRegionsAsync(string token);
     }
 }

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

@@ -4,7 +4,7 @@ namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface ISurveyServiceProvider
     {
-        Task<List<Survey>> getSurveysAsync(string language);
-        Task<Survey> getSurveyAsync(int surveyId);
+        Task<List<Survey>> getSurveysAsync(string language,string token);
+        Task<Survey> getSurveyAsync(int surveyId,string token);
     }
 }

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

@@ -11,6 +11,6 @@ namespace DamageAssesment.Api.Responses.Models
         public string OfficePhoneNumber { get; set; }
         public string Email { get; set; }
         public bool IsActive { get; set; }
-        public string? PreferredLanguage { get; set; }
+        public string PreferredLanguage { get; set; }
     }
 }

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

@@ -5,6 +5,7 @@
         public int CategoryId { get; set; }
         public string CategoryName { get; set; }
         public string CategoryImage { get; set; }
+        public object CategoryNames { get; set; }
         public List<Question> Questions { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs

@@ -5,6 +5,10 @@ using DamageAssesment.Api.Responses.Providers;
 using Microsoft.EntityFrameworkCore;
 using Polly;
 using System.Reflection;
+using Microsoft.OpenApi.Models;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.IdentityModel.Tokens;
+using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
 const int maxApiCallRetries = 3;
@@ -14,6 +18,24 @@ const int intervalForCircuitBraker = 5; //5 seconds
 
 
 // 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
@@ -26,6 +48,7 @@ builder.Services.AddScoped<IQuestionServiceProvider, QuestionServiceProvider>();
 builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
 builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>();
 builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>();
+builder.Services.AddHttpContextAccessor();
 builder.Services.AddScoped<IExcelExportService, ExcelExportService>();
 
 builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
@@ -36,12 +59,40 @@ builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-builder.Services.AddSwaggerGen(c =>
+
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    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);
 });
 builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
 {
@@ -56,6 +107,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

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

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

@@ -2,6 +2,7 @@
 using DamageAssesment.Api.Responses.Db;
 using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
+using DamageAssesment.Api.Responses.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System.Reflection;
@@ -21,8 +22,10 @@ namespace DamageAssesment.Api.Responses.Providers
         private readonly IQuestionServiceProvider questionServiceProvider;
         private readonly ISurveyServiceProvider surveyServiceProvider;
         private readonly IMapper mapper;
+        private readonly IHttpContextAccessor httpContextAccessor;
+        private string token;
 
-        public SurveyResponsesProvider(SurveyResponseDbContext surveyResponseDbContext, ILogger<SurveyResponsesProvider> logger, IAnswerServiceProvider answerServiceProvider, IRegionServiceProvider regionServiceProvider, ILocationServiceProvider locationServiceProvider, IEmployeeServiceProvider employeeServiceProvider, IAttachmentServiceProvider attachmentServiceProvider, IQuestionServiceProvider questionServiceProvider, ISurveyServiceProvider surveyServiceProvider, IMapper mapper)
+        public SurveyResponsesProvider(SurveyResponseDbContext surveyResponseDbContext, ILogger<SurveyResponsesProvider> logger, IAnswerServiceProvider answerServiceProvider, IRegionServiceProvider regionServiceProvider, ILocationServiceProvider locationServiceProvider, IEmployeeServiceProvider employeeServiceProvider, IAttachmentServiceProvider attachmentServiceProvider, IQuestionServiceProvider questionServiceProvider, ISurveyServiceProvider surveyServiceProvider, IMapper mapper, IHttpContextAccessor httpContextAccessor)
         {
             this.surveyResponseDbContext = surveyResponseDbContext;
             this.logger = logger;
@@ -33,8 +36,20 @@ namespace DamageAssesment.Api.Responses.Providers
             this.attachmentServiceProvider = attachmentServiceProvider;
             this.questionServiceProvider = questionServiceProvider;
             this.surveyServiceProvider = surveyServiceProvider;
+            this.httpContextAccessor = httpContextAccessor;
             this.mapper = mapper;
             SeedData();
+
+            token = httpContextAccessor.HttpContext.Request.Headers.Authorization;
+            if (token != null)
+            {
+                token = token.Replace("Bearer ", string.Empty);
+            }
+            else
+            {
+                token = "";
+            }
+            // seedData();
         }
 
         public void SeedData()
@@ -56,16 +71,20 @@ namespace DamageAssesment.Api.Responses.Providers
             try
             {
                 logger?.LogInformation("Querying to get SurveyResponse object from DB");
-                IQueryable<Db.SurveyResponse> listSurveyResponse = null;
+                List<Db.SurveyResponse> listSurveyResponse = null;
                 if (employeeid == 0)
                 {
-                    listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId);
+                    listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId).ToList();
                 }
                 else
                 {
-                    listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid);
+                    listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid).ToList();
                 }
-
+                listSurveyResponse = listSurveyResponse
+               .OrderByDescending(obj => obj.Id)
+               .GroupBy(obj => new { obj.SurveyId,  obj.LocationId })//obj.EmployeeId,
+               .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
+               .ToList();
                 if (listSurveyResponse.Any())
                 {
                     var answers = await getAnswersByRegionAndSurveyIdAsync(listSurveyResponse);
@@ -120,7 +139,7 @@ namespace DamageAssesment.Api.Responses.Providers
             {
                 logger?.LogInformation("Querying to get SurveyResponse object from DB");
                 //get all the survey that already taken by the employee
-                var surveys = await surveyServiceProvider.getSurveysAsync(language);
+                var surveys = await surveyServiceProvider.getSurveysAsync(language,token);
                 surveys = surveys.Where(s => s.IsEnabled == true && s.Status == SurveyStatus.ACTIVE.ToString()).ToList();
                 if (employeeid == null || employeeid == 0)
                     return (true, surveys, null);
@@ -141,7 +160,7 @@ namespace DamageAssesment.Api.Responses.Providers
             {
                 logger?.LogInformation("Querying to get SurveyResponse object from DB");
 
-                var surveys = await surveyServiceProvider.getSurveysAsync(language);
+                var surveys = await surveyServiceProvider.getSurveysAsync(language, token);
                 // returning only historic data: end date is less than current date.
                 surveys = surveys.Where(s => s.Status == SurveyStatus.INACTIVE.ToString()).ToList();
                 if (employeeid == null || employeeid == 0)
@@ -166,7 +185,7 @@ namespace DamageAssesment.Api.Responses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
 
                 if (survey != null)
                 {
@@ -197,7 +216,7 @@ namespace DamageAssesment.Api.Responses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
 
                 if (survey != null)
                 {
@@ -228,7 +247,7 @@ namespace DamageAssesment.Api.Responses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
 
                 if (survey != null)
                 {
@@ -259,8 +278,8 @@ namespace DamageAssesment.Api.Responses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
-                var question = await questionServiceProvider.getQuestionsAsync(questionId);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
+                var question = await questionServiceProvider.getQuestionsAsync(questionId, token);
                 bool IsCorrectAnswer = answer.ToLower().Equals("yes") || answer.ToLower().Equals("no") ? true : false;
 
 
@@ -417,11 +436,11 @@ namespace DamageAssesment.Api.Responses.Providers
         }
 
         //Method to get Answers by region with surveyId as input parameter
-        private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(IQueryable<Db.SurveyResponse> surveyResponses)
+        private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(List<Db.SurveyResponse> surveyResponses)
         {
             try
             {
-                var answersList = await answerServiceProvider.getAnswersAsync();
+                var answersList = await answerServiceProvider.getAnswersAsync(token);
                 if (answersList == null || !answersList.Any())
                     return null;
 
@@ -444,8 +463,8 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (surveyAnswers == null || !surveyAnswers.Any())
                     return null;
 
-                var regions = await regionServiceProvider.getRegionsAsync();
-                var locations = await locationServiceProvider.getLocationsAsync();
+                var regions = await regionServiceProvider.getRegionsAsync(token);
+                var locations = await locationServiceProvider.getLocationsAsync(token);
 
                 if (regions == null || !regions.Any() || locations == null || !locations.Any())
                     return null;
@@ -507,11 +526,11 @@ namespace DamageAssesment.Api.Responses.Providers
         {
             try
             {
-                var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId);
-                var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id);
-                var allQuestions = await questionServiceProvider.getQuestionsAsync(null);
+                var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId, token);
+                var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id, token);
+                var allQuestions = await questionServiceProvider.getQuestionsAsync(null,token);
                 var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
 
                 var result = new
                 {
@@ -556,24 +575,26 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (employeeid == 0)
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync();
+                    employees = await employeeServiceProvider.getEmployeesAsync(token);
                 }
                 else
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
+                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token);
                 }
+                surveyResonses = surveyResonses
+                .OrderByDescending(obj => obj.Id)
+                .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//obj.EmployeeId,
+                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
+                .ToList();
 
-                var answers = await answerServiceProvider.getAnswersAsync();
-                var questions = await questionServiceProvider.getQuestionsAsync(null);
+                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var questions = await questionServiceProvider.getQuestionsAsync(null, token);
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
 
                 //var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId);
 
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
-
-                if (employeeid == 0)
-                {
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
                 var result = from r in surveyResonses
                              select new
                              {
@@ -601,41 +622,6 @@ namespace DamageAssesment.Api.Responses.Providers
                              };
                 return result;
             }
-                else
-                {
-                    object _employee = new { };
-                    if (employee != null)
-                    {
-                        _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
-                    }
-                    var result = from r in surveyResonses
-                                 select new
-                                 {
-                                     r.Id,
-                                     r.SurveyId,
-                                     r.LocationId,
-                                     r.EmployeeId,
-                                     r.ClientDevice,
-                                     r.KeyAnswerResult,
-                                     r.Longitute,
-                                     r.Latitude,
-                                     Employee = _employee,
-                                     answers = from ans in answers
-                                               where ans.SurveyResponseId == r.Id
-                                               select new
-                                               {
-                                                   ans.Id,
-                                                   ans.QuestionId,
-                                                   ans.AnswerText,
-                                                   ans.Comment,
-                                                   Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
-                                                   Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
-                                               }
-                                 };
-
-                    return result;
-                }
-            }
             catch (Exception ex)
             {
                 logger?.LogError($"Exception Found : {ex.Message} - Ref: SurveyResponsesProvider.getSurveyResponseBySurveyIdAsync()");
@@ -656,12 +642,12 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (employeeid == 0)
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync();
+                    employees = await employeeServiceProvider.getEmployeesAsync(token);
                 }
                 else
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
+                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token);
 
                     if (employee != null)
                     {
@@ -670,9 +656,9 @@ namespace DamageAssesment.Api.Responses.Providers
                 }
 
 
-                var answers = await answerServiceProvider.getAnswersAsync();
-                var questions = await questionServiceProvider.getQuestionsAsync(null);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var questions = await questionServiceProvider.getQuestionsAsync(null,token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
 
                 var result = from r in surveyResonses
                              select new
@@ -699,8 +685,6 @@ namespace DamageAssesment.Api.Responses.Providers
                                            }
                              };
                 return result;
-
-
             }
             catch (Exception ex)
             {
@@ -716,12 +700,12 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (string.IsNullOrEmpty(language)) language = "en";
                 List<Db.SurveyResponse> surveyResonses;
                 surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(a => a.SurveyId == surveyId).ToListAsync();
-                var answers = await answerServiceProvider.getAnswersAsync();
-                var Locations = await locationServiceProvider.getLocationsAsync();
-                var regions = await regionServiceProvider.getRegionsAsync();
-                var questions = await questionServiceProvider.getQuestionsAsync(language);
-                var categories = await questionServiceProvider.GetQuestionCategoriesAsync(language);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var Locations = await locationServiceProvider.getLocationsAsync(token);
+                var regions = await regionServiceProvider.getRegionsAsync(token);
+                var questions = await questionServiceProvider.getQuestionsAsync(language, token);
+                var categories = await questionServiceProvider.GetQuestionCategoriesAsync(language, token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
                 List<object> questionLists = new List<object>();
                 var allques = from res in surveyResonses
                               join loc in Locations on res.LocationId equals loc.Id
@@ -853,8 +837,8 @@ namespace DamageAssesment.Api.Responses.Providers
                 {
                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
                 }
-                var answers = await answerServiceProvider.getAnswersAsync();
-                var locations = await locationServiceProvider.getLocationsAsync();
+                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var locations = await locationServiceProvider.getLocationsAsync(token);
                 var maintenanceCenters = locations.DistinctBy(m => m.MaintenanceCenter);
 
                 //get all the answers for the particular survey
@@ -920,23 +904,27 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (employeeid == 0)
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.LocationId == locationId).ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync();
+                    employees = await employeeServiceProvider.getEmployeesAsync(token);
                 }
                 else
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid && x.LocationId == locationId).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
+                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token);
 
                     if (employee != null)
                     {
                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
                     }
                 }
-
-                var answers = await answerServiceProvider.getAnswersAsync();
-                var questions = await questionServiceProvider.getQuestionsAsync(null);
+                surveyResonses = surveyResonses
+                .OrderByDescending(obj => obj.Id)
+                .GroupBy(obj => new { obj.SurveyId,  obj.LocationId }) //obj.EmployeeId,
+                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
+                .ToList();
+                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var questions = await questionServiceProvider.getQuestionsAsync(null,token);
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
 
                 var result = from r in surveyResonses
                              select new
@@ -949,7 +937,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                                 Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
 
@@ -964,7 +952,6 @@ namespace DamageAssesment.Api.Responses.Providers
                                            }
                              };
                 return result;
-
             }
             catch (Exception ex)
             {
@@ -987,23 +974,27 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (employeeid == 0)
                 {
                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync();
+                    employees = await employeeServiceProvider.getEmployeesAsync(token);
                 }
                 else
                 {
                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id && x.EmployeeId == employeeid).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
+                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token);
 
                     if (employee != null)
                     {
                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
                     }
                 }
-
+                surveyResponses = surveyResponses
+                .OrderByDescending(obj => obj.Id)
+                .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//, obj.EmployeeId
+                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
+                .ToList();
                 //var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync();
                 // var employees = await employeeServiceProvider.getEmployeesAsync();
-                var answers = await answerServiceProvider.getAnswersAsync();
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
 
                 var result = from r in surveyResponses
                              select new
@@ -1016,7 +1007,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                                 Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
                                            && ans.QuestionId == question.Id
@@ -1046,12 +1037,12 @@ namespace DamageAssesment.Api.Responses.Providers
         {
             if (answerRequest != null)
             {
-                var answer = await answerServiceProvider.PostAnswersAsync(new Models.Answer { QuestionId = answerRequest.QuestionId, AnswerText = answerRequest.AnswerText, Comment = answerRequest.Comment, SurveyResponseId = surveyResponseId });
+                var answer = await answerServiceProvider.PostAnswersAsync(new Models.Answer { QuestionId = answerRequest.QuestionId, AnswerText = answerRequest.AnswerText, Comment = answerRequest.Comment, SurveyResponseId = surveyResponseId }, token);
                 if (answer != null)
                 {
                     List<AnswerInfo> listAnswerInfo = new List<AnswerInfo>();
                     listAnswerInfo.Add(new AnswerInfo { AnswerId = answer.Id, postedFiles = answerRequest.PostedFiles });
-                    var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo });
+                    var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo }, token);
 
                     string message = $"Answer for question {answerRequest.QuestionId} saved to the database";
                     logger?.LogInformation(message);
@@ -1072,7 +1063,6 @@ namespace DamageAssesment.Api.Responses.Providers
             }
         }
 
-
         public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.Request request)
         {
             try

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

@@ -1,5 +1,6 @@
 using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
+using Microsoft.Extensions.Primitives;
 using Newtonsoft.Json;
 
 
@@ -10,11 +11,11 @@ namespace DamageAssesment.Api.Responses.Services
         public AnswerServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<AnswerServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Answer"), configuration.GetValue<string>("EndPointSettings:AnswerUrlBase"))
         {
         }
-        public async Task<List<Answer>> getAnswersAsync()
+        public async Task<List<Answer>> getAnswersAsync(string token)
         {
             try
             {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                 var answers = JsonConvert.DeserializeObject<List<Answer>>(responseJsonString);
 
                 if (answers == null || !answers.Any())
@@ -28,12 +29,12 @@ namespace DamageAssesment.Api.Responses.Services
             }
         }
 
-        public async Task<List<Answer>> GetAnswersByResponseIdAsync(int responseId)
+        public async Task<List<Answer>> GetAnswersByResponseIdAsync(int responseId, string token)
         {
             try
             {
                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:AnswerByResponse"), responseId);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
                 var answers = JsonConvert.DeserializeObject<List<Answer>>(responseJsonString);
 
                 if (answers == null || !answers.Any())
@@ -47,12 +48,12 @@ namespace DamageAssesment.Api.Responses.Services
             }
         }
 
-        public async Task<Answer> PostAnswersAsync(Answer answer)
+        public async Task<Answer> PostAnswersAsync(Answer answer, string token )
         {
             try
             {
                 var requestJsonString = JsonConvert.SerializeObject(answer);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString, token);
                 var answers = JsonConvert.DeserializeObject<Answer>(responseJsonString);
 
                 if (answers == null)

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

@@ -10,11 +10,11 @@ namespace DamageAssesment.Api.Responses.Services
         {
         }
 
-        public async Task<List<Attachment>> getAttachmentsAsync()
+        public async Task<List<Attachment>> getAttachmentsAsync(string token)
         {
             try
             {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
                 var attachments = JsonConvert.DeserializeObject<List<Attachment>>(responseJsonString);
 
                 if (attachments == null || !attachments.Any())
@@ -28,12 +28,12 @@ namespace DamageAssesment.Api.Responses.Services
             }
         }
 
-        public async Task<IEnumerable<Attachment>> PostAttachmentsAsync(AttachmentInfo attachmentInfo)
+        public async Task<IEnumerable<Attachment>> PostAttachmentsAsync(AttachmentInfo attachmentInfo, string token)
         {
             try
             {
                 var requestJsonString = JsonConvert.SerializeObject(attachmentInfo);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString, token);
                 var attachments = JsonConvert.DeserializeObject<IEnumerable<Attachment>>(responseJsonString);
 
                 if (attachments == null)

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

@@ -1,4 +1,4 @@
-using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Newtonsoft.Json;
@@ -11,11 +11,11 @@ namespace DamageAssesment.Api.Responses.Services
         {
         }
 
-        public async Task<List<Employee>> getEmployeesAsync()
+        public async Task<List<Employee>> getEmployeesAsync(string token)
         {
             try
             {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                 var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString);
 
                 if (employees == null || !employees.Any())
@@ -29,12 +29,12 @@ namespace DamageAssesment.Api.Responses.Services
             }
         }
 
-        public async Task<Employee> getEmployeeAsync(int employeeId)
+        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);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                 var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString);
 
                 if (employee == null)

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

@@ -1,4 +1,5 @@
-using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Models;
 using System.Net.Http.Headers;
 using System.Text;
 
@@ -14,20 +15,18 @@ namespace DamageAssesment.Api.Responses.Services
             this.httpClient = httpClient;
             this.logger = logger;
         }
-        public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput)
+        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);
+                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();

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

@@ -10,11 +10,11 @@ namespace DamageAssesment.Api.Responses.Services
         {
         }
 
-        public async Task<List<Location>> getLocationsAsync()
+        public async Task<List<Location>> getLocationsAsync(string token)
         {
             try
             {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                 var locations = JsonConvert.DeserializeObject<List<Location>>(responseJsonString);
 
                 if (locations == null || !locations.Any())