Group by issue in responses

fixed region issue
added survey start and end date validation
2024-01-22 12:17:34 -05:00 · 2024-01-18 11:44:13 -05:00 · 2023-12-13 17:11:51 -05:00 · 2023-12-12 17:13:44 -05:00 · 2023-12-12 13:40:27 -05:00 · 2023-12-04 14:52:24 -05:00
112 changed files with 587 additions and 1941 deletions
--- a/.vs/Backend-API-Services/v17/.wsuo
+++ b/.vs/Backend-API-Services/v17/.wsuo
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@ -1,7 +0,0 @@
-{
-  "ExpandedNodes": [
-    ""
-  ],
-  "SelectedNode": "\\DamageAssesment.sln",
-  "PreviewInSolutionExplorer": false
-}
--- a/DamageAssesmentApi/.dockerignore
+++ b/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
--- a/DamageAssesmentApi/.gitignore
+++ b/DamageAssesmentApi/.gitignore
@ -395,5 +395,4 @@ FodyWeavers.xsd
 *.msp

 # JetBrains Rider
-*.sln.iml
-**/migrations/
+*.sln.iml
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj
@ -1,25 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" 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>

--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Db/AnswerDbContext.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Db/AnswerDbContext.cs
@ -1,19 +1,13 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;

 namespace DamageAssesment.Api.Answers.Db
 {
    public class AnswerDbContext:DbContext
    {
-        private IConfiguration _Configuration { get; set; }
-        public AnswerDbContext(DbContextOptions options,IConfiguration configuration):base(options) 
+
+        public AnswerDbContext(DbContextOptions options):base(options) 
        {
-            _Configuration= configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("AnswerConnection"));
+            
        }
        public DbSet<Db.Answer> Answers { get; set; }
        protected override void OnModelCreating(ModelBuilder modelBuilder)
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Dockerfile
+++ b/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"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs
@ -9,10 +9,6 @@ using System.Reflection;
 using System.Text;

 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
 {
@ -77,7 +73,7 @@ builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AnswerDbContext>(option =>
 {
-    option.UseSqlServer("AnswerConnection");
+    option.UseInMemoryDatabase("Answers");
 });

 var app = builder.Build();
@ -89,7 +85,6 @@ if (app.Environment.IsDevelopment())
    app.UseSwagger();
    app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();

--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Properties/launchSettings.json
+++ b/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"
+      }
+    }
  }
-}
+}
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Providers/AnswerProvider.cs
@ -198,12 +198,13 @@ namespace DamageAssesment.Api.Answers.Providers
        {
            if (!answerDbContext.Answers.Any())
            {
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 });
+                // Uncomment the lines below to add more initial data if needed
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
                answerDbContext.SaveChanges();
            }
        }
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.json
@ -8,10 +8,5 @@
      "Microsoft.AspNetCore": "Warning"
    }
  },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "AnswerConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments.Test/AttachmentsServiceTest.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments.Test/AttachmentsServiceTest.cs
@ -79,8 +79,8 @@ namespace DamageAssesment.Api.Attachments.Test
            var mockInputAttachment = await MockData.getInputAttachmentData();
            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);

-            var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await AttachmentProvider.UploadAttachmentAsync(AttachmentResponse);
+            var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);            
+            var result = (NoContentResult) await AttachmentProvider.UploadAttachmentAsync(AttachmentResponse);

            Assert.Equal(204, result.StatusCode);
        }
@ -95,8 +95,8 @@ namespace DamageAssesment.Api.Attachments.Test
            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);

            var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
-            AttachmentInfo attachmentInfo = new AttachmentInfo();
-            var result = (BadRequestObjectResult)await AttachmentProvider.UploadAttachmentAsync(attachmentInfo);
+            AttachmentInfo attachmentInfo=new AttachmentInfo();
+            var result = (BadRequestObjectResult) await AttachmentProvider.UploadAttachmentAsync(attachmentInfo);

            Assert.Equal(400, result.StatusCode);
        }
@ -112,7 +112,7 @@ namespace DamageAssesment.Api.Attachments.Test
            mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);

            var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await AttachmentProvider.UpdateAttachmentAsync(AttachmentResponse);
+            var result = (NoContentResult) await AttachmentProvider.UpdateAttachmentAsync(AttachmentResponse);

            Assert.Equal(204, result.StatusCode);
        }
@ -128,7 +128,7 @@ namespace DamageAssesment.Api.Attachments.Test

            var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
            AttachmentInfo attachmentInfo = new AttachmentInfo();
-            var result = (BadRequestObjectResult)await AttachmentProvider.UpdateAttachmentAsync(attachmentInfo);
+            var result = (BadRequestObjectResult) await AttachmentProvider.UpdateAttachmentAsync(attachmentInfo);

            Assert.Equal(400, result.StatusCode);
        }
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Controllers/AttachmentsController.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Controllers/AttachmentsController.cs
@ -13,12 +13,11 @@ namespace DamageAssesment.Api.Attachments.Controllers
    {
        private IAttachmentsProvider AttachmentProvider;
        private IUploadService UploadService;
-        private IAzureBlobService azureBlobService;

-        public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService UploadService)
+        public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService uploadService)
        {
            this.AttachmentProvider = AttachmentsProvider;
-            this.UploadService = UploadService;
+            this.UploadService = uploadService;  
        }
        /// <summary>
        /// Get all attachments.
@ -92,7 +91,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                if (attachmentInfo.Answers.Count > 0)
                {
                    var Attachments =  await this.AttachmentProvider.GetAttachmentCounter();
-                    List<Models.Attachment> attachments =  UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
+                    List<Models.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
                    var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments);
                    if (result.IsSuccess)
                    {
@ -121,7 +120,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                    var res =  await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
                    if (res.IsSuccess)
                    {
-                        List<Models.Attachment> attachments =  UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
+                        List<Models.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
                        var result = await this.AttachmentProvider.PutAttachmentAsync(attachments);
                        if (result.IsSuccess)
                        {
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj
+++ b/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>
@ -14,20 +12,8 @@
    <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" Version="7.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <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>

--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Db/AttachmentsDbContext.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Db/AttachmentsDbContext.cs
@ -1,19 +1,11 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;

 namespace DamageAssesment.Api.Attachments.Db
 {
    public class AttachmentsDbContext:DbContext
    {
-        private IConfiguration _Configuration { get; set; }
-        public AttachmentsDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
+        public AttachmentsDbContext(DbContextOptions options) : base(options)
        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("AttachmentConnection"));
        }
        public DbSet<Db.Attachment> Attachments { get; set; }
        protected override void OnModelCreating(ModelBuilder modelBuilder)
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Dockerfile
+++ b/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"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Interfaces/IAzureBlobService.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Interfaces/IAzureBlobService.cs
@ -1,15 +1,10 @@
 using Azure.Storage.Blobs.Models;
-using DamageAssesment.Api.Attachments.Models;

 namespace DamageAssesment.Api.Attachments.Interfaces
 {
    public interface IAzureBlobService
    {
        Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files);
-        Task<List<Attachment>> UploadAttachment(int responseId, int answerId, int counter, List<IFormFile> postedFile);
-        Task<List<Attachment>> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
-        Task<List<Attachment>> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
-        void Deletefile(string path);
-        void Movefile(string path);
+        void DeleteFile(string path);
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs
@ -11,11 +11,7 @@ using System.Reflection;
 using System.Text;

 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-
 builder.Services.AddAuthentication(item =>
 {
    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@ -82,7 +78,7 @@ builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AttachmentsDbContext>(option =>
 {
-    option.UseSqlServer("AttachmentConnection");
+    option.UseInMemoryDatabase("Attachments");
 });
 builder.Services.Configure<FormOptions>(o =>
 {
@ -99,7 +95,7 @@ if (app.Environment.IsDevelopment())
    app.UseSwagger();
    app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 app.UseHttpsRedirection();
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Properties/launchSettings.json
+++ b/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"
+      }
+    }
  }
-}
+}
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Providers/AttachmentsProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Providers/AttachmentsProvider.cs
@ -25,7 +25,7 @@ namespace DamageAssesment.Api.Attachments.Providers
            this.httpContextAccessor = httpContextAccessor;
            baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
            baseUrl = baseUrl + "/attachments/download";
-           // SeedData();
+            SeedData();
        }
        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
        {
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Providers/AzureBlobService.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Providers/AzureBlobService.cs
@ -3,9 +3,6 @@ using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs.Specialized;
 using DamageAssesment.Api.Attachments.Interfaces;
-using DamageAssesment.Api.Attachments.Models;
-using System.Diagnostics.Metrics;
-using System.Text;

 namespace DamageAssesment.Api.Attachments.Providers
 {
@ -13,95 +10,11 @@ namespace DamageAssesment.Api.Attachments.Providers
    {
        BlobServiceClient _blobClient;
        BlobContainerClient _containerClient;
-        string azureConnectionString;
-        private string uploadpath = "";
-        private string Deletepath = "";
-        public AzureBlobService(IConfiguration configuration)
+        string azureConnectionString = "<Primary Connection String>";
+        public AzureBlobService()
        {
-            uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
-            Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
-            _blobClient = new BlobServiceClient(configuration.GetValue<string>("Fileupload:BlobConnectionString"));
-            _containerClient = _blobClient.GetBlobContainerClient(configuration.GetValue<string>("Fileupload:BlobContainerName"));
-        }
-        public async Task<List<Attachment>> UploadAttachment(int responseId, int answerId, int counter, List<IFormFile> postedFile)
-        {
-            var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
-            String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
-            List<Models.Attachment> attachments = new List<Models.Attachment>();
-            foreach (IFormFile item in postedFile)
-            {
-
-                counter++;
-                var UserfileName = Path.GetFileName(item.FileName);
-                var extension = System.IO.Path.GetExtension(UserfileName);
-                var fileName = String.Format("Attachment_{0}{1}", counter, extension);
-                var stream = item.OpenReadStream();
-                BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
-                string dbPath = fullDirectoryPath + "/" + fileName;
-                var result = await client.UploadAsync(stream, true);
-                attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
-            }
-            return attachments;
-        }
-        public async Task<List<Attachment>> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers)
-        {
-            List<Models.Attachment> attachments = new List<Models.Attachment>();
-            try
-            {
-                foreach (var item in answers)
-                {
-                    int answerId = item.AnswerId;
-                    var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
-                    String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
-                    foreach (var file in item.postedFiles)
-                    {
-                        counter++;
-
-                        var UserfileName = Path.GetFileName(file.FileName);
-                        var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
-                        byte[] byteArray = Convert.FromBase64String(file.FileContent);
-                        MemoryStream stream = new MemoryStream(byteArray);
-                        BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
-                        string dbPath = fullDirectoryPath + "/" + fileName;
-                        var result = await client.UploadAsync(stream, true);
-                        attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
-                    }
-                }
-                return attachments;
-            }
-            catch (Exception ex)
-            {
-                return new List<Models.Attachment>();
-            }
-
-
-        }
-        public async Task<List<Attachment>> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments)
-        {
-            List<Models.Attachment> Dbattachments = new List<Models.Attachment>();
-            foreach (Models.Attachment searchFile in attachments)
-            {
-                Movefile(searchFile.URI);
-            }
-            foreach (var item in answers)
-            {
-                int answerId = item.AnswerId;
-                var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
-                String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
-                foreach (var file in item.postedFiles)
-                {
-                    Models.Attachment attachment = attachments.Where(a => a.Id == file.AttachmentId).FirstOrDefault();
-                    var UserfileName = Path.GetFileName(file.FileName);
-                    var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
-                    byte[] byteArray = Convert.FromBase64String(file.FileContent);
-                    MemoryStream stream = new MemoryStream(byteArray);
-                    BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
-                    string dbPath = fullDirectoryPath + "/" + fileName;
-                    var result = await client.UploadAsync(stream, true);
-                    Dbattachments.Add(new Models.Attachment { Id = attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
-                }
-            }
-            return Dbattachments;
+            _blobClient = new BlobServiceClient(azureConnectionString);
+            _containerClient = _blobClient.GetBlobContainerClient("apiimages");
        }

        public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
@ -122,52 +35,10 @@ namespace DamageAssesment.Api.Attachments.Providers

            return azureResponse;
        }
-        public string getMovefilename(string movefilename)
+        public void DeleteFile(string url)
        {
-            var list = movefilename.Split('.');
-            if (list.Length > 0)
-                list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") + "_" + DateTime.Now.ToShortTimeString().Replace("/", "_") + "." + list[list.Length - 1];
-            return string.Join("_", list);
-        }
-        public void Movefile(string path)
-        {
-            try
-            {
-                if (path != "")
-                {
-                    string MovePath = getMovefilename(path.Replace(uploadpath, Deletepath));
-                    // Get references to the source and destination blobs
-                    BlobClient sourceBlobClient = _containerClient.GetBlobClient(path);
-                    BlobClient destinationBlobClient = _containerClient.GetBlobClient(MovePath);
-                    // Start the copy operation from the source to the destination
-                    destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri);
-
-                    // Check if the copy operation completed successfully
-                    WaitForCopyToComplete(destinationBlobClient);
-
-                    // Delete the source blob after a successful copy
-                    sourceBlobClient.DeleteIfExists();
-                }
-            }
-            catch (Exception ex)
-            {
-
-            }
-        }
-        static void WaitForCopyToComplete(BlobClient blobClient)
-        {
-            BlobProperties properties = blobClient.GetProperties();
-
-            while (properties.CopyStatus == CopyStatus.Pending)
-            {
-                Task.Delay(TimeSpan.FromSeconds(1));
-                properties = blobClient.GetProperties();
-            }
-        }
-        public void Deletefile(string url)
-        {
-            BlobClient sourceBlobClient = _containerClient.GetBlobClient(url);
-            sourceBlobClient.DeleteIfExists();
+            var blob = _containerClient.GetBlockBlobClient(url);
+            blob.DeleteIfExists();
        }
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json
@ -11,14 +11,6 @@
  "AllowedHosts": "*",
  "Fileupload": {
    "folderpath": "DMS_Attachments/Active",
-    "Deletepath": "DMS_Attachments/Deleted",
-    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
-    "BlobContainerName": "doculinks"
-  },
-  "ConnectionStrings": {
-    //"AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "AttachmentConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
+    "Deletepath": "DMS_Attachments/Deleted"
  }
 }
-  
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj
+++ b/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>
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DoculinkServiceTest.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DoculinkServiceTest.cs
@ -44,10 +44,10 @@ namespace DamageAssesment.Api.DocuLinks.Test
            var mockDocumentService = new Mock<IDoculinkProvider>();
            var mockUploadService = new Mock<IUploadService>();
            var mockResponse = await MockData.getOkResponses();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", null)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en", null)).ReturnsAsync(mockResponse);

            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms", "en", null);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms","en", null);

            Assert.Equal(200, result.StatusCode);
        }
@ -97,7 +97,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
            var mockDocumentService = new Mock<IDoculinkProvider>();
            var mockUploadService = new Mock<IUploadService>();
            var mockResponse = await MockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.GetDocumentAsync(1, "forms", "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(1,"forms","en")).ReturnsAsync(mockResponse);

            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
            var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1, "forms", "en");
@ -154,9 +154,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
            var mockResponse = await MockData.getOkResponse(1);
            var mockInputDocument = await MockData.getInputDocumentData();
            var DocumentResponse = await MockData.GetDocuLinksInfo(1);
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1, DocumentResponse);
+            var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1,DocumentResponse);

            Assert.Equal(404, result.StatusCode);
        }
@ -168,9 +168,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
            var mockUploadService = new Mock<IUploadService>();
            var mockResponse = await MockData.getBadRequestResponse();
            var mockInputDocument = await MockData.getInputDocumentData();
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(99, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99, null);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99,null);
            Assert.Equal(400, result.StatusCode);
        }

@ -257,7 +257,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
            var mockDocumentService = new Mock<IDoculinkProvider>();
            var mockUploadService = new Mock<IUploadService>();
            var mockResponse = await LinkTypeMockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1, "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1,"en")).ReturnsAsync(mockResponse);
            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
            var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1, "en");

@ -312,9 +312,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
            var mockUploadService = new Mock<IUploadService>();
            var mockResponse = await LinkTypeMockData.getOkResponse(1);
            var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument);
+            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1,mockInputDocument);

            Assert.Equal(200, result.StatusCode);
        }
@ -326,9 +326,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
            var mockUploadService = new Mock<IUploadService>();
            var mockResponse = await LinkTypeMockData.getNotFoundResponse();
            var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99, mockInputDocument);
+            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99,mockInputDocument);

            Assert.Equal(404, result.StatusCode);
        }
@ -340,7 +340,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
            var mockUploadService = new Mock<IUploadService>();
            var mockResponse = await LinkTypeMockData.getBadRequestResponse();
            var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
            var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument);

--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/MockData.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/MockData.cs
@ -14,19 +14,19 @@ namespace DamageAssesment.Api.DocuLinks.Test
        public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponses()
        {
            List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
-
+            
            for (int i = 1; i < 4; i++)
            {
                Dictionary<string, string> dicttitle = new Dictionary<string, string>();
-                Dictionary<string, string> dictdesc = new Dictionary<string, string>();
+                Dictionary<string, string> dictdesc = new Dictionary<string, string>(); 
                dicttitle.Add("en", "test"); dicttitle.Add("fr", "tester");
-                dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester");
+                dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester"); 
                List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
                DocuLinksTranslations.Add(new DoculinkTranslation()
                {
                    Language = "en",
-                    title = "tel" + i,
-                    description = "Sample" + i
+                    title = "tel"+i,
+                    description = "Sample"+i
                });
                List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
                doclinksAttachments.Add(new DoculinkAttachments()
@ -41,10 +41,10 @@ namespace DamageAssesment.Api.DocuLinks.Test
                    Id = i,
                    linkTypeId = i,
                    IsActive = true,
-                    titles = dicttitle,
-                    description = dictdesc,
-                    CustomOrder = i,
-                    doclinksAttachments = doclinksAttachments
+                    titles= dicttitle,
+                    description=dictdesc,
+                    CustomOrder=i,
+                    doclinksAttachments= doclinksAttachments
                });
            }
           // List<ResDoculinks> doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
@ -122,8 +122,8 @@ namespace DamageAssesment.Api.DocuLinks.Test
        {

            List<FileModel> fileModels = new List<FileModel>();
-            fileModels.Add(new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt", IsAttachments = true, CustomOrder = 1 });
-            return new ReqDoculink() { Id = id, linkTypeId = 1, CustomOrder = 1, Files = fileModels };
+            fileModels.Add( new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt",IsAttachments=true,CustomOrder=1 });
+            return new ReqDoculink() { Id=id, linkTypeId = 1, CustomOrder = 1, Files = fileModels };
        }
        public static async Task<DocuLinks.Models.Doculink> getInputDocumentData()
        {
@ -133,7 +133,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
                Language = "en",
                title = "tel",
                description = "Sample"
-            });
+            }); 
            List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
            doclinksAttachments.Add(new DoculinkAttachments()
            {
@ -148,9 +148,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
                Id = 1,
                linkTypeId = 1,
                IsActive = true,
-                CustomOrder = 1,
+                CustomOrder=1,
                documentsTranslations = DocuLinksTranslations,
-                doclinksAttachments = doclinksAttachments
+                doclinksAttachments= doclinksAttachments
            };
        }
        public static async Task<List<DocuLinks.Models.Doculink>> getInputDocuLinksData()
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Controllers/DoculinkController.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Controllers/DoculinkController.cs
@ -5,6 +5,7 @@ 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 +14,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
    {
        private readonly IDoculinkProvider documentsProvider;
        private readonly IUploadService uploadService;
-        private readonly IAzureBlobService azureBlobService;

        public DoculinkController(IDoculinkProvider documentsProvider, IUploadService uploadService)
        {
@ -41,8 +41,8 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
        /// <summary>
        /// Get a Doculink type by id.
        /// </summary>
-        [Authorize(Roles = "admin")]
        [HttpGet]
+        [Authorize(Roles = "admin")]
        [Route("doculinks/types/{id}")]
        [Route("doculinks/types/{id}/{language:alpha}")]
        public async Task<IActionResult> GetLinkTypeAsync(int id, string? language)
@ -206,6 +206,7 @@ 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}")]
@ -222,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]
@ -252,7 +254,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
            return NotFound();
        }
        /// <summary>
-        /// update existing doclink.
+        /// Upload new document.
        /// </summary>
        [Authorize(Roles = "admin")]
        [HttpPut]
@ -294,7 +296,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
        /// <summary>
        /// Create new doclink.
        /// </summary>
-       // [Authorize(Roles = "admin")]
+        [Authorize(Roles = "admin")]
        [HttpPost]
        [Route("doculinks")]
        public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo)
@ -320,7 +322,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
            }
        }
        /// <summary>
-        /// Delete Doculink by id.
+        /// Delete document by id.
        /// </summary>
        [Authorize(Roles = "admin")]
        [HttpDelete]
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj
@ -1,17 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.18.0" />
+    <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" />
@ -25,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>

--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/DoculinkDbContext.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/DoculinkDbContext.cs
@ -7,15 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Db
 {
    public class DoculinkDbContext : DbContext
    {
-        private IConfiguration _Configuration { get; set; }
-        public DoculinkDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
+        public DoculinkDbContext(DbContextOptions options) : base(options)
        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("DoculinkConnection"));
        }
        public DbSet<Db.Doculink> Documents { get; set; }
        public DbSet<Db.LinkType> LinkTypes { get; set; }
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile
+++ b/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"]
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Interfaces/IAzureBlobService.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Interfaces/IAzureBlobService.cs
@ -1,14 +1,10 @@
 using Azure.Storage.Blobs.Models;
-using DamageAssesment.Api.DocuLinks.Models;

 namespace DamageAssesment.Api.DocuLinks.Interfaces
 {
    public interface IAzureBlobService
    {
        Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files);
-        Task<Models.Doculink> UploadDocument(int counter, ReqDoculink documentInfo);
-        Task<Models.Doculink> UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
        void DeleteFile(string path);
-        void Movefile(string path);
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs
@ -9,12 +9,9 @@ using System.Text;
 using Microsoft.OpenApi.Models;

 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-
 builder.Services.AddAuthentication(item =>
 {
    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@ -79,7 +76,7 @@ builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<DoculinkDbContext>(option =>
 {
-    option.UseSqlServer("DoculinkConnection");
+    option.UseInMemoryDatabase("DocumentConnection");
 });
 var app = builder.Build();

@ -89,7 +86,7 @@ if (app.Environment.IsDevelopment())
    app.UseSwagger();
    app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();

--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json
+++ b/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
    }
  }
-}
+}
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/AzureBlobService.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/AzureBlobService.cs
@ -1,17 +1,8 @@

-using Azure;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs.Specialized;
 using DamageAssesment.Api.DocuLinks.Interfaces;
-using DamageAssesment.Api.DocuLinks.Models;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Configuration;
-using Microsoft.VisualBasic;
-using System.ComponentModel;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;

 namespace DamageAssesment.Api.DocuLinks.Providers
 {
@ -19,111 +10,11 @@ namespace DamageAssesment.Api.DocuLinks.Providers
    {
        BlobServiceClient _blobClient;
        BlobContainerClient _containerClient;
-        string azureConnectionString;
-        private string uploadpath = "";
-        private string Deletepath = "";
-        public AzureBlobService(IConfiguration configuration)
+        string azureConnectionString = "<Primary Connection String>";
+        public AzureBlobService()
        {
-            uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
-            Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
-            _blobClient = new BlobServiceClient(configuration.GetValue<string>("Fileupload:BlobConnectionString"));
-            _containerClient = _blobClient.GetBlobContainerClient(configuration.GetValue<string>("Fileupload:BlobContainerName"));
-        }
-        public async Task<Models.Doculink> UploadDocument(int counter, ReqDoculink documentInfo)
-        {
-            Models.Doculink Documents = new Models.Doculink();
-            List <Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-            try
-            {
-                string path = "", UserfileName = "";
-                if (documentInfo.Files != null)
-                {
-
-                    int counter1 = 1;
-                    foreach (var item in documentInfo.Files)
-                    {
-                        if (item.IsAttachments)
-                        {
-                            UserfileName = Path.GetFileName(item.FileName);
-                            var fileName = String.Format("Document_{0}_{1}{2}", counter, counter1, item.FileExtension);
-                            byte[] byteArray = Convert.FromBase64String(item.FileContent);
-                            MemoryStream stream = new MemoryStream(byteArray);
-                            BlobClient client = _containerClient.GetBlobClient(uploadpath + "/" + fileName);
-                            var result = await client.UploadAsync(stream, true);
-                            path = uploadpath + "/" + fileName;
-                            counter1++;
-                        }
-                        else
-                            path = item.url;
-                        attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder });
-                    }
-                }
-                Documents = new Models.Doculink()
-                {
-                    linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations = documentInfo.documentsTranslations,
-                    doclinksAttachments = attachments,
-                    IsDeleted = false,
-                    CustomOrder = documentInfo.CustomOrder,
-                    IsActive = true
-                };
-
-                return Documents;
-            }
-            catch (Exception ex)
-            {
-                return new Models.Doculink();
-            }
-
-
-        }
-
-        public async Task<Models.Doculink> UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo)
-        {
-            try
-            {
-                foreach (var item in document.doclinksAttachments)
-                {
-                     Movefile(item.Path);
-                }
-                string path = "", UserfileName = "";
-                List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-                int counter1 = 1;
-                foreach (var item in documentInfo.Files)
-                {
-                    if (item.IsAttachments)
-                    {
-                        UserfileName = Path.GetFileName(item.FileName);
-                        var fileName = String.Format("Document_{0}_{1}{2)", document.Id, counter1, item.FileExtension);
-                        byte[] byteArray = Encoding.UTF8.GetBytes(item.FileContent);
-                        MemoryStream stream = new MemoryStream(byteArray);
-                        BlobClient client = _containerClient.GetBlobClient(uploadpath + "/" + fileName);
-                        path = uploadpath + "/" + fileName;
-                        var result = await client.UploadAsync(stream, true);
-                        counter1++;
-                    }
-                    else
-                        path = item.url;
-                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder });
-                }
-                Models.Doculink Documents = new Models.Doculink()
-                {
-                    Id = documentInfo.Id,
-                    linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations = documentInfo.documentsTranslations,
-                    IsActive = true,
-                    IsDeleted = false,
-                    CustomOrder = documentInfo.CustomOrder,
-                    doclinksAttachments = attachments
-                };
-
-                return Documents;
-            }
-
-            catch (Exception ex)
-            {
-                return new Models.Doculink();
-            }
+            _blobClient = new BlobServiceClient(azureConnectionString);
+            _containerClient = _blobClient.GetBlobContainerClient("apiimages");
        }

        public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
@ -144,52 +35,10 @@ namespace DamageAssesment.Api.DocuLinks.Providers

            return azureResponse;
        }
-        public string getMovefilename(string movefilename)
-        {
-            var list = movefilename.Split('.');
-            if (list.Length > 0)
-                list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") +"_"+ DateTime.Now.ToShortTimeString().Replace("/", "_")+"." + list[list.Length - 1];
-            return string.Join("_", list);
-        }
-        public void Movefile(string path)
-        {
-            try
-            {
-                if (path != "")
-                {
-                    string MovePath = getMovefilename(path.Replace(uploadpath, Deletepath));
-                    // Get references to the source and destination blobs
-                    BlobClient sourceBlobClient = _containerClient.GetBlobClient(path);
-                    BlobClient destinationBlobClient = _containerClient.GetBlobClient(MovePath);
-                    // Start the copy operation from the source to the destination
-                     destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri);
-
-                    // Check if the copy operation completed successfully
-                     WaitForCopyToComplete(destinationBlobClient);
-
-                    // Delete the source blob after a successful copy
-                     sourceBlobClient.DeleteIfExists();
-                }
-            }
-            catch(Exception ex)
-            {
-
-            }
-        }
-        static void  WaitForCopyToComplete(BlobClient blobClient)
-        {
-            BlobProperties properties =  blobClient.GetProperties();
-
-            while (properties.CopyStatus == CopyStatus.Pending)
-            {
-                 Task.Delay(TimeSpan.FromSeconds(1));
-                properties =  blobClient.GetProperties();
-            }
-        }
        public void DeleteFile(string url)
        {
-            BlobClient sourceBlobClient = _containerClient.GetBlobClient(url);
-            sourceBlobClient.DeleteIfExists();
+            var blob = _containerClient.GetBlockBlobClient(url);
+            blob.DeleteIfExists();
        }
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/DoculinkProvider.cs
@ -24,12 +24,11 @@ namespace DamageAssesment.Api.DocuLinks.Providers
        private DoculinkDbContext DocumentDbContext;
        private ILogger<DoculinkProvider> logger;
        private IUploadService uploadservice;
-        private IAzureBlobService azureBlobService;
        private IMapper mapper;
        private readonly IHttpContextAccessor httpContextAccessor;
        private string baseUrl;

-        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IAzureBlobService azureBlobService, IHttpContextAccessor httpContextAccessor)
+        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
        {
            this.DocumentDbContext = DocumentDbContext;
            this.logger = logger;
@ -38,13 +37,12 @@ namespace DamageAssesment.Api.DocuLinks.Providers
            this.httpContextAccessor = httpContextAccessor;
            baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
            baseUrl = baseUrl + "/doculinks/download";
-            this.azureBlobService = azureBlobService;
-            //SeedData();
+            SeedData();
        }



-        private async Task SeedDataAsync()
+        private void SeedData()
        {
            if (!DocumentDbContext.LinkTypes.Any())
            {
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/UploadService.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Providers/UploadService.cs
@ -116,16 +116,15 @@ namespace DamageAssesment.Api.DocuLinks.Providers

                string path = "", UserfileName = "";
                List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-                int counter1 = 1;
                foreach (var item in documentInfo.Files)
                {
+                    counter++;
                    if (item.IsAttachments)
                    {
                        UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
-                        var fileName = String.Format("Document_{0}{1}", counter1, item.FileExtension);
+                        var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
                        path = Path.Combine(fullDirectoryPath, fileName);
                        File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
-                        counter1++;
                    }
                    else
                        path = item.url;
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json
@ -1,7 +1,4 @@
 {
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
-  },
  "Logging": {
    "LogLevel": {
      "Default": "Information",
@ -9,15 +6,12 @@
    }
  },
  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"DoculinkConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "DoculinkConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
  },
  "Fileupload": {
    "folderpath": "DASA_Documents/Active",
-    "Deletepath": "DASA_Documents/Deleted",
-    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
-    "BlobContainerName": "doculinks"
+    "Deletepath": "DASA_Documents/Deleted"
  }
 }
+
--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj
@ -5,26 +5,13 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <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>

--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Db/EmployeeDbContext.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/Db/EmployeeDbContext.cs
@ -4,23 +4,18 @@ namespace DamageAssesment.Api.Employees.Db
 {
    public class EmployeeDbContext: DbContext
    {
-        private IConfiguration _Configuration { get; set; }
-        public EmployeeDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
+        public DbSet<Db.Employee> Employees { get; set; }
+        public EmployeeDbContext(DbContextOptions options) : base(options)
        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("EmployeeConnection"));
        }
+
        protected override void OnModelCreating(ModelBuilder modelBuilder)
        {
            base.OnModelCreating(modelBuilder);
+
            modelBuilder.Entity<Employee>()
                .Property(item => item.Id)
                .ValueGeneratedOnAdd();
        }
-        public DbSet<Db.Employee> Employees { get; set; }
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile
+++ b/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"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs
@ -9,12 +9,9 @@ using System.Reflection;
 using System.Text;

 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-
 builder.Services.AddAuthentication(item =>
 {
    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@ -78,7 +75,7 @@ builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<EmployeeDbContext>(option =>
 {
-    option.UseSqlServer("EmployeeConnection");
+    option.UseInMemoryDatabase("Employees");
 });

 var app = builder.Build();
@ -96,7 +93,7 @@ if (app.Environment.IsDevelopment())
        employeesProvider.SeedData();
    }
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();

--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Properties/launchSettings.json
+++ b/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"
+      }
+    }
  }
-}
+}
--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json
@ -8,10 +8,5 @@
      "Microsoft.AspNetCore": "Warning"
    }
  },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "EmployeeConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj
@ -5,27 +5,13 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
    <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>

--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Db/LocationDbContext.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/Db/LocationDbContext.cs
@ -4,16 +4,6 @@ namespace DamageAssesment.Api.Locations.Db
 {
    public class LocationDbContext : DbContext
    {
-        private IConfiguration _Configuration { get; set; }
-        public LocationDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("LocationConnection"));
-        }
        public DbSet<Db.Location> Locations { get; set; }
        public DbSet<Db.Region> Regions { get; set; }
        public LocationDbContext(DbContextOptions options) : base(options)
--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile
+++ b/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"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs
@ -9,12 +9,9 @@ using System.Reflection;
 using System.Text;

 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-
 builder.Services.AddAuthentication(item =>
 {
    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@ -77,7 +74,7 @@ builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<LocationDbContext>(option =>
 {
-    option.UseSqlServer("LocationConnection");
+    option.UseInMemoryDatabase("Locations");
 });


@ -99,7 +96,7 @@ if (app.Environment.IsDevelopment())
        regionProvider.SeedData();
    }
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();

--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Properties/launchSettings.json
+++ b/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"
+      }
+    }
  }
-}
+}
--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.json
@ -8,10 +8,5 @@
      "Microsoft.AspNetCore": "Warning"
    }
  },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "LocationConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Controllers/QuestionsController.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Controllers/QuestionsController.cs
@ -1,6 +1,6 @@
 using DamageAssesment.Api.Questions.Interfaces;
-using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Authorization;
+using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Mvc;

 namespace DamageAssesment.Api.Questions.Controllers
@ -109,7 +109,7 @@ namespace DamageAssesment.Api.Questions.Controllers

                return BadRequest(result.ErrorMessage);
            }
-            return CreatedAtRoute("DefaultApi", questions);
+            return CreatedAtRoute("DefaultApi",questions);
        }
        /// <summary>
        /// PUT request for update a multiple question (multilingual) for survey.
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj
@ -5,27 +5,13 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
    <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>

--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionDbContext.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionDbContext.cs
@ -6,16 +6,6 @@ namespace DamageAssesment.Api.Questions.Db
 {
    public class QuestionDbContext : DbContext
    {
-        private IConfiguration _Configuration { get; set; }
-        public QuestionDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("QuestionConnection"));
-        }
        public DbSet<Db.Question> Questions { get; set; }
        public DbSet<Db.QuestionType> QuestionTypes { get; set; }
        public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; }
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile
+++ b/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"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs
@ -9,9 +9,6 @@ using System.Reflection;
 using System.Text;

 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
@ -79,7 +76,7 @@ builder.Services.AddSwaggerGen(options =>

 builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
-    option.UseSqlServer("QuestionConnection");
+    option.UseInMemoryDatabase("Questions");
 });
 var app = builder.Build();

@ -96,7 +93,6 @@ if (app.Environment.IsDevelopment())
        questionProvider.SeedData();
    }
 }
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();

--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Properties/launchSettings.json
+++ b/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"
+      }
+    }
  }
-}
+}
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Providers/QuestionsProvider.cs
@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Questions.Providers
            this.questionDbContext = questionDbContext;
            this.logger = logger;
            this.mapper = mapper;
-           // SeedData();
+            // SeedData();
        }

        public void SeedData()
@ -69,7 +69,7 @@ namespace DamageAssesment.Api.Questions.Providers
                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 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 };
@ -274,7 +274,7 @@ namespace DamageAssesment.Api.Questions.Providers
                if (question != null)
                {
                    logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);                    
+                    var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);
                    result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(id, language));
                    return (true, result, null);
                }
@ -313,7 +313,7 @@ namespace DamageAssesment.Api.Questions.Providers
                            CategoryId = item.Id,
                            IconLibrary = item.IconLibrary,
                            IconName = item.IconName,
-                            CategoryNames= CreateCategoryMultiLanguageObject(GetCategoryTranslations(item.Id, language)),
+                            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)
                        });
                    }
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json
@ -8,10 +8,5 @@
      "Microsoft.AspNetCore": "Warning"
    }
  },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"QuestionConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "QuestionConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/DamageAssesment.Api.Questions.Test.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/DamageAssesment.Api.Questions.Test.csproj
@ -10,7 +10,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
    <PackageReference Include="Moq" Version="4.18.4" />
    <PackageReference Include="xunit" Version="2.4.2" />
--- a/DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs
@ -86,9 +86,8 @@ namespace DamageAssesment.Api.Questions.Test
            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);
+              Questions.Add(question);
            return Questions;
        }
-
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs
@ -356,5 +356,6 @@ namespace DamageAssesment.Api.Questions.Test

            Assert.Equal(404, result.StatusCode);
        }
+
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj
@ -5,32 +5,15 @@
    <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="ClosedXML" Version="0.102.1" />
-    <PackageReference Include="EPPlus" Version="6.2.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.9" />
+    <PackageReference Include="EPPlus" Version="7.0.0" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
    <PackageReference Include="Microsoft.Extensions.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>
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponseDbContext.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponseDbContext.cs
@ -4,18 +4,13 @@ namespace DamageAssesment.Api.Responses.Db
 {
    public class SurveyResponseDbContext:DbContext
    {
-        private IConfiguration _Configuration { get; set; }
-        public SurveyResponseDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("ResponsesConnection"));
-        }
        public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }

+        public SurveyResponseDbContext(DbContextOptions options) : base(options)
+        {
+
+        }
+
        protected override void OnModelCreating(ModelBuilder modelBuilder)
        {
            base.OnModelCreating(modelBuilder);
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Dockerfile
+++ b/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"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IEmployeeServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IEmployeeServiceProvider.cs
@ -7,4 +7,4 @@ namespace DamageAssesment.Api.Responses.Interfaces
        Task<List<Employee>> getEmployeesAsync(string token);
        Task<Employee> getEmployeeAsync(int employeeId, string token);
    }
-}
+}
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IQuestionServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Interfaces/IQuestionServiceProvider.cs
@ -4,7 +4,7 @@ namespace DamageAssesment.Api.Responses.Interfaces
 {
    public interface IQuestionServiceProvider
    {
-        Task<List<Question>> getQuestionsAsync(string language, string token);
+        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);
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyExport.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyExport.cs
@ -3,7 +3,7 @@
    public class SurveyExport
    {
        public int Id { get; set; }
-        public string SurveyQuestion { get; set; }  
+        public string SurveyQuestion { get; set; }
        public string Answer { get; set; }
        public string Category { get; set; }

--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyQuestion.cs
+++ b/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; }
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs
@ -16,9 +16,6 @@ const int intervalToRetry = 2; //2 seconds
 const int maxRetryForCircuitBraker = 5;
 const int intervalForCircuitBraker = 5; //5 seconds

-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));

 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
@ -51,8 +48,8 @@ builder.Services.AddScoped<IQuestionServiceProvider, QuestionServiceProvider>();
 builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
 builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>();
 builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>();
-builder.Services.AddScoped<IExcelExportService, ExcelExportService>();
 builder.Services.AddHttpContextAccessor();
+builder.Services.AddScoped<IExcelExportService, ExcelExportService>();

 builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
@ -99,7 +96,7 @@ builder.Services.AddSwaggerGen(options =>
 });
 builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
 {
-    option.UseSqlServer("ResponsesConnection");
+    option.UseInMemoryDatabase("Responses");
 });
 var app = builder.Build();

@ -109,7 +106,7 @@ if (app.Environment.IsDevelopment())
    app.UseSwagger();
    app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();

--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Properties/launchSettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Properties/launchSettings.json
@ -1,33 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Responses": {
-      "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"
+      }
+    }
  }
-}
+}
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/ExcelExportService.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/ExcelExportService.cs
@ -1,16 +1,16 @@
-using ClosedXML.Excel;
-using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
 using OfficeOpenXml;
 using System.Collections.Generic;
+using System.ComponentModel;

 namespace DamageAssesment.Api.Responses.Providers
 {
-    public class ExcelExportService: IExcelExportService
+    public class ExcelExportService : IExcelExportService
    {
        public byte[] ExportToExcel<T1>(List<object> responses)
-        { 
-            ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
+        {
+            ExcelPackage.LicenseContext = OfficeOpenXml.LicenseContext.NonCommercial;
            using (var package = new ExcelPackage())
            {
                // Create the first worksheet and populate it with responses
@ -29,7 +29,7 @@ namespace DamageAssesment.Api.Responses.Providers
                for (int col = 1; col <= properties.Length; col++)
                {
                    worksheet.Cells[1, col].Value = properties[col - 1].Name;
-                    if(properties[col - 1].Name.ToLower().Contains("attachment"))
+                    if (properties[col - 1].Name.ToLower().Contains("attachment"))
                        IsAttchments.Add(col);
                }

@ -38,8 +38,8 @@ namespace DamageAssesment.Api.Responses.Providers
                {
                    for (int col = 1; col <= properties.Length; col++)
                    {
-                       
-                            string value = Convert.ToString(properties[col - 1].GetValue(data[row - 2]));
+
+                        string value = Convert.ToString(properties[col - 1].GetValue(data[row - 2]));
                        if (IsAttchments.Where(a => a == col).Count() > 0 && !string.IsNullOrEmpty(value))
                        {
                            List<string> attachments = value.Split("##").ToList();
@ -53,7 +53,7 @@ namespace DamageAssesment.Api.Responses.Providers
                        }
                        else
                            worksheet.Cells[row, col].Value = value;
-                        
+
                    }
                }
            }
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs
@ -139,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, token);
+                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);
@ -443,6 +443,7 @@ namespace DamageAssesment.Api.Responses.Providers
                var answersList = await answerServiceProvider.getAnswersAsync(token);
                if (answersList == null || !answersList.Any())
                    return null;
+
                //get all the answers for the particular survey
                var surveyAnswers = answersList.Join(
                                       surveyResponses,
@ -527,7 +528,7 @@ namespace DamageAssesment.Api.Responses.Providers
            {
                var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId, token);
                var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id, token);
-                var allQuestions = await questionServiceProvider.getQuestionsAsync(null, token);
+                var allQuestions = await questionServiceProvider.getQuestionsAsync(null,token);
                var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);

@ -538,14 +539,14 @@ namespace DamageAssesment.Api.Responses.Providers
                    surveyResponse.LocationId,
                    surveyResponse.EmployeeId,
                    surveyResponse.ClientDevice,
-                  //  surveyResponse.KeyAnswerResult,
+                    surveyResponse.KeyAnswerResult,
                    surveyResponse.Longitute,
                    surveyResponse.Latitude,
                    Employee = employee,
                    answers = from ans in answers
                              select new
                              {
-                                //  ans.QuestionId,
+                                  ans.QuestionId,
                                  ans.Id,
                                  ans.AnswerText,
                                  ans.Comment,
@ -602,16 +603,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                 r.LocationId,
                                 r.EmployeeId,
                                 r.ClientDevice,
-                                // r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                 r.Longitute,
                                 r.Latitude,
-                                // Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                 answers = from ans in answers
                                           where ans.SurveyResponseId == r.Id
                                           select new
                                           {
                                               ans.Id,
-                                             //  ans.QuestionId,
+                                               ans.QuestionId,
                                               ans.AnswerText,
                                               ans.Comment,
                                               Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
@ -654,13 +655,9 @@ namespace DamageAssesment.Api.Responses.Providers
                    }
                }

-                surveyResonses = surveyResonses
-                .OrderByDescending(obj => obj.Id)
-                .GroupBy(obj => new { obj.SurveyId, obj.EmployeeId, obj.LocationId })
-                .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 questions = await questionServiceProvider.getQuestionsAsync(null,token);
                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);

                var result = from r in surveyResonses
@ -671,16 +668,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                 r.LocationId,
                                 r.EmployeeId,
                                 r.ClientDevice,
-                               //  r.KeyAnswerResult,
+                                 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 = 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(),
                                 answers = from ans in answers
                                           where ans.SurveyResponseId == r.Id
                                           select new
                                           {
                                               ans.Id,
-                                           //    ans.QuestionId,
+                                               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(),
@ -925,7 +922,7 @@ namespace DamageAssesment.Api.Responses.Providers
                .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 questions = await questionServiceProvider.getQuestionsAsync(null,token);
                var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);

@ -937,16 +934,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                 r.LocationId,
                                 r.EmployeeId,
                                 r.ClientDevice,
-                               //  r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                 r.Longitute,
                                 r.Latitude,
-                               //  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                 answers = from ans in answers
                                           where ans.SurveyResponseId == r.Id

                                           select new
                                           {
-                                          //     ans.QuestionId,
+                                               ans.QuestionId,
                                               ans.Id,
                                               ans.AnswerText,
                                               ans.Comment,
@ -1007,10 +1004,10 @@ namespace DamageAssesment.Api.Responses.Providers
                                 r.LocationId,
                                 r.EmployeeId,
                                 r.ClientDevice,
-                                // r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                 r.Longitute,
                                 r.Latitude,
-                               //  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 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
@ -1018,7 +1015,7 @@ namespace DamageAssesment.Api.Responses.Providers

                                           select new
                                           {
-                                              // ans.QuestionId,
+                                               ans.QuestionId,
                                               AnswerId = ans.Id,
                                               ans.AnswerText,
                                               ans.Comment,
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/EmployeeServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/EmployeeServiceProvider.cs
@ -15,7 +15,7 @@ namespace DamageAssesment.Api.Responses.Services
        {
            try
            {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString);

                if (employees == null || !employees.Any())
@ -33,7 +33,7 @@ namespace DamageAssesment.Api.Responses.Services
        {
            try
            {
-                url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:EmployeeById"), employeeId); 
+                url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:EmployeeById"), employeeId);
                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString);

--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/QuestionServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/QuestionServiceProvider.cs
@ -1,6 +1,7 @@
 using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.LexicalAnalysis;

 namespace DamageAssesment.Api.Responses.Services
 {
@ -10,13 +11,13 @@ namespace DamageAssesment.Api.Responses.Services
        {
        }

-        public async Task<List<Question>> getQuestionsAsync(string language, string token)
+        public async Task<List<Question>> getQuestionsAsync(string language,string token)
        {
            try
            {
                if (!string.IsNullOrEmpty(language))
                    url = url + "/" + language;
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
                var questions = JsonConvert.DeserializeObject<List<Question>>(responseJsonString);

                if (questions == null || !questions.Any())
@ -29,7 +30,7 @@ namespace DamageAssesment.Api.Responses.Services
                return new List<Question>();
            }
        }
-        public async Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language, string token)
+        public async Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language,string token)
        {
            try
            {
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/SurveyServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Services/SurveyServiceProvider.cs
@ -4,7 +4,7 @@ using Newtonsoft.Json;

 namespace DamageAssesment.Api.Responses.Services
 {
-    public class SurveyServiceProvider :ServiceProviderBase, ISurveyServiceProvider
+    public class SurveyServiceProvider : ServiceProviderBase, ISurveyServiceProvider
    {
        public SurveyServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Survey"), configuration.GetValue<string>("EndPointSettings:SurveyUrlBase"))
        {
@ -16,7 +16,7 @@ namespace DamageAssesment.Api.Responses.Services
            {
                if (!string.IsNullOrEmpty(language))
                    url = url + "/" + language;
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
                var surveys = JsonConvert.DeserializeObject<List<Survey>>(responseJsonString);

                if (surveys == null || !surveys.Any())
@ -38,7 +38,7 @@ namespace DamageAssesment.Api.Responses.Services
                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                var survey = JsonConvert.DeserializeObject<Survey>(responseJsonString);

-                if (survey == null )
+                if (survey == null)
                    return null;
                else return survey;
            }
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json
@ -6,31 +6,15 @@
    }
  },
  "AllowedHosts": "*",
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
-  },
-  "ConnectionStrings": {
-    //"ResponsesConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "ResponsesConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-  },
-  //"EndPointSettings": {
-  //  "AnswerUrlBase": "http://localhost:5200",
-  //  "LocationUrlBase": "http://localhost:5213",
-  //  "RegionUrlBase": "http://localhost:5211",
-  //  "QuestionUrlBase": "http://localhost:5133",
-  //  "EmployeeUrlBase": "http://localhost:5135",
-  //  "AttachmentUrlBase": "http://localhost:5243",
-  //  "SurveyUrlBase": "http://localhost:5009"
-  //},
  "EndPointSettings": {
-    "AnswerUrlBase": "http://damageassesment.api.answers:80",
-    "LocationUrlBase": "http://damageassesment.api.locations:80",
-    "QuestionUrlBase": "http://damageassesment.api.questions:80",
-    "EmployeeUrlBase": "http://damageassesment.api.employees:80",
-    "AttachmentUrlBase": "http://damageassesment.api.attachments:80",
-    "SurveyUrlBase": "http://damageassesment.api.surveys:80"
+    "AnswerUrlBase": "http://localhost:5200",
+    "LocationUrlBase": "http://localhost:5213",
+    "RegionUrlBase": "http://localhost:5211",
+    "QuestionUrlBase": "http://localhost:5133",
+    "EmployeeUrlBase": "http://localhost:5135",
+    "AttachmentUrlBase": "http://localhost:5243",
+    "SurveyUrlBase": "http://localhost:5009"
  },
-
  "RessourceSettings": {
    "Employee": "/employees",
    "EmployeeById": "/employees/{0}",
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys.Test/SurveyServiceTest.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys.Test/SurveyServiceTest.cs
@ -34,55 +34,7 @@ namespace DamageAssesment.Api.Surveys.Test

            Assert.Equal(204, result.StatusCode);
        }
-        [Fact(DisplayName = "Get active Surveys - Ok case")]
-        public async Task GetActiveSurveysAsync_ShouldReturnStatusCode200()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getOkResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(true,null)).ReturnsAsync(mockResponse);

-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (OkObjectResult)await surveyProvider.GetActiveSurveysAsync(null);
-
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "Get active Surveys - NoContent Case")]
-        public async Task GetActiveSurveysAsync_ShouldReturnStatusCode204()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getNoContentResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(true,null)).ReturnsAsync(mockResponse);
-
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (NoContentResult)await surveyProvider.GetActiveSurveysAsync(null);
-
-            Assert.Equal(204, result.StatusCode);
-        }
-        [Fact(DisplayName = "Get inactive Surveys - Ok case")]
-        public async Task GetInActiveSurveysAsync_ShouldReturnStatusCode200()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getOkResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(false, null)).ReturnsAsync(mockResponse);
-
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (OkObjectResult)await surveyProvider.GetInActiveSurveysAsync(null);
-
-            Assert.Equal(200, result.StatusCode);
-        }
-        [Fact(DisplayName = "Get in active Surveys - NoContent Case")]
-        public async Task GetInActiveSurveysAsync_ShouldReturnStatusCode204()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getNoContentResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(false, null)).ReturnsAsync(mockResponse);
-
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (NoContentResult)await surveyProvider.GetInActiveSurveysAsync(null);
-
-            Assert.Equal(204, result.StatusCode);
-        }
        [Fact(DisplayName = "Get Survey by Id - Ok case")]
        public async Task GetSurveyAsync_ShouldReturnStatusCode200()
        {
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Controllers/SurveysController.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Controllers/SurveysController.cs
@ -29,38 +29,7 @@ namespace DamageAssesment.Api.Surveys.Controllers
            }
            return NoContent();
        }
-        /// <summary>
-        /// GET request for retrieving all active surveys.
-        /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [Route("surveys/active")]
-        [Route("surveys/active/{language:alpha}")]
-        [HttpGet]
-        public async Task<ActionResult> GetActiveSurveysAsync(string? language)
-        {
-            var result = await this.surveyProvider.GetActiveSurveysAsync(true,language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Surveys);
-            }
-            return NoContent();
-        }
-        /// <summary>
-        /// GET request for retrieving all inactive surveys.
-        /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [Route("surveys/inactive")]
-        [Route("surveys/inactive/{language:alpha}")]
-        [HttpGet]
-        public async Task<ActionResult> GetInActiveSurveysAsync(string? language)
-        {
-            var result = await this.surveyProvider.GetActiveSurveysAsync(false, language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Surveys);
-            }
-            return NoContent();
-        }
+
        /// <summary>
        /// GET request for retrieving surveys by ID.
        /// </summary>
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj
@ -5,27 +5,13 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
    <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>

--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Db/SurveysDbContext.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Db/SurveysDbContext.cs
@ -4,18 +4,11 @@ namespace DamageAssesment.Api.Surveys.Db
 {
    public class SurveysDbContext : DbContext
    {
-        private IConfiguration _Configuration { get; set; }
-        public SurveysDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        
        public DbSet<Db.Survey> Surveys { get; set; }
        public DbSet<Db.SurveyTranslation> SurveysTranslation { get; set; }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
+        public SurveysDbContext(DbContextOptions options) : base(options)
        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("SurveyConnection"));
+
        }
        protected override void OnModelCreating(ModelBuilder modelBuilder)
        {
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/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.Surveys/DamageAssesment.Api.Surveys.csproj", "DamageAssesment.Api.Surveys/"]
-RUN dotnet restore "DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Surveys"
-RUN dotnet build "DamageAssesment.Api.Surveys.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Surveys.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Surveys.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Interfaces/ISurveyProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Interfaces/ISurveyProvider.cs
@ -3,7 +3,6 @@
    public interface ISurveyProvider
    {
       Task<(bool IsSuccess, IEnumerable< Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language);
-        Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetActiveSurveysAsync(bool IsActive,string language);
       Task<(bool IsSuccess, Models.MultiLanSurvey Surveys, string ErrorMessage)> GetSurveysAsync(int id, string language);
       Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PostSurveyAsync(Models.Survey Survey);
       Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PutSurveyAsync(int id, Models.Survey Survey);
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Program.cs
@ -9,9 +9,7 @@ using System.Reflection;
 using Microsoft.OpenApi.Models;

 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
@ -77,7 +75,7 @@ builder.Services.AddSwaggerGen(options =>

 builder.Services.AddDbContext<SurveysDbContext>(option =>
 {
-    option.UseSqlServer("SurveyConnection");
+    option.UseInMemoryDatabase("Surveys");
 });
 var app = builder.Build();

@ -95,7 +93,6 @@ if (app.Environment.IsDevelopment())
    }
 }

-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();

--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Properties/launchSettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Properties/launchSettings.json
@ -1,33 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Surveys": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5009"
-    },
-    "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:51498",
      "sslPort": 0
    }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Surveys": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5009",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
  }
-}
+}
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs
@ -44,7 +44,7 @@ namespace DamageAssesment.Api.Surveys.Providers
                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "en", Title = "Hurricane Andrew Aftermath Survey" });
                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "es", Title = "Encuesta sobre las secuelas del huracán Andrew" });
                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Andrew" });
-                  
+
                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "en", Title = "Hurricane Irma" });
                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "es", Title = "Huracán Irma" });
                    surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "fr", Title = "Ouragan Irma" });
@ -85,7 +85,7 @@ namespace DamageAssesment.Api.Surveys.Providers
            MultiLanguage = dict;
            return MultiLanguage;
        }
-        public string GetStatus(DateTime? StartDate,DateTime? EndDate)
+        public string GetStatus(DateTime? StartDate, DateTime? EndDate)
        {
            try
            {
@ -101,15 +101,12 @@ namespace DamageAssesment.Api.Surveys.Providers
                return SurveyStatus.INACTIVE.ToString();
            }
        }
-
        // Method to get surveys asynchronously with multi-language support
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetActiveSurveysAsync(bool IsActive,string language)
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language)
        {
            IEnumerable<Models.MultiLanSurvey> surveysList = null;
            try
            {
-                string status = SurveyStatus.ACTIVE.ToString();
-                if(!IsActive) status = SurveyStatus.INACTIVE.ToString();
                logger?.LogInformation("Get all Surveys from DB");
                //checking is enabled in survey response 
                var surveys = await surveyDbContext.Surveys.ToListAsync();//Where(s => s.IsEnabled == true)
@ -127,39 +124,6 @@ namespace DamageAssesment.Api.Surveys.Providers
                                      Status = GetStatus(s.StartDate, s.EndDate),
                                      Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id, null, language))
                                  };
-                    logger?.LogInformation($"{surveys.Count} Items(s) found");
-                    return (true, surveysList.Where(a=>a.Status==status).OrderByDescending(a=>a.Id), null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        // Method to get surveys asynchronously with multi-language support
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language)
-        {
-            IEnumerable<Models.MultiLanSurvey> surveysList = null;
-            try
-            {
-                logger?.LogInformation("Get all Surveys from DB");
-                //checking is enabled in survey response 
-                var surveys = await surveyDbContext.Surveys.ToListAsync();//Where(s => s.IsEnabled == true)
-                if (surveys != null)
-                {
-                    surveysList = from s in surveys
-                                  select new Models.MultiLanSurvey
-                                  {
-                                      Id = s.Id,
-                                      StartDate = s.StartDate,
-                                      EndDate = s.EndDate,
-                                      IsEnabled = s.IsEnabled,
-                                      CreatedDate = s.CreatedDate,
-                                      Status= GetStatus(s.StartDate,s.EndDate),
-                                      Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id, null, language))
-                                  };

                    logger?.LogInformation($"{surveys.Count} Items(s) found");
                    return (true, surveysList, null);
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.json
@ -8,10 +8,5 @@
      "Microsoft.AspNetCore": "Warning"
    }
  },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"SurveyConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "SurveyConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess.Test/UsersAccessTest.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess.Test/UsersAccessTest.cs
@ -18,9 +18,9 @@ namespace DamageAssesment.Api.UsersAccess.Test
        public async Task GetTokenAsync_ShouldReturnStatusCode200()
        {
            var response = await MockData.getTokenResponse(true,null);
-            mockService.Setup(service => service.AuthenticateAsync()).ReturnsAsync(response);
+            mockService.Setup(service => service.AuthenticateAsync("Emp1")).ReturnsAsync(response);
            var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.AuthenticateAsync();
+            var result = (OkObjectResult)await controller.AuthenticateAsync("Emp1");
            Assert.Equal(200, result.StatusCode);
        }

@ -28,9 +28,9 @@ namespace DamageAssesment.Api.UsersAccess.Test
        public async Task GetTokenAsync_ShouldReturnStatusCode401()
        {
            var response = await MockData.getTokenResponse(false, null);
-            mockService.Setup(service => service.AuthenticateAsync()).ReturnsAsync(response);
+            mockService.Setup(service => service.AuthenticateAsync("Emp1")).ReturnsAsync(response);
            var controller = new UsersAccessController(mockService.Object);
-            var result = (UnauthorizedObjectResult)await controller.AuthenticateAsync();
+            var result = (UnauthorizedObjectResult)await controller.AuthenticateAsync("Emp1");
            Assert.Equal(401, result.StatusCode);
        }

--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Controllers/UsersAccessController.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Controllers/UsersAccessController.cs
@ -8,38 +8,36 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
    [ApiController]
    public class UsersAccessController : ControllerBase
    {
-        private readonly IUsersAccessProvider userAccessProvider;
+        private IUsersAccessProvider userAccessProvider;

        public UsersAccessController(IUsersAccessProvider userAccessProvider)
        {
            this.userAccessProvider = userAccessProvider;
        }
-        [HttpPost("dadeschools/token")]
-        public async Task<ActionResult> DadeSchoolAuthenticateAsync(UserCredentials userCredentials)
+        [HttpPost("dadeschooltoken")]
+        public async Task<ActionResult> DadeSchoolAuthenticateAsync(string username, string password)
        {
-            var result = await userAccessProvider.AuthenticateAsync(userCredentials.username, userCredentials.password);
-
+            var result = await userAccessProvider.DadeSchoolAuthenticateAsync(username, password);
            if (result.IsSuccess)
            {
                return Ok(result.TokenResponse);
            }
            return Unauthorized(result.ErrorMessage);
        }
-
        [Authorize(Policy = "Dadeschools")]
-        [HttpGet("damageapp/token")]
-        public async Task<ActionResult> AuthenticateAsync()
+        [HttpPost("token/{employecode}")]
+        public async Task<ActionResult> AuthenticateAsync(string employecode)
        {
-            var result = await userAccessProvider.AuthenticateAsync();
-            if (result.IsSuccess)
-            {
-                return Ok(result.TokenResponse);
-            }
-            return Unauthorized(result.ErrorMessage);
+              var result = await userAccessProvider.AuthenticateAsync(employecode);
+              if (result.IsSuccess)
+              {
+                  return Ok(result.TokenResponse);
+              }
+              return Unauthorized(result.ErrorMessage);
        }

        [Authorize(Policy = "Dadeschools")]
-        [HttpPost("damageapp/refreshtoken")]
+        [HttpPost("refreshtoken")]
        public async Task<ActionResult> RefreshTokenAsync(TokenResponse tokenResponse)
        {
            var result = await userAccessProvider.RefreshTokenAsync(tokenResponse);
@ -50,7 +48,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
            return Unauthorized(result.ErrorMessage);
        }

-        [Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles ="admin")]
        [HttpGet("users")]
        public async Task<ActionResult> GetUsersAsync()
        {
@ -62,7 +60,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
            return NoContent();
        }

-       // [Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
        [HttpGet("users/{Id}")]
        public async Task<ActionResult> GetUsersAsync(int Id)
        {
@ -74,7 +72,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
            return NotFound();
        }

-        //[Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
        [HttpGet("roles")]
        public async Task<ActionResult> GetRolesAsync()
        {
@ -85,7 +83,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
            }
            return NoContent();
        }
-        //[Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
        [HttpPost("users")]
        public async Task<ActionResult> PostUserAsync(User user)
        {
@ -97,7 +95,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
            return BadRequest(result.ErrorMessage);
        }

-        //[Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
        [HttpPut("users/{Id}")]
        public async Task<ActionResult> PutUserAsync(int Id, User user)
        {
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/DamageAssesment.Api.UsersAccess.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/DamageAssesment.Api.UsersAccess.csproj
@ -12,22 +12,12 @@
    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <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.10" />
    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.21.0" />
  </ItemGroup>

 </Project>
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Db/UsersAccessDbContext.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Db/UsersAccessDbContext.cs
@ -1,5 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;

 namespace DamageAssesment.Api.UsersAccess.Db
 {
@ -8,15 +7,9 @@ namespace DamageAssesment.Api.UsersAccess.Db
        public DbSet<Db.User> Users { get; set; }
        public DbSet<Db.Role> Roles { get; set; }
        public DbSet<Db.Token> Tokens { get; set; }
-        private IConfiguration _Configuration { get; set; }
-        public UsersAccessDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
+        public UsersAccessDbContext(DbContextOptions options) : base(options)
        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("UsersAccessConnection"));
+
        }

        protected override void OnModelCreating(ModelBuilder modelBuilder)
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/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.UsersAccess/DamageAssesment.Api.UsersAccess.csproj", "DamageAssesment.Api.UsersAccess/"]
-RUN dotnet restore "DamageAssesment.Api.UsersAccess/DamageAssesment.Api.UsersAccess.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.UsersAccess"
-RUN dotnet build "DamageAssesment.Api.UsersAccess.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.UsersAccess.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.UsersAccess.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IEmployeeServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IEmployeeServiceProvider.cs
@ -1,4 +1,4 @@
-using DamageAssesment.Api.UsersAccess.Models;
+using DamageAssesment.Api.UsersAccess.Models;

 namespace DamageAssesment.Api.UsersAccess.Interfaces
 {
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IHttpUtil.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IHttpUtil.cs
@ -1,5 +1,7 @@
-namespace DamageAssesment.Api.UsersAccess.Interfaces
-{
+using DamageAssesment.Api.UsersAccess.Models;
+
+namespace DamageAssesment.Api.UsersAccess.Interfaces 
+{ 
    public interface IHttpUtil
    {
        Task<string> SendAsync(HttpMethod method, string url, string JsonInput, string token);
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/ITokenServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/ITokenServiceProvider.cs
@ -7,7 +7,5 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
    {
        Task<string> GenerateToken(Models.User user);
        Task<TokenResponse> TokenAuthenticate(Models.User user, Claim[] claims);
-
-        Task<string> ConvertJsonToDadeSchoolsJwt(string json);
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IUsersAccessProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IUsersAccessProvider.cs
@ -10,9 +10,8 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PutUserAsync(int Id,Models.User User);
        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> DeleteUserAsync(int Id);
        public Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync();
-        public  Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync();
-        public Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> AuthenticateAsync(string username, string password);
-
+        public  Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employeCode);
+        public Task<(bool IsSuccess, Models.DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password);
        public Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)>RefreshTokenAsync(TokenResponse tokenResponse);
        public void seedData();
    }
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Models/FakeToken.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Models/FakeToken.cs
@ -1,19 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Models
-{
-    public class FakeToken
-    {
-        public long nbf { get; set; }
-        public long exp { get; set; }
-        public string iss { get; set; } = "https://dev-graph.dadeschools.net";
-        public string aud { get; set; } = "damage_assessment";
-        public long iat { get; set; }
-        public string at_hash { get; set; } = "Mw4sAsR_U3MfpqsffDhAqg";
-        public string s_hash { get; set; } = "xADDtg6lVxAXUIFK8hm0Iw";
-        public string sid { get; set; } = "A5EE26B57C27F28ADFEA8C021BB7C4F1";
-        public string sub { get; set; }
-        public long auth_time { get; set; }
-        public string idp { get; set; } = "Dadeschools";
-        public string[] amr { get; set; } = {"external"};
-
-    }
-}
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Models/UserCredentials.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Models/UserCredentials.cs
@ -1,5 +1,5 @@
 public class UserCredentials
 {
    public string username { get; set; }
-    public string password { get; set; }
+   // public string? password { get; set; }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs
@ -17,13 +17,9 @@ const int maxRetryForCircuitBraker = 5;
 const int intervalForCircuitBraker = 5; //5 seconds

 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build =>
-{
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
+
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-var mode = builder.Configuration.GetValue<string>("ModeSettings:mode");


 builder.Services.AddAuthentication().
@ -54,20 +50,16 @@ builder.Services.AddAuthorization(options =>
        .RequireAuthenticatedUser()
        .AddAuthenticationSchemes("DamageApp")
        .Build();
-
-    var DadeschoolsPolicy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser()
+    var DadeschoolsPolicy = new AuthorizationPolicyBuilder()
+        .RequireAuthenticatedUser()
        .AddAuthenticationSchemes("Dadeschools")
        .Build();
-
-    var DadeschoolsPolicyOffline = new AuthorizationPolicyBuilder().RequireAssertion(_ => true)
-                   .Build();
-
    var allPolicy = new AuthorizationPolicyBuilder()
        .RequireAuthenticatedUser()
        .AddAuthenticationSchemes("DamageApp", "Dadeschools")
        .Build();
    options.AddPolicy("DamageApp", DamageAppPolicy);
-    options.AddPolicy("Dadeschools", mode == "online" ? DadeschoolsPolicy : DadeschoolsPolicyOffline);
+    options.AddPolicy("Dadeschools", DadeschoolsPolicy);
    options.AddPolicy("AllPolicies", allPolicy);
    options.DefaultPolicy = options.GetPolicy("DamageApp")!;
 });
@ -130,7 +122,7 @@ builder.Services.AddSwaggerGen(options =>

 builder.Services.AddDbContext<UsersAccessDbContext>(option =>
 {
-    option.UseSqlServer("UsersAccessConnection");
+    option.UseInMemoryDatabase("UsersAccess");
 });
 var app = builder.Build();

@ -148,7 +140,6 @@ if (app.Environment.IsDevelopment())
    }
 }

-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();

--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Providers/UserAccessProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Providers/UserAccessProvider.cs
@ -9,12 +9,10 @@ using Microsoft.IdentityModel.Tokens;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Data;
-using Newtonsoft.Json;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;

-
 namespace DamageAssesment.Api.UsersAccess.Providers
 {
    public class UsersAccessProvider : IUsersAccessProvider
@ -28,7 +26,7 @@ namespace DamageAssesment.Api.UsersAccess.Providers
        private readonly IConfiguration configuration;
        private readonly IHttpContextAccessor httpContextAccessor;

-        public UsersAccessProvider(IConfiguration configuration, IOptions<JwtSettings> options, ITokenServiceProvider tokenServiceProvider, IHttpContextAccessor httpContextAccessor, UsersAccessDbContext userAccessDbContext, IEmployeeServiceProvider employeeServiceProvider, ILogger<UsersAccessProvider> logger, IMapper mapper)
+        public UsersAccessProvider(IConfiguration configuration,IOptions<JwtSettings> options, ITokenServiceProvider tokenServiceProvider, IHttpContextAccessor httpContextAccessor, UsersAccessDbContext userAccessDbContext, IEmployeeServiceProvider employeeServiceProvider, ILogger<UsersAccessProvider> logger, IMapper mapper)
        {
            this.userAccessDbContext = userAccessDbContext;
            this.employeeServiceProvider = employeeServiceProvider;
@ -45,19 +43,19 @@ namespace DamageAssesment.Api.UsersAccess.Providers
        {
            if (!userAccessDbContext.Users.Any())
            {
-                userAccessDbContext.Users.Add(new Db.User { EmployeeId = 1, EmployeeCode = "Emp1", RoleId = 1, IsActive = true, CreateDate = DateTime.Now });
-                userAccessDbContext.Users.Add(new Db.User { EmployeeId = 2, EmployeeCode = "Emp2", RoleId = 2, IsActive = true, CreateDate = DateTime.Now });
-                //userAccessDbContext.Users.Add(new Db.User { EmployeeId = 3, EmployeeCode = "Emp3", RoleId = 3, IsActive = true, CreateDate = DateTime.Now });
+                userAccessDbContext.Users.Add(new Db.User { Id = 1, EmployeeId = 1, EmployeeCode = "Emp1", RoleId = 1, IsActive = true, CreateDate = DateTime.Now });
+                userAccessDbContext.Users.Add(new Db.User { Id = 2, EmployeeId = 2, EmployeeCode = "Emp2", RoleId = 2, IsActive = true, CreateDate = DateTime.Now });
+                userAccessDbContext.Users.Add(new Db.User { Id = 3, EmployeeId = 3, EmployeeCode = "Emp3", RoleId = 3, IsActive = true, CreateDate = DateTime.Now });
                userAccessDbContext.SaveChanges();
            }

            if (!userAccessDbContext.Roles.Any())
            {
-                userAccessDbContext.Roles.Add(new Db.Role { Name = "admin", Description = "Administrator role have full access" });
-                userAccessDbContext.Roles.Add(new Db.Role { Name = "user", Description = " User role" });
-                userAccessDbContext.Roles.Add(new Db.Role { Name = "survey", Description = "Survey role" });
-                userAccessDbContext.Roles.Add(new Db.Role { Name = "report", Description = "Report role" });
-                userAccessDbContext.Roles.Add(new Db.Role { Name = "document", Description = "Document role" });
+                userAccessDbContext.Roles.Add(new Db.Role { Id = 1, Name = "admin", Description ="Administrator role have full access" });
+                userAccessDbContext.Roles.Add(new Db.Role { Id = 2, Name = "user", Description =" User role"});
+                userAccessDbContext.Roles.Add(new Db.Role { Id = 3, Name = "survey", Description ="Survey role" });
+                userAccessDbContext.Roles.Add(new Db.Role { Id = 4, Name = "report", Description ="Report role"});
+                userAccessDbContext.Roles.Add(new Db.Role { Id = 5, Name = "document", Description ="Document role" });
                userAccessDbContext.SaveChanges();
            }
        }
@ -80,41 +78,27 @@ namespace DamageAssesment.Api.UsersAccess.Providers
            {
                logger?.LogInformation("Gell all Users from DB");
                var users = await userAccessDbContext.Users.ToListAsync();
-                List<object> userslist = new List<object>();
+                List<object> userslist= new List<object>();
                if (users != null)
                {
-                    var employees = await employeeServiceProvider.getEmployeesAsync(GetToken());
+                    var employees = await employeeServiceProvider.getEmployeesAsync( GetToken());
                    var roles = await userAccessDbContext.Roles.ToListAsync();
                    foreach (Db.User user in users)
                    {
-                        var employee = employees.SingleOrDefault(a => a.Id == user.EmployeeId);
+                        var employee = employees.SingleOrDefault(a=>a.Id==user.EmployeeId);
                        var role = roles.SingleOrDefault(s => s.Id == user.RoleId);
-
-                        string FirstName = null, LastName = null, EmployeeName = null;
-                        if (employee != null)
-                        {
-                            string[] names = employee.Name.Split(' ');
-                            EmployeeName = employee.Name;
-                            FirstName = names[0];
-                            LastName = EmployeeName.Replace(FirstName + " ", "");
-                        }
                        userslist.Add(new
                        {
                            Id = user.Id,
                            EmployeeId = user.EmployeeId,
                            EmployeeCode = user.EmployeeCode,
-                            FirstName = FirstName,
-                            LastName = LastName,
-                            EmployeeName = EmployeeName,
+                            EmployeeName = (employee != null) ? employee.Name : null,
                            RoleId = user.RoleId,
-                            RoleName = (role != null) ? role.Name : null,
-                            IsActive = user.IsActive,
-                            CreatedDate = user.CreateDate,
-                            UpdatedDate = user.UpdateDate
+                            RoleName = (role != null) ? role.Name : null
                        });
                    }
                    logger?.LogInformation($"{users.Count} Items(s) found");
-                    // var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users);
+                   // var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users);
                    return (true, userslist, null);
                }
                return (false, null, "Not found");
@ -130,33 +114,20 @@ namespace DamageAssesment.Api.UsersAccess.Providers
            try
            {
                logger?.LogInformation("Querying Users table");
-
+                
                var user = await userAccessDbContext.Users.SingleOrDefaultAsync(s => s.Id == Id);
                if (user != null)
                {
-                    var employee = await employeeServiceProvider.getEmployeeAsync(user.EmployeeId, GetToken());
+                    var employee = await employeeServiceProvider.getEmployeeAsync(user.EmployeeId,GetToken());
                    var role = await userAccessDbContext.Roles.SingleOrDefaultAsync(s => s.Id == user.RoleId);
-                    string FirstName = null, LastName = null, EmployeeName = null;
-                    if (employee != null)
-                    {
-                        string[] names = employee.Name.Split(' ');
-                        EmployeeName = employee.Name;
-                        FirstName = names[0];
-                        LastName = EmployeeName.Replace(FirstName + " ", "");
-                    }
                    var data = new
                    {
                        Id = user.Id,
                        EmployeeId = user.EmployeeId,
-                        EmployeeCode = user.EmployeeCode,
-                        FirstName = FirstName,
-                        LastName = LastName,
-                        EmployeeName = EmployeeName,
+                        EmployeeCode=user.EmployeeCode,
+                        EmployeeName = (employee != null) ? employee.Name : null,
                        RoleId = user.RoleId,
-                        RoleName = (role != null) ? role.Name : null,
-                        IsActive = user.IsActive,
-                        CreatedDate = user.CreateDate,
-                        UpdatedDate = user.UpdateDate
+                        RoleName = (role!=null)?role.Name:null
                    };
                    logger?.LogInformation($"User Id: {Id} found");
                    var result = mapper.Map<Db.User, Models.User>(user);
@ -206,12 +177,18 @@ namespace DamageAssesment.Api.UsersAccess.Providers

                    if (_user != null)
                    {
-                        Db.User vUsers = mapper.Map<Models.User, Db.User>(user);
-                        vUsers.UpdateDate = DateTime.Now;
-                        userAccessDbContext.Users.Update(vUsers);
-                        userAccessDbContext.SaveChanges();
-                        user.Id = Id;
-                        return (true, user, "Successful");
+                        int count = userAccessDbContext.Users.Where(u => u.Id != user.Id).Count();
+                        if (count == 0)
+                        {
+                            await userAccessDbContext.SaveChangesAsync();
+                            logger?.LogInformation($"Employee Id:  {user.EmployeeId} updated successfuly");
+                            return (true, mapper.Map<Db.User, Models.User>(_user), $"Employee Id:  {_user.EmployeeId} updated successfuly");
+                        }
+                        else
+                        {
+                            logger?.LogInformation($"Employee Id:  {user.EmployeeId} is already exist");
+                            return (false, null, $"Employee Id:  {user.EmployeeId} is already exist");
+                        }
                    }
                    else
                    {
@ -258,18 +235,58 @@ namespace DamageAssesment.Api.UsersAccess.Providers
            }
        }

-        public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> AuthenticateAsync(string username, string password)
+        public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employecode)
        {
-            var mode = configuration.GetValue<string>("ModeSettings:mode");
-            if (mode == "online")
-                return await DadeSchoolAuthenticateAsync(username, password);
-            else if (mode == "offline") return await DadeSchoolAuthenticateFakeAsync(username, password);
-            else return (false, null, "Invalid mode");
+          
+            if (employecode != null)
+              {
+                //implementation for dadeschools authentication
+                // var employees = await employeeServiceProvider.getEmployeesAsync();
+                // var employee = employees.Where(e=> e.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
+                var user = userAccessDbContext.Users.Where(x => x.IsActive == true && x.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
+       
+                          if (user != null)
+                          {
+
+                              var r = await GetRolesAsync();
+                              var role = r.Roles.Where(x => x.Id == user.RoleId).SingleOrDefault();
+
+                              var authClaims = new List<Claim> {
+                               new Claim(ClaimTypes.Name, user.EmployeeCode),
+                               new Claim(ClaimTypes.Role, role.Name),
+                               new Claim(JwtRegisteredClaimNames.Jti,Guid.NewGuid().ToString())
+
+                              };
+
+                              /// Generate Token
+                              var tokenhandler = new JwtSecurityTokenHandler();
+                              var tokenkey = Encoding.UTF8.GetBytes(jwtSettings.securitykey);
+                              var tokendesc = new SecurityTokenDescriptor
+                              {
+                                  Audience = "",
+                                  NotBefore = DateTime.Now,
+                                  Subject = new ClaimsIdentity(authClaims),
+                                  Expires = DateTime.Now.AddMinutes(30),
+                                  SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(tokenkey), SecurityAlgorithms.HmacSha256)
+                              };
+                              var token = tokenhandler.CreateToken(tokendesc);
+                              string finaltoken = tokenhandler.WriteToken(token);
+
+                              var response = new TokenResponse() { jwttoken = finaltoken, refreshtoken = await tokenServiceProvider.GenerateToken(mapper.Map<Db.User,Models.User>(user)) };
+                              return (true, response, "Authentication success and token issued.");
+                          }
+                          else
+                          {
+                              return (false, null, "user inactive or not exist.");
+                          }
+                  }
+
+              else
+              {
+                  return (false, null, "Credentials are required to authenticate.");
+              }
        }
-
-
-
-        private async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
+        public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
        {
            try
            {
@ -291,116 +308,11 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                    return (true, JsonConvert.DeserializeObject<DadeSchoolToken>(responseString), "");
                }
                return (false, null, responseString);
-
            }
            catch (Exception ex)
            {
                return (false, null, ex.Message);
            }
-        }
-
-        private async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateFakeAsync(string username, string password)
-        {
-            try
-            {
-                var defaultPassword = configuration.GetValue<string>("ModeSettings:userPassword");
-                if (password != defaultPassword)
-                    return (false, null, "Invalid Password");
-
-                long unixTimeNow = (long)DateTime.UtcNow.Subtract(DateTime.UnixEpoch).TotalSeconds;
-                var tokenObject = new Models.FakeToken
-                {
-                    nbf = unixTimeNow,
-                    exp = unixTimeNow + 259200,
-                    iat = unixTimeNow,
-                    auth_time = unixTimeNow,
-                    sub = username
-
-                };
-                var tokenString = JsonConvert.SerializeObject(tokenObject);
-                var jwtToken = await tokenServiceProvider.ConvertJsonToDadeSchoolsJwt(tokenString);
-
-                var response = new DadeSchoolToken
-                {
-                    access_token = jwtToken,
-                    expires_in = 262800,
-                    scope = "openid profile",
-                    token_type = "Bearer"
-                };
-
-                return (true, response, "");
-            }
-            catch (Exception ex)
-            {
-                return (false, null, ex.Message);
-            }
-
-        }
-
-        private string DecodeJwtToken(string token)
-        {
-            try
-            {
-                var handler = new JwtSecurityTokenHandler();
-                var jsonToken = handler.ReadToken(token);
-                var tokenS = handler.ReadToken(token) as JwtSecurityToken;
-
-                if (tokenS == null)
-                    return null;
-
-                var payload = tokenS.Payload.SerializeToJson();
-                return payload;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync()
-        {
-            var dadeschoolsToken = GetToken();
-            var decodedToken = DecodeJwtToken(dadeschoolsToken);
-            var tokenObject = decodedToken == null ? null : JObject.Parse(decodedToken);
-
-            if (tokenObject == null)
-                return (false, null, "JWT authentication is required");
-
-            var employecode = (string)tokenObject["sub"];
-            var user = userAccessDbContext.Users.Where(x => x.IsActive == true && x.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
-            if (user != null)
-            {
-                var r = await GetRolesAsync();
-                var role = r.Roles.Where(x => x.Id == user.RoleId).SingleOrDefault();
-
-                var authClaims = new List<Claim> {
-                               new Claim(ClaimTypes.Name, user.EmployeeCode),
-                               new Claim(ClaimTypes.Role, role.Name),
-                               new Claim(JwtRegisteredClaimNames.Jti,Guid.NewGuid().ToString())
-
-                              };
-
-                /// Generate Token
-                var tokenhandler = new JwtSecurityTokenHandler();
-                var tokenkey = Encoding.UTF8.GetBytes(jwtSettings.securitykey);
-                var tokendesc = new SecurityTokenDescriptor
-                {
-                    Audience = "",
-                    NotBefore = DateTime.Now,
-                    Subject = new ClaimsIdentity(authClaims),
-                    Expires = DateTime.Now.AddDays(3),
-                    SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(tokenkey), SecurityAlgorithms.HmacSha256)
-                };
-                var token = tokenhandler.CreateToken(tokendesc);
-                string finaltoken = tokenhandler.WriteToken(token);
-
-                var response = new TokenResponse() { jwttoken = finaltoken, refreshtoken = await tokenServiceProvider.GenerateToken(mapper.Map<Db.User, Models.User>(user)) };
-                return (true, response, "Authentication success and token issued.");
-            }
-            else
-            {
-                return (false, null, "user inactive or not exist.");
-            }

        }
        public async Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync()
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/EmployeeServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/EmployeeServiceProvider.cs
@ -1,4 +1,4 @@
-using DamageAssesment.Api.UsersAccess.Interfaces;
+using DamageAssesment.Api.UsersAccess.Interfaces;
 using DamageAssesment.Api.UsersAccess.Models;
 using Newtonsoft.Json;

--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/ServiceProviderBase.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/ServiceProviderBase.cs
@ -10,7 +10,7 @@ namespace DamageAssesment.Api.UsersAccess.Services
        protected string ressource;
        protected string urlBase;
        protected string url;
-        
+

        public ServiceProviderBase(IConfiguration configuration, IHttpUtil httpUtil, ILogger<ServiceProviderBase> logger, string ressource, string urlBase)
        {
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/TokenServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/TokenServiceProvider.cs
@ -6,10 +6,8 @@ using DamageAssesment.Api.UsersAccess.Db;
 using DamageAssesment.Api.UsersAccess.Interfaces;
 using DamageAssesment.Api.UsersAccess.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
-using Newtonsoft.Json.Linq;

 namespace DamageAssesment.Api.UsersAccess.Services
 {
@ -17,11 +15,9 @@ namespace DamageAssesment.Api.UsersAccess.Services
    {
        private readonly UsersAccessDbContext usersAccessDbContext;
        private readonly JwtSettings jwtSettings;
-        private readonly IConfiguration configuration;
-        public TokenServiceProvider(IOptions<JwtSettings> options, UsersAccessDbContext usersAccessDbContext, IConfiguration configuration)
+        public TokenServiceProvider(IOptions<JwtSettings> options, UsersAccessDbContext usersAccessDbContext)
        {
            this.usersAccessDbContext = usersAccessDbContext;
-            this.configuration = configuration;
            this.jwtSettings = options.Value;
        }
        public async Task<string> GenerateToken(Models.User user)
@ -59,27 +55,5 @@ namespace DamageAssesment.Api.UsersAccess.Services
            var jwttoken = new JwtSecurityTokenHandler().WriteToken(token);
            return new TokenResponse() { jwttoken = jwttoken, refreshtoken = await GenerateToken(user) };
        }
-
-        public async Task<string> ConvertJsonToDadeSchoolsJwt(string json)
-        {
-            var jsonObject = JObject.Parse(json);
-            var claims = new Claim[jsonObject.Count];
-            int i = 0;
-            foreach (var property in jsonObject.Properties())
-            {
-                claims[i++] = new Claim(property.Name, property.Value.ToString());
-            }
-            var securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetValue<string>("Dadeschools:TokenClientSecret")));
-            var credentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256);
-            var tokenDescriptor = new SecurityTokenDescriptor
-            {
-                Subject = new ClaimsIdentity(claims),
-                Expires = DateTime.UtcNow.AddDays(3),
-                SigningCredentials = credentials
-            };
-            var tokenHandler = new JwtSecurityTokenHandler();
-            var token = tokenHandler.CreateToken(tokenDescriptor);
-            return tokenHandler.WriteToken(token);
-        }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vijay Uppu	9b9bba1f60	Group by issue in responses	2024-01-22 12:17:34 -05:00
Vijay Uppu	1caa3e549b	fixed region issue	2024-01-18 11:44:13 -05:00
Vijay Uppu	d36e7632f2	added survey start and end date validation	2023-12-13 17:11:51 -05:00
Vijay Uppu	9320469798	user access module changes for populating employee Information	2023-12-12 17:13:44 -05:00
Vijay Uppu	992afeab5e	multiple questions updated based on survey id	2023-12-12 13:40:27 -05:00
Vijay Uppu	3f41cf6e10	changed download url format and added new endpoint for doculink isactive update	2023-12-04 14:52:24 -05:00
Vijay Uppu	f8c7fce182	added IsActive flag in doculinks request	2023-12-04 14:40:12 -05:00
Vijay Uppu	432baafc22	attachment and doculinks url changes	2023-12-01 17:55:45 -05:00
Vijay Uppu	902919074e	added multi language support for doculink attachments	2023-11-30 19:25:07 -05:00
Vijay Uppu	cbddb944d5	Return Employee ID for POST	2023-11-28 12:07:12 -05:00
Vijay Uppu	0c7fe88d45	fixed question translation issue	2023-11-15 12:35:17 -05:00
Vijay Uppu	f8cb7e7980	Added new endpoint for creating multiple questions	2023-11-14 15:28:16 -05:00
Vijay Uppu	9c97f08289	added new endpoint to generate dade school token	2023-11-13 15:13:25 -05:00
uppuv	3b07723ebe	removed docker file	2023-11-05 14:37:49 -05:00
uppuv	3f67b578e4	user access module with latest dev branch changes	2023-11-05 14:37:10 -05:00
uppuv	227795aeda	fixed survey issue in response level, and added logic for start and end date as optional date	2023-11-05 14:19:37 -05:00
uppuv	126da500a1	fixed survey issue in response level, and added logic for start and end date as optional date.	2023-11-05 13:39:56 -05:00
uppuv	c80749e292	ixed survey issue in response level, and added logic for start and end date as optional date.	2023-11-05 13:20:29 -05:00
uppuv	6f10e99627	added excel export and removed random number	2023-11-01 12:42:30 -04:00
uppuv	e8e649efd9	reverted doculinks chages for linktype grouping	2023-10-24 11:42:28 -04:00
uppuv	b569f6d404	app settings changes	2023-10-22 10:52:43 -04:00
uppuv	94ea46c466	migrated user access module with latest docker branch changes for In memory	2023-10-20 12:40:03 -04:00
Reginald CHERENFANT JASMIN	15acd00959	Project Folder Name changed from SurveyResponses to Responses	2023-09-26 15:38:59 -05:00
Reginald CHERENFANT JASMIN	46520c7e62	Update test case project for UserAccess and SurveyResponse modules. Renaming of SurveyResponses to Responses.	2023-09-26 15:22:26 -05:00
Reginald Cherenfant Jasmin	f6387fc371	adding Test project for userAccess module	2023-09-26 01:13:19 -04:00
Reginald CHERENFANT JASMIN	4ebd40108d	Dadeschools JWT based authentication integration	2023-09-20 09:47:27 -05:00
Reginald Cherenfant Jasmin	77816605d1	implementation of Authentication using JWT. Security applied on all microservices endpoints.	2023-09-20 00:32:30 -04:00