Group by issue in responses

date as optional date.

.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\DamageAssesment.sln",
+  "PreviewInSolutionExplorer": false
+}

DamageAssesmentApi/.dockerignore

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

DamageAssesmentApi/.gitignore

@@ -395,4 +395,5 @@ FodyWeavers.xsd
 *.msp
 
 # JetBrains Rider
-*.sln.iml
+*.sln.iml
+**/migrations/

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

@@ -1,17 +1,25 @@
-<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>
 

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

@@ -1,13 +1,19 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.Answers.Db
 {
     public class AnswerDbContext:DbContext
     {
-
-        public AnswerDbContext(DbContextOptions options):base(options) 
+        private IConfiguration _Configuration { get; set; }
+        public AnswerDbContext(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("AnswerConnection"));
         }
         public DbSet<Db.Answer> Answers { get; set; }
         protected override void OnModelCreating(ModelBuilder modelBuilder)

DamageAssesmentApi/DamageAssesment.Api.Answers/Dockerfile

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

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -73,7 +73,7 @@ builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AnswerDbContext>(option =>
 {
-    option.UseInMemoryDatabase("Answers");
+    option.UseSqlServer("AnswerConnection");
 });
 
 var app = builder.Build();

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

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

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

@@ -198,13 +198,12 @@ namespace DamageAssesment.Api.Answers.Providers
         {
             if (!answerDbContext.Answers.Any())
             {
-                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.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.SaveChanges();
             }
         }

DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.json

@@ -8,5 +8,10 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "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;"
+
+  }
 }

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);
         }

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

@@ -13,11 +13,12 @@ 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.
@@ -91,7 +92,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)
                     {
@@ -120,7 +121,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)
                         {

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

@@ -5,6 +5,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,8 +14,20 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <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>
 

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

@@ -1,11 +1,19 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.Attachments.Db
 {
     public class AttachmentsDbContext:DbContext
     {
-        public AttachmentsDbContext(DbContextOptions options) : base(options)
+        private IConfiguration _Configuration { get; set; }
+        public AttachmentsDbContext(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("AttachmentConnection"));
         }
         public DbSet<Db.Attachment> Attachments { get; set; }
         protected override void OnModelCreating(ModelBuilder modelBuilder)

DamageAssesmentApi/DamageAssesment.Api.Attachments/Dockerfile

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

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

@@ -1,10 +1,15 @@
 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);
-        void DeleteFile(string path);
+        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);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -78,7 +78,7 @@ builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AttachmentsDbContext>(option =>
 {
-    option.UseInMemoryDatabase("Attachments");
+    option.UseSqlServer("AttachmentConnection");
 });
 builder.Services.Configure<FormOptions>(o =>
 {

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

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

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()
         {

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

@@ -3,6 +3,9 @@ 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
 {
@@ -10,11 +13,95 @@ namespace DamageAssesment.Api.Attachments.Providers
     {
         BlobServiceClient _blobClient;
         BlobContainerClient _containerClient;
-        string azureConnectionString = "<Primary Connection String>";
-        public AzureBlobService()
+        string azureConnectionString;
+        private string uploadpath = "";
+        private string Deletepath = "";
+        public AzureBlobService(IConfiguration configuration)
         {
-            _blobClient = new BlobServiceClient(azureConnectionString);
-            _containerClient = _blobClient.GetBlobContainerClient("apiimages");
+            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;
         }
 
         public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
@@ -35,10 +122,52 @@ namespace DamageAssesment.Api.Attachments.Providers
 
             return azureResponse;
         }
-        public void DeleteFile(string url)
+        public string getMovefilename(string movefilename)
         {
-            var blob = _containerClient.GetBlockBlobClient(url);
-            blob.DeleteIfExists();
+            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();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json

@@ -11,6 +11,14 @@
   "AllowedHosts": "*",
   "Fileupload": {
     "folderpath": "DMS_Attachments/Active",
-    "Deletepath": "DMS_Attachments/Deleted"
+    "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;"
+
   }
 }
+  

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

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

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

@@ -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);
 

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()

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

@@ -5,7 +5,6 @@ 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
 {
@@ -14,6 +13,7 @@ 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>
-        [HttpGet]
         [Authorize(Roles = "admin")]
+        [HttpGet]
         [Route("doculinks/types/{id}")]
         [Route("doculinks/types/{id}/{language:alpha}")]
         public async Task<IActionResult> GetLinkTypeAsync(int id, string? language)
@@ -206,7 +206,6 @@ 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}")]
@@ -223,7 +222,6 @@ 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]
@@ -254,7 +252,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// Upload new document.
+        /// update existing doclink.
         /// </summary>
         [Authorize(Roles = "admin")]
         [HttpPut]
@@ -267,7 +265,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 if (dbdoc.IsSuccess)
                 {
                     var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink = uploadService.UpdateDocuments(documents.counter, dbdoc.Document, documentInfo);
+                    Models.Doculink DocuLink=  uploadService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
                     var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
                     if (result.IsSuccess)
                     {
@@ -296,7 +294,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)
@@ -322,7 +320,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             }
         }
         /// <summary>
-        /// Delete document by id.
+        /// Delete Doculink by id.
         /// </summary>
         [Authorize(Roles = "admin")]
         [HttpDelete]

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

@@ -1,15 +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="Azure.Storage.Blobs" Version="12.16.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.18.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" />
@@ -23,6 +25,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

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

@@ -7,8 +7,15 @@ namespace DamageAssesment.Api.DocuLinks.Db
 {
     public class DoculinkDbContext : DbContext
     {
-        public DoculinkDbContext(DbContextOptions options) : base(options)
+        private IConfiguration _Configuration { get; set; }
+        public DoculinkDbContext(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("DoculinkConnection"));
         }
         public DbSet<Db.Doculink> Documents { get; set; }
         public DbSet<Db.LinkType> LinkTypes { get; set; }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile

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

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

@@ -1,10 +1,14 @@
 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);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -76,7 +76,7 @@ builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<DoculinkDbContext>(option =>
 {
-    option.UseInMemoryDatabase("DocumentConnection");
+    option.UseSqlServer("DoculinkConnection");
 });
 var app = builder.Build();
 

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

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

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

@@ -1,8 +1,17 @@
 
+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
 {
@@ -10,11 +19,111 @@ namespace DamageAssesment.Api.DocuLinks.Providers
     {
         BlobServiceClient _blobClient;
         BlobContainerClient _containerClient;
-        string azureConnectionString = "<Primary Connection String>";
-        public AzureBlobService()
+        string azureConnectionString;
+        private string uploadpath = "";
+        private string Deletepath = "";
+        public AzureBlobService(IConfiguration configuration)
         {
-            _blobClient = new BlobServiceClient(azureConnectionString);
-            _containerClient = _blobClient.GetBlobContainerClient("apiimages");
+            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();
+            }
         }
 
         public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
@@ -35,10 +144,52 @@ 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)
         {
-            var blob = _containerClient.GetBlockBlobClient(url);
-            blob.DeleteIfExists();
+            BlobClient sourceBlobClient = _containerClient.GetBlobClient(url);
+            sourceBlobClient.DeleteIfExists();
         }
     }
 }

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

@@ -24,11 +24,12 @@ 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, IHttpContextAccessor httpContextAccessor)
+        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IAzureBlobService azureBlobService, IHttpContextAccessor httpContextAccessor)
         {
             this.DocumentDbContext = DocumentDbContext;
             this.logger = logger;
@@ -37,12 +38,13 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             this.httpContextAccessor = httpContextAccessor;
             baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
             baseUrl = baseUrl + "/doculinks/download";
-            SeedData();
+            this.azureBlobService = azureBlobService;
+            //SeedData();
         }
 
 
 
-        private void SeedData()
+        private async Task SeedDataAsync()
         {
             if (!DocumentDbContext.LinkTypes.Any())
             {

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

@@ -116,15 +116,16 @@ 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}", counter, item.FileExtension);
+                        var fileName = String.Format("Document_{0}_{1}{2}", document.Id, counter1, item.FileExtension);
                         path = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
+                        counter1++;
                     }
                     else
                         path = item.url;

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
@@ -6,12 +9,15 @@
     }
   },
   "AllowedHosts": "*",
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  "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;"
+
   },
   "Fileupload": {
     "folderpath": "DASA_Documents/Active",
-    "Deletepath": "DASA_Documents/Deleted"
+    "Deletepath": "DASA_Documents/Deleted",
+    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
+    "BlobContainerName": "doculinks"
   }
 }
-

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

@@ -5,13 +5,26 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
+    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <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>
 

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

@@ -4,18 +4,23 @@ namespace DamageAssesment.Api.Employees.Db
 {
     public class EmployeeDbContext: DbContext
     {
-        public DbSet<Db.Employee> Employees { get; set; }
-        public EmployeeDbContext(DbContextOptions options) : base(options)
+        private IConfiguration _Configuration { get; set; }
+        public EmployeeDbContext(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("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; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile

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

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -75,7 +75,7 @@ builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<EmployeeDbContext>(option =>
 {
-    option.UseInMemoryDatabase("Employees");
+    option.UseSqlServer("EmployeeConnection");
 });
 
 var app = builder.Build();

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

@@ -8,5 +8,10 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "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;"
+
+  }
 }

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

@@ -5,13 +5,27 @@
     <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>
 

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

@@ -4,6 +4,16 @@ 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)

DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile

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

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -74,7 +74,7 @@ builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<LocationDbContext>(option =>
 {
-    option.UseInMemoryDatabase("Locations");
+    option.UseSqlServer("LocationConnection");
 });
 
 

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

@@ -1,23 +1,14 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:20458",
-      "sslPort": 0
-    }
-  },
+{
   "profiles": {
     "DamageAssesment.Api.Locations": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5213",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5213"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -26,6 +17,24 @@
       "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:20458",
+      "sslPort": 0
     }
   }
-}
+}

DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.json

@@ -8,5 +8,10 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "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;"
+
+  }
 }

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

@@ -1,6 +1,6 @@
 using DamageAssesment.Api.Questions.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using DamageAssesment.Api.Questions.Models;
+using Microsoft.AspNetCore.Authorization;
 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.

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

@@ -5,13 +5,27 @@
     <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>
 

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

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

DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile

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

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

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

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

@@ -1,23 +1,14 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:60754",
-      "sslPort": 0
-    }
-  },
+{
   "profiles": {
     "DamageAssesment.Api.Questions": {
       "commandName": "Project",
-      "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5133",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "dotnetRunMessages": true,
+      "applicationUrl": "http://localhost:5133"
     },
     "IIS Express": {
       "commandName": "IISExpress",
@@ -26,6 +17,24 @@
       "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:60754",
+      "sslPort": 0
     }
   }
-}
+}

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)
                         });
                     }

DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json

@@ -8,5 +8,10 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "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;"
+
+  }
 }

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/DamageAssesment.Api.Questions.Test.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="xunit" Version="2.4.2" />

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

@@ -86,8 +86,9 @@ 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;
         }
+
     }
 }

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

@@ -356,6 +356,5 @@ namespace DamageAssesment.Api.Questions.Test
 
             Assert.Equal(404, result.StatusCode);
         }
-
     }
 }

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

@@ -5,15 +5,32 @@
     <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="EPPlus" Version="7.0.0" />
+    <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="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>

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

@@ -4,12 +4,17 @@ namespace DamageAssesment.Api.Responses.Db
 {
     public class SurveyResponseDbContext:DbContext
     {
-        public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }
-
-        public SurveyResponseDbContext(DbContextOptions options) : base(options)
+        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; }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

DamageAssesmentApi/DamageAssesment.Api.Responses/Dockerfile

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

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

@@ -7,4 +7,4 @@ namespace DamageAssesment.Api.Responses.Interfaces
         Task<List<Employee>> getEmployeesAsync(string token);
         Task<Employee> getEmployeeAsync(int employeeId, string token);
     }
-}
+}

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);

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; }
 

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

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

DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs

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

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

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

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

@@ -1,16 +1,16 @@
-using DamageAssesment.Api.Responses.Interfaces;
+using ClosedXML.Excel;
+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 = OfficeOpenXml.LicenseContext.NonCommercial;
+        { 
+            ExcelPackage.LicenseContext = 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;
-
+                        
                     }
                 }
             }

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);
@@ -528,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);
 
@@ -587,7 +587,7 @@ namespace DamageAssesment.Api.Responses.Providers
                 .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//obj.EmployeeId,
                 .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
                 .ToList();
-
+                
                 var answers = await answerServiceProvider.getAnswersAsync(token);
                 var questions = await questionServiceProvider.getQuestionsAsync(null, token);
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
@@ -657,7 +657,7 @@ namespace DamageAssesment.Api.Responses.Providers
 
 
                 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
@@ -922,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);
 

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);
 

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

@@ -1,7 +1,6 @@
 using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
-using OfficeOpenXml.FormulaParsing.LexicalAnalysis;
 
 namespace DamageAssesment.Api.Responses.Services
 {
@@ -11,13 +10,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())
@@ -30,7 +29,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
             {

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;
             }

DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json

@@ -6,15 +6,31 @@
     }
   },
   "AllowedHosts": "*",
-  "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"
+  "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"
+  },
+
   "RessourceSettings": {
     "Employee": "/employees",
     "EmployeeById": "/employees/{0}",

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

@@ -5,13 +5,27 @@
     <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>
 

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

@@ -4,11 +4,18 @@ 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; }
-        public SurveysDbContext(DbContextOptions options) : base(options)
+        protected override void OnConfiguring(DbContextOptionsBuilder options)
         {
-
+            // connect to sql server with connection string from app settings
+            options.UseSqlServer(_Configuration.GetConnectionString("SurveyConnection"));
         }
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {

DamageAssesmentApi/DamageAssesment.Api.Surveys/Dockerfile

@@ -0,0 +1,21 @@
+#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"]

DamageAssesmentApi/DamageAssesment.Api.Surveys/Program.cs

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

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

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

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
             {
@@ -110,7 +110,6 @@ namespace DamageAssesment.Api.Surveys.Providers
                 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
@@ -121,7 +120,7 @@ namespace DamageAssesment.Api.Surveys.Providers
                                       EndDate = s.EndDate,
                                       IsEnabled = s.IsEnabled,
                                       CreatedDate = s.CreatedDate,
-                                      Status = GetStatus(s.StartDate, s.EndDate),
+                                      Status= GetStatus(s.StartDate,s.EndDate),
                                       Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id, null, language))
                                   };
 

DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.json

@@ -8,5 +8,10 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "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;"
+
+  }
 }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/DamageAssesment.Api.UsersAccess.csproj

@@ -12,8 +12,17 @@
     <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.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
+    <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.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" />

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Db/UsersAccessDbContext.cs

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.UsersAccess.Db
 {
@@ -7,9 +8,15 @@ 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; }
-        public UsersAccessDbContext(DbContextOptions options) : base(options)
+        private IConfiguration _Configuration { get; set; }
+        public UsersAccessDbContext(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("UsersAccessConnection"));
         }
 
         protected override void OnModelCreating(ModelBuilder modelBuilder)

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Dockerfile

@@ -0,0 +1,21 @@
+#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"]

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IUsersAccessProvider.cs

@@ -4,8 +4,8 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
 {
     public interface IUsersAccessProvider
     {
-       public Task<(bool IsSuccess, IEnumerable<object> Users, string ErrorMessage)> GetUsersAsync();
-        public Task<(bool IsSuccess, object User, string ErrorMessage)> GetUsersAsync(int Id);
+       public Task<(bool IsSuccess, IEnumerable< Models.User> Users, string ErrorMessage)> GetUsersAsync();
+        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> GetUsersAsync(int Id);
         public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PostUserAsync(Models.User User);
         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);

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/Interface.cs

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

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs

@@ -66,7 +66,6 @@ builder.Services.AddAuthorization(options =>
 
 var _jwtsettings = builder.Configuration.GetSection("JwtSettings");
 builder.Services.Configure<JwtSettings>(_jwtsettings);
-builder.Services.AddHttpContextAccessor();
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -122,7 +121,7 @@ builder.Services.AddSwaggerGen(options =>
 
 builder.Services.AddDbContext<UsersAccessDbContext>(option =>
 {
-    option.UseInMemoryDatabase("UsersAccess");
+    option.UseSqlServer("UsersAccessConnection");
 });
 var app = builder.Build();
 

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Providers/UserAccessProvider.cs

@@ -2,13 +2,11 @@
 using DamageAssesment.Api.UsersAccess.Db;
 using DamageAssesment.Api.UsersAccess.Interfaces;
 using DamageAssesment.Api.UsersAccess.Models;
-using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 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;
@@ -20,86 +18,55 @@ namespace DamageAssesment.Api.UsersAccess.Providers
         private readonly UsersAccessDbContext userAccessDbContext;
         private readonly ILogger<UsersAccessProvider> logger;
         private readonly IMapper mapper;
-        private readonly IEmployeeServiceProvider employeeServiceProvider;
+        //private readonly IEmployeeServiceProvider employeeServiceProvider;
         private readonly JwtSettings jwtSettings;
-        private readonly ITokenServiceProvider tokenServiceProvider;
+        private readonly ITokenServiceProvider tokenServiceProvider; 
         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, UsersAccessDbContext userAccessDbContext, IEmployeeServiceProvider employeeServiceProvider, ILogger<UsersAccessProvider> logger, IMapper mapper)
         {
             this.userAccessDbContext = userAccessDbContext;
-            this.employeeServiceProvider = employeeServiceProvider;
+            //this.employeeServiceProvider = employeeServiceProvider;
             this.logger = logger;
             this.mapper = mapper;
             jwtSettings = options.Value;
             this.tokenServiceProvider = tokenServiceProvider;
-            this.httpContextAccessor = httpContextAccessor;
             this.configuration = configuration;
-            seedData();
+            // seedData();
         }
 
         public void seedData()
         {
             if (!userAccessDbContext.Users.Any())
             {
-                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.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.SaveChanges();
             }
 
             if (!userAccessDbContext.Roles.Any())
             {
-                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.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.SaveChanges();
             }
         }
-        private string GetToken()
-        {
-            string token = httpContextAccessor.HttpContext.Request.Headers.Authorization;
-            if (token != null)
-            {
-                token = token.Replace("Bearer ", string.Empty);
-            }
-            else
-            {
-                token = "";
-            }
-            return token;
-        }
-        public async Task<(bool IsSuccess, IEnumerable<object> Users, string ErrorMessage)> GetUsersAsync()
+
+        public async Task<(bool IsSuccess, IEnumerable<Models.User> Users, string ErrorMessage)> GetUsersAsync()
         {
             try
             {
                 logger?.LogInformation("Gell all Users from DB");
                 var users = await userAccessDbContext.Users.ToListAsync();
-                List<object> userslist= new List<object>();
                 if (users != null)
                 {
-                    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 role = roles.SingleOrDefault(s => s.Id == user.RoleId);
-                        userslist.Add(new
-                        {
-                            Id = user.Id,
-                            EmployeeId = user.EmployeeId,
-                            EmployeeCode = user.EmployeeCode,
-                            EmployeeName = (employee != null) ? employee.Name : null,
-                            RoleId = user.RoleId,
-                            RoleName = (role != null) ? role.Name : null
-                        });
-                    }
                     logger?.LogInformation($"{users.Count} Items(s) found");
-                   // var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users);
-                    return (true, userslist, null);
+                    var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users);
+                    return (true, result, null);
                 }
                 return (false, null, "Not found");
             }
@@ -109,29 +76,18 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, object User, string ErrorMessage)> GetUsersAsync(int Id)
+
+        public async Task<(bool IsSuccess, Models.User User, string ErrorMessage)> GetUsersAsync(int Id)
         {
             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 role = await userAccessDbContext.Roles.SingleOrDefaultAsync(s => s.Id == user.RoleId);
-                    var data = new
-                    {
-                        Id = user.Id,
-                        EmployeeId = user.EmployeeId,
-                        EmployeeCode=user.EmployeeCode,
-                        EmployeeName = (employee != null) ? employee.Name : null,
-                        RoleId = user.RoleId,
-                        RoleName = (role!=null)?role.Name:null
-                    };
                     logger?.LogInformation($"User Id: {Id} found");
                     var result = mapper.Map<Db.User, Models.User>(user);
-                    return (true, data, null);
+                    return (true, result, null);
                 }
                 return (false, null, "Not found");
             }
@@ -234,7 +190,35 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                 return (false, null, ex.Message);
             }
         }
+        public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
+        {
+            try
+            {
+                var client = new HttpClient();
+                var request = new HttpRequestMessage(HttpMethod.Post, configuration.GetValue<string>("Dadeschools:TokenUrl"));
+                var collection = new List<KeyValuePair<string, string>>();
+                collection.Add(new("client_id", configuration.GetValue<string>("Dadeschools:TokenClientId")));
+                collection.Add(new("client_secret", configuration.GetValue<string>("Dadeschools:TokenClientSecret")));
+                collection.Add(new("scope", configuration.GetValue<string>("Dadeschools:scope")));
+                collection.Add(new("grant_type", configuration.GetValue<string>("Dadeschools:grant_type")));
+                collection.Add(new("username", username));
+                collection.Add(new("password", password));
+                var content = new FormUrlEncodedContent(collection);
+                request.Content = content;
+                var response = await client.SendAsync(request);
+                var responseString = await response.Content.ReadAsStringAsync();
+                if (response.IsSuccessStatusCode)
+                {
+                    return (true, JsonConvert.DeserializeObject<DadeSchoolToken>(responseString), "");
+                }
+                return (false, null, responseString);
+            }
+            catch (Exception ex)
+            {
+                return (false, null, ex.Message);
+            }
 
+        }
         public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employecode)
         {
           
@@ -286,35 +270,6 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                   return (false, null, "Credentials are required to authenticate.");
               }
         }
-        public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
-        {
-            try
-            {
-                var client = new HttpClient();
-                var request = new HttpRequestMessage(HttpMethod.Post, configuration.GetValue<string>("Dadeschools:TokenUrl"));
-                var collection = new List<KeyValuePair<string, string>>();
-                collection.Add(new("client_id", configuration.GetValue<string>("Dadeschools:TokenClientId")));
-                collection.Add(new("client_secret", configuration.GetValue<string>("Dadeschools:TokenClientSecret")));
-                collection.Add(new("scope", configuration.GetValue<string>("Dadeschools:scope")));
-                collection.Add(new("grant_type", configuration.GetValue<string>("Dadeschools:grant_type")));
-                collection.Add(new("username", username));
-                collection.Add(new("password", password));
-                var content = new FormUrlEncodedContent(collection);
-                request.Content = content;
-                var response = await client.SendAsync(request);
-                var responseString = await response.Content.ReadAsStringAsync();
-                if (response.IsSuccessStatusCode)
-                {
-                    return (true, JsonConvert.DeserializeObject<DadeSchoolToken>(responseString), "");
-                }
-                return (false, null, responseString);
-            }
-            catch (Exception ex)
-            {
-                return (false, null, ex.Message);
-            }
-
-        }
         public async Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync()
         {
             try

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;
 
@@ -10,11 +10,11 @@ namespace DamageAssesment.Api.UsersAccess.Services
         {
         }
 
-        public async Task<List<Employee>> getEmployeesAsync(string token)
+        public async Task<List<Employee>> getEmployeesAsync()
         {
             try
             {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString);
 
                 if (employees == null || !employees.Any())
@@ -28,12 +28,12 @@ namespace DamageAssesment.Api.UsersAccess.Services
             }
         }
 
-        public async Task<Employee> getEmployeeAsync(int employeeId, string token)
+        public async Task<Employee> getEmployeeAsync(int employeeId)
         {
             try
             {
                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:EmployeeById"), employeeId);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString);
 
                 if (employee == null)

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

@@ -14,7 +14,7 @@ namespace DamageAssesment.Api.UsersAccess.Services
             this.httpClient = httpClient;
             this.logger = logger;
         }
-        public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput,string token)
+        public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput)
         {
             try
             {
@@ -22,7 +22,7 @@ namespace DamageAssesment.Api.UsersAccess.Services
                 request.Headers.Accept.Clear();
                 request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
 
-                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
+                //request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
                 if (method == HttpMethod.Post)
                 {
                     request.Content = new StringContent(JsonInput, Encoding.UTF8, "application/json");

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)
         {

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/appsettings.json

@@ -36,5 +36,10 @@
       "Name": "profile",
       "Description": "Read basic information about you such as your date of brith and full name"
     }
-  ]
+  ],
+  "ConnectionStrings": {
+    // "UsersAccessConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    "UsersAccessConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
+
+  }
 }

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

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DamageAssesment.Api.Responses\DamageAssesment.Api.Responses.csproj" />
+  </ItemGroup>
+
+</Project>

DamageAssesmentApi/DamageAssesment.Responses.Test/MockData.cs

@@ -0,0 +1,30 @@
+
+using DamageAssesment.Api.Responses.Models;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DamageAssesment.Api.Responses.Test
+{
+    public class MockData
+    {
+        public static async Task<(bool, SurveyResponse, string)> getOkResponse(SurveyResponse data)
+        {
+            return (true, data, null);
+        }
+
+        public static async Task<(bool, dynamic, string)> getOkResponse()
+        {
+            return (true, new { }, null);
+        }
+
+        public static async Task<(bool, Models.SurveyResponse, string)> getResponse()
+        {
+            return (false, null, null);
+        }
+
+        public static async Task<Models.SurveyResponse> getSurveyResponseObject()
+        {
+            return new Models.SurveyResponse { EmployeeId = 1, LocationId = 1, SurveyId = 1, Id = 1 };
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Responses.Test/ResponsesServiceTest.cs

@@ -0,0 +1,251 @@
+using DamageAssesment.Api.Responses.Controllers;
+using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Models;
+using DamageAssesment.Api.Responses.Test;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using Xunit;
+
+
+namespace DamageAssesment.SurveyResponses.Test
+{
+    public class ResponsesServiceTest
+    {
+        private  Mock<ISurveysResponse> mockSurveyResponseService;
+        private string token { get; set; }
+        public ResponsesServiceTest()
+        {
+            mockSurveyResponseService = new Mock<ISurveysResponse>();
+            token = Guid.NewGuid().ToString();
+        }
+
+        [Fact(DisplayName = "Get Responses - Ok case")]
+        public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse(mockRequestObject);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync()).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync();
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses - BadRequest case")]
+        public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode204()
+        {
+            var mockResponse = await MockData.getResponse();
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync()).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync();
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by surveyId - Ok case")]
+        public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse();
+<<<<<<<< HEAD:DamageAssesmentApi/DamageAssesment.Api.Responses.Test/SurveyResponsesServiceTest.cs
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1,1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
+========
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
+>>>>>>>> Azure-Integration:DamageAssesmentApi/DamageAssesment.Responses.Test/ResponsesServiceTest.cs
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by surveyId - NoContent case")]
+        public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode204()
+        {
+            var mockResponse = await MockData.getResponse();
+<<<<<<<< HEAD:DamageAssesmentApi/DamageAssesment.Api.Responses.Test/SurveyResponsesServiceTest.cs
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1,1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
+========
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
+>>>>>>>> Azure-Integration:DamageAssesmentApi/DamageAssesment.Responses.Test/ResponsesServiceTest.cs
+            Assert.Equal(204, result.StatusCode);
+        }
+
+
+
+
+        [Fact(DisplayName = "Get Responses by surveyId and locationId - Ok case")]
+        public async Task GetSurveyResponsesBySurveyLocationAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse();
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1);
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by surveyId  and locationId - NoContent case")]
+        public async Task GetSurveyResponsesBySurveyLocationAsync_ShouldReturnStatusCode204()
+        {
+            var mockResponse = await MockData.getResponse();
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1);
+            Assert.Equal(204, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by surveyId and QuestionId and Answer - Ok case")]
+        public async Task GetSurveyResponsesBySurveyQuestionAnswerAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse();
+            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes")).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes");
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by surveyId and QuestionId and Answer - NoContent case")]
+        public async Task GetSurveyResponsesBySurveyQuestionAnswerAsync_ShouldReturnStatusCode204()
+        {
+            var mockResponse = await MockData.getResponse();
+            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes")).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes");
+            Assert.Equal(204, result.StatusCode);
+        }
+
+
+        [Fact(DisplayName = "Get Responses by region and surveyId - Ok case")]
+        public async Task GetSurveyResponsesByRegionSurveyAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse();
+            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1);
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by region and surveyId - NoContent Case")]
+        public async Task GetSurveyResponsesByRegionSurveyAsync_ShouldReturnStatusCode204()
+        {
+            var mockResponse = await MockData.getResponse();
+            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1);
+            Assert.Equal(204, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - Ok case")]
+        public async Task GetSurveyResponsesMaintenanceCenterSurveyAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse();
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1);
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - No Content  Case")]
+        public async Task GetSurveyResponsesMaintenanceCenterSurveyAsync_ShouldReturnStatusCode204()
+        {
+            var mockResponse = await MockData.getResponse();
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1);
+            Assert.Equal(204, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get SurveyResponse by responseId- Ok case")]
+        public async Task GetSurveyResponsesByResponseIdyAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse();
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - NoContent Case")]
+        public async Task GetSurveyResponsesByResponseIdyAsync_ShouldReturnStatusCode204()
+        {
+            var mockResponse = await MockData.getResponse();
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
+            Assert.Equal(204, result.StatusCode);
+        }
+
+
+        [Fact(DisplayName = "Post Responses - Ok case")]
+        public async Task PostSurveyAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse(mockRequestObject);
+            mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse);
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Post Responses - BadRequest case")]
+        public async Task PostSurveyAsync_ShouldReturnStatusCode400()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getResponse();
+            mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse);
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (BadRequestObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Responses - Ok case")]
+        public async Task PutSurveyAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse(mockRequestObject);
+            mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse);
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Responses - BadRequest case")]
+        public async Task PutSurveyAsync_ShouldReturnStatusCode404()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getResponse();
+            mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse); ;
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (BadRequestObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Delete Responses - Ok case")]
+        public async Task DeleteSurveyAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse(mockRequestObject);
+            mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse);
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (OkObjectResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Delete Responses - NotFound case")]
+        public async Task DeleteSurveyAsync_ShouldReturnStatusCode404()
+        {
+            var mockResponse = await MockData.getResponse();
+            mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse); ;
+            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var result = (NotFoundResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
+            Assert.Equal(404, result.StatusCode);
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.sln

@@ -11,6 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Attachm
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4CB40DC2-D9D2-4384-A7A6-9968F5C777A2}"
 	ProjectSection(SolutionItems) = preProject
+		..\..\..\..\Sample\Migrations.ps1 = ..\..\..\..\Sample\Migrations.ps1
 		ReadMe.txt = ReadMe.txt
 		ReadMe4Dev.txt = ReadMe4Dev.txt
 	EndProjectSection
@@ -33,18 +34,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Employe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Employees.Test", "DamageAssesment.Api.Employees.Test\DamageAssesment.Api.Employees.Test.csproj", "{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks", "DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj", "{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks.Test", "DamageAssesment.Api.DocuLinks.Test\DamageAssesment.Api.DocuLinks.Test.csproj", "{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses", "DamageAssesment.Api.Responses\DamageAssesment.Api.Responses.csproj", "{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses.Test", "DamageAssesment.Api.Responses.Test\DamageAssesment.Api.Responses.Test.csproj", "{26BFCF59-0D24-41C1-9202-D4FFCC52389B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.UsersAccess", "DamageAssesment.Api.UsersAccess\DamageAssesment.Api.UsersAccess.csproj", "{40240AD6-90D2-4128-BCDF-12C77D1B1B55}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.UsersAccess.Test", "DamageAssesment.Api.UsersAccess.Test\DamageAssesment.Api.UsersAccess.Test.csproj", "{ADAF9385-262C-4A37-A603-A53B77EA515D}"
 EndProject
+Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{0DD44934-6826-43C8-A438-320A05209967}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks", "DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj", "{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses", "DamageAssesment.Api.Responses\DamageAssesment.Api.Responses.csproj", "{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses.Test", "DamageAssesment.Api.Responses.Test\DamageAssesment.Api.Responses.Test.csproj", "{22014966-BF3D-463A-B561-46635BE75C89}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -99,22 +102,10 @@ Global
 		{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -123,6 +114,22 @@ Global
 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{22014966-BF3D-463A-B561-46635BE75C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{22014966-BF3D-463A-B561-46635BE75C89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{22014966-BF3D-463A-B561-46635BE75C89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{22014966-BF3D-463A-B561-46635BE75C89}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DamageAssesmentApi/azure-pipelines.yml

@@ -1,18 +0,0 @@
-trigger:
-  - '*'
-
-pr:
-  - '*'
-
-pool:
-  vmImage: 'ubuntu-latest'
-
-steps:
-  - checkout: self
-
-  - script: |
-      #!/bin/bash
-
-      chmod +x ./Scripts/build_and_push_services2acr.sh
-      ./Scripts/build_and_push_services2acr.sh
-    displayName: 'Run build_and_push_services2acr.sh'

DamageAssesmentApi/docker-compose.acr.yml

@@ -0,0 +1,75 @@
+version: '3.4'
+
+services:
+  damageassesment.api.answers:
+    image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapianswers
+    build:
+      context: .
+      dockerfile: DamageAssesment.Api.Answers/Dockerfile
+    ports:
+      - "6001:80"
+    command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapianswers"
+
+  damageassesment.api.attachments:
+    image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapiattachments
+    build:
+      context: .
+      dockerfile: DamageAssesment.Api.Attachments/Dockerfile
+    ports:
+      - "6001:80"
+    command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapiattachments"
+
+  damageassesment.api.employees:
+    image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapiemployees
+    build:
+     context: .
+     dockerfile: DamageAssesment.Api.Employees/Dockerfile
+    ports:
+     - "6003:80"
+    command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapiemployees"
+
+  damageassesment.api.locations:
+    image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapilocations
+    build:
+     context: .
+     dockerfile: DamageAssesment.Api.Locations/Dockerfile
+    ports:
+     - "6004:80"
+    command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapilocations"
+
+  damageassesment.api.questions:
+    image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapiquestions
+    build:
+     context: .
+     dockerfile: DamageAssesment.Api.Questions/Dockerfile
+    ports:
+     - "6005:80"
+    command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapiquestions"
+
+  damageassesment.api.surveys:
+    image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapisurveys
+    build:
+     context: .
+     dockerfile: DamageAssesment.Api.Surveys/Dockerfile
+    ports:
+     - "6006:80"
+    command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapisurveys"
+ 
+  damageassesment.api.doculinks:
+    image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapidoculinks
+    build:
+     context: .
+     dockerfile: DamageAssesment.Api.DocuLinks/Dockerfile
+    ports:
+     - "6008:80"
+    command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapidoculinks"
+ 
+  damageassesment.api.responses:
+    image: dadeschoolscontainerregistry.azurecr.io/damageassesmentapiresponses
+    build:
+      context: .
+      dockerfile: DamageAssesment.Api.Responses/Dockerfile
+    ports:
+     - "6007:80"
+    command: bash -c "docker push dadeschoolscontainerregistry.azurecr.io/damageassesmentapiresponses"
+