Group by issue in responses

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

@@ -19,10 +19,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -9,10 +9,6 @@ using System.Reflection;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
 {
@@ -31,11 +27,6 @@ builder.Services.AddAuthentication(item =>
         ClockSkew = TimeSpan.Zero
     };
 });
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/answers-{Date}.txt"); // Specify the file path and format
-});
 // Add services to the container.
 
 builder.Services.AddControllers();
@@ -94,7 +85,6 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();
 

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

@@ -27,10 +27,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -5,22 +5,13 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.FileProviders;
-using Microsoft.Extensions.Logging;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;
 using System.Reflection;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/attachments-{Date}.txt"); // Specify the file path and format
-});
 builder.Services.AddAuthentication(item =>
 {
     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -104,7 +95,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 app.UseHttpsRedirection();

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

@@ -25,10 +25,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -9,16 +9,9 @@ using System.Text;
 using Microsoft.OpenApi.Models;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
+
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/DocuLinks-{Date}.txt"); // Specify the file path and format
-});
 builder.Services.AddAuthentication(item =>
 {
     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -93,7 +86,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 

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

@@ -122,7 +122,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     if (item.IsAttachments)
                     {
                         UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
-                        var fileName = String.Format("Document_{0}{1}", counter1, item.FileExtension);
+                        var fileName = String.Format("Document_{0}_{1}{2}", document.Id, counter1, item.FileExtension);
                         path = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
                         counter1++;

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

@@ -24,10 +24,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -9,16 +9,9 @@ using System.Reflection;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
+
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/Employees-{Date}.txt"); // Specify the file path and format
-});
 builder.Services.AddAuthentication(item =>
 {
     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -100,7 +93,7 @@ if (app.Environment.IsDevelopment())
         employeesProvider.SeedData();
     }
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 

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

@@ -25,10 +25,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -9,16 +9,9 @@ using System.Reflection;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
+
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/Locations-{Date}.txt"); // Specify the file path and format
-});
 builder.Services.AddAuthentication(item =>
 {
     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
@@ -103,7 +96,7 @@ if (app.Environment.IsDevelopment())
         regionProvider.SeedData();
     }
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 

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

@@ -25,10 +25,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

@@ -9,14 +9,6 @@ using System.Reflection;
 using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/Questions-{Date}.txt"); // Specify the file path and format
-});
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
@@ -101,7 +93,6 @@ if (app.Environment.IsDevelopment())
         questionProvider.SeedData();
     }
 }
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();
 

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

@@ -30,11 +30,8 @@
     <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.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs

@@ -16,14 +16,7 @@ const int intervalToRetry = 2; //2 seconds
 const int maxRetryForCircuitBraker = 5;
 const int intervalForCircuitBraker = 5; //5 seconds
 
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
+
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/Responses-{Date}.txt"); // Specify the file path and format
-});
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
@@ -113,7 +106,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
+
 app.UseAuthentication();
 app.UseAuthorization();
 

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

@@ -443,6 +443,7 @@ namespace DamageAssesment.Api.Responses.Providers
                 var answersList = await answerServiceProvider.getAnswersAsync(token);
                 if (answersList == null || !answersList.Any())
                     return null;
+
                 //get all the answers for the particular survey
                 var surveyAnswers = answersList.Join(
                                        surveyResponses,
@@ -538,14 +539,14 @@ namespace DamageAssesment.Api.Responses.Providers
                     surveyResponse.LocationId,
                     surveyResponse.EmployeeId,
                     surveyResponse.ClientDevice,
-                  //  surveyResponse.KeyAnswerResult,
+                    surveyResponse.KeyAnswerResult,
                     surveyResponse.Longitute,
                     surveyResponse.Latitude,
                     Employee = employee,
                     answers = from ans in answers
                               select new
                               {
-                                //  ans.QuestionId,
+                                  ans.QuestionId,
                                   ans.Id,
                                   ans.AnswerText,
                                   ans.Comment,
@@ -602,16 +603,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                                // r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                                // Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
                                            select new
                                            {
                                                ans.Id,
-                                             //  ans.QuestionId,
+                                               ans.QuestionId,
                                                ans.AnswerText,
                                                ans.Comment,
                                                Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
@@ -654,11 +655,7 @@ namespace DamageAssesment.Api.Responses.Providers
                     }
                 }
 
-                surveyResonses = surveyResonses
+
-                .OrderByDescending(obj => obj.Id)
-                .GroupBy(obj => new { obj.SurveyId, obj.EmployeeId, obj.LocationId })
-                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
-                .ToList();
                 var answers = await answerServiceProvider.getAnswersAsync(token);
                 var questions = await questionServiceProvider.getQuestionsAsync(null, token);
                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
@@ -671,16 +668,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                               //  r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                                // Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
                                            select new
                                            {
                                                ans.Id,
-                                           //    ans.QuestionId,
+                                               ans.QuestionId,
                                                ans.AnswerText,
                                                ans.Comment,
                                                Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
@@ -937,16 +934,16 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                               //  r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                               //  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
 
                                            select new
                                            {
-                                          //     ans.QuestionId,
+                                               ans.QuestionId,
                                                ans.Id,
                                                ans.AnswerText,
                                                ans.Comment,
@@ -1007,10 +1004,10 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                                // r.KeyAnswerResult,
+                                 r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                               //  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
                                            && ans.QuestionId == question.Id
@@ -1018,7 +1015,7 @@ namespace DamageAssesment.Api.Responses.Providers
 
                                            select new
                                            {
-                                              // ans.QuestionId,
+                                               ans.QuestionId,
                                                AnswerId = ans.Id,
                                                ans.AnswerText,
                                                ans.Comment,

DamageAssesmentApi/DamageAssesment.Api.Surveys.Test/SurveyServiceTest.cs

@@ -34,55 +34,7 @@ namespace DamageAssesment.Api.Surveys.Test
 
             Assert.Equal(204, result.StatusCode);
         }
-        [Fact(DisplayName = "Get active Surveys - Ok case")]
-        public async Task GetActiveSurveysAsync_ShouldReturnStatusCode200()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getOkResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(true,null)).ReturnsAsync(mockResponse);
 
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (OkObjectResult)await surveyProvider.GetActiveSurveysAsync(null);
-
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "Get active Surveys - NoContent Case")]
-        public async Task GetActiveSurveysAsync_ShouldReturnStatusCode204()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getNoContentResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(true,null)).ReturnsAsync(mockResponse);
-
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (NoContentResult)await surveyProvider.GetActiveSurveysAsync(null);
-
-            Assert.Equal(204, result.StatusCode);
-        }
-        [Fact(DisplayName = "Get inactive Surveys - Ok case")]
-        public async Task GetInActiveSurveysAsync_ShouldReturnStatusCode200()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getOkResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(false, null)).ReturnsAsync(mockResponse);
-
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (OkObjectResult)await surveyProvider.GetInActiveSurveysAsync(null);
-
-            Assert.Equal(200, result.StatusCode);
-        }
-        [Fact(DisplayName = "Get in active Surveys - NoContent Case")]
-        public async Task GetInActiveSurveysAsync_ShouldReturnStatusCode204()
-        {
-            var mockSurveyService = new Mock<ISurveyProvider>();
-            var mockResponse = await MockData.getNoContentResponse();
-            mockSurveyService.Setup(service => service.GetActiveSurveysAsync(false, null)).ReturnsAsync(mockResponse);
-
-            var surveyProvider = new SurveysController(mockSurveyService.Object);
-            var result = (NoContentResult)await surveyProvider.GetInActiveSurveysAsync(null);
-
-            Assert.Equal(204, result.StatusCode);
-        }
         [Fact(DisplayName = "Get Survey by Id - Ok case")]
         public async Task GetSurveyAsync_ShouldReturnStatusCode200()
         {

DamageAssesmentApi/DamageAssesment.Api.Surveys/Controllers/SurveysController.cs

@@ -29,38 +29,7 @@ namespace DamageAssesment.Api.Surveys.Controllers
             }
             return NoContent();
         }
-        /// <summary>
+
-        /// GET request for retrieving all active surveys.
-        /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [Route("surveys/active")]
-        [Route("surveys/active/{language:alpha}")]
-        [HttpGet]
-        public async Task<ActionResult> GetActiveSurveysAsync(string? language)
-        {
-            var result = await this.surveyProvider.GetActiveSurveysAsync(true,language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Surveys);
-            }
-            return NoContent();
-        }
-        /// <summary>
-        /// GET request for retrieving all inactive surveys.
-        /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
-        [Route("surveys/inactive")]
-        [Route("surveys/inactive/{language:alpha}")]
-        [HttpGet]
-        public async Task<ActionResult> GetInActiveSurveysAsync(string? language)
-        {
-            var result = await this.surveyProvider.GetActiveSurveysAsync(false, language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Surveys);
-            }
-            return NoContent();
-        }
         /// <summary>
         /// GET request for retrieving surveys by ID.
         /// </summary>

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

@@ -25,10 +25,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 

DamageAssesmentApi/DamageAssesment.Api.Surveys/Interfaces/ISurveyProvider.cs

@@ -3,7 +3,6 @@
     public interface ISurveyProvider
     {
        Task<(bool IsSuccess, IEnumerable< Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language);
-        Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetActiveSurveysAsync(bool IsActive,string language);
        Task<(bool IsSuccess, Models.MultiLanSurvey Surveys, string ErrorMessage)> GetSurveysAsync(int id, string language);
        Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PostSurveyAsync(Models.Survey Survey);
        Task<(bool IsSuccess, Models.MultiLanSurvey Survey, string ErrorMessage)> PutSurveyAsync(int id, Models.Survey Survey);

DamageAssesmentApi/DamageAssesment.Api.Surveys/Program.cs

@@ -9,14 +9,7 @@ using System.Reflection;
 using Microsoft.OpenApi.Models;
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
+
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/Surveys-{Date}.txt"); // Specify the file path and format
-});
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 builder.Services.AddAuthentication(item =>
@@ -100,7 +93,6 @@ if (app.Environment.IsDevelopment())
     }
 }
 
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();
 

DamageAssesmentApi/DamageAssesment.Api.Surveys/Providers/SurveysProvider.cs

@@ -101,43 +101,6 @@ namespace DamageAssesment.Api.Surveys.Providers
                 return SurveyStatus.INACTIVE.ToString();
             }
         }
-
-        // Method to get surveys asynchronously with multi-language support
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetActiveSurveysAsync(bool IsActive,string language)
-        {
-            IEnumerable<Models.MultiLanSurvey> surveysList = null;
-            try
-            {
-                string status = SurveyStatus.ACTIVE.ToString();
-                if(!IsActive) status = SurveyStatus.INACTIVE.ToString();
-                logger?.LogInformation("Get all Surveys from DB");
-                //checking is enabled in survey response 
-                var surveys = await surveyDbContext.Surveys.ToListAsync();//Where(s => s.IsEnabled == true)
-
-                if (surveys != null)
-                {
-                    surveysList = from s in surveys
-                                  select new Models.MultiLanSurvey
-                                  {
-                                      Id = s.Id,
-                                      StartDate = s.StartDate,
-                                      EndDate = s.EndDate,
-                                      IsEnabled = s.IsEnabled,
-                                      CreatedDate = s.CreatedDate,
-                                      Status = GetStatus(s.StartDate, s.EndDate),
-                                      Titles = CreateMultiLanguageObject(GetSurveyTranslations(s.Id, null, language))
-                                  };
-                    logger?.LogInformation($"{surveys.Count} Items(s) found");
-                    return (true, surveysList.Where(a=>a.Status==status).OrderByDescending(a=>a.Id), null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
         // Method to get surveys asynchronously with multi-language support
         public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language)
         {

DamageAssesmentApi/DamageAssesment.Api.UsersAccess.Test/UsersAccessTest.cs

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

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Controllers/UsersAccessController.cs

@@ -8,17 +8,27 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
     [ApiController]
     public class UsersAccessController : ControllerBase
     {
-        private readonly IUsersAccessProvider userAccessProvider;
+        private IUsersAccessProvider userAccessProvider;
 
         public UsersAccessController(IUsersAccessProvider userAccessProvider)
         {
             this.userAccessProvider = userAccessProvider;
         }
-        [HttpPost("dadeschools/token")]
+        [HttpPost("dadeschooltoken")]
-        public async Task<ActionResult> DadeSchoolAuthenticateAsync(UserCredentials userCredentials)
+        public async Task<ActionResult> DadeSchoolAuthenticateAsync(string username, string password)
         {
-            var result = await userAccessProvider.AuthenticateAsync(userCredentials.username, userCredentials.password);
+            var result = await userAccessProvider.DadeSchoolAuthenticateAsync(username, password);
-
+            if (result.IsSuccess)
+            {
+                return Ok(result.TokenResponse);
+            }
+            return Unauthorized(result.ErrorMessage);
+        }
+        [Authorize(Policy = "Dadeschools")]
+        [HttpPost("token/{employecode}")]
+        public async Task<ActionResult> AuthenticateAsync(string employecode)
+        {
+              var result = await userAccessProvider.AuthenticateAsync(employecode);
               if (result.IsSuccess)
               {
                   return Ok(result.TokenResponse);
@@ -27,19 +37,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
         }
 
         [Authorize(Policy = "Dadeschools")]
-        [HttpGet("damageapp/token")]
+        [HttpPost("refreshtoken")]
-        public async Task<ActionResult> AuthenticateAsync()
-        {
-            var result = await userAccessProvider.AuthenticateAsync();
-            if (result.IsSuccess)
-            {
-                return Ok(result.TokenResponse);
-            }
-            return Unauthorized(result.ErrorMessage);
-        }
-
-        [Authorize(Policy = "Dadeschools")]
-        [HttpPost("damageapp/refreshtoken")]
         public async Task<ActionResult> RefreshTokenAsync(TokenResponse tokenResponse)
         {
             var result = await userAccessProvider.RefreshTokenAsync(tokenResponse);
@@ -62,7 +60,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
             return NoContent();
         }
 
-       // [Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
         [HttpGet("users/{Id}")]
         public async Task<ActionResult> GetUsersAsync(int Id)
         {
@@ -74,7 +72,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
             return NotFound();
         }
 
-        //[Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
         [HttpGet("roles")]
         public async Task<ActionResult> GetRolesAsync()
         {
@@ -85,7 +83,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
             }
             return NoContent();
         }
-        //[Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
         [HttpPost("users")]
         public async Task<ActionResult> PostUserAsync(User user)
         {
@@ -97,7 +95,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
             return BadRequest(result.ErrorMessage);
         }
 
-        //[Authorize(Policy = "DamageApp", Roles = "admin")]
+        [Authorize(Policy = "DamageApp", Roles = "admin")]
         [HttpPut("users/{Id}")]
         public async Task<ActionResult> PutUserAsync(int Id, User user)
         {

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

@@ -24,13 +24,9 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.21.0" />
   </ItemGroup>
 
 </Project>

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

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

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

@@ -7,7 +7,5 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
     {
         Task<string> GenerateToken(Models.User user);
         Task<TokenResponse> TokenAuthenticate(Models.User user, Claim[] claims);
-
-        Task<string> ConvertJsonToDadeSchoolsJwt(string json);
     }
 }

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

@@ -4,15 +4,14 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
 {
     public interface IUsersAccessProvider
     {
-       public Task<(bool IsSuccess, IEnumerable<object> Users, string ErrorMessage)> GetUsersAsync();
+       public Task<(bool IsSuccess, IEnumerable< Models.User> Users, string ErrorMessage)> GetUsersAsync();
-        public Task<(bool IsSuccess, object User, string ErrorMessage)> GetUsersAsync(int Id);
+        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);
         public Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync();
-        public  Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync();
+        public  Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employeCode);
-        public Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> AuthenticateAsync(string username, string password);
+        public Task<(bool IsSuccess, Models.DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password);
-
         public Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)>RefreshTokenAsync(TokenResponse tokenResponse);
         public void seedData();
     }

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

@@ -2,6 +2,6 @@
 {
     public interface IHttpUtil
     {
-        Task<string> SendAsync(HttpMethod method, string url, string JsonInput, string token);
+        Task<string> SendAsync(HttpMethod method, string url, string JsonInput);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Models/FakeToken.cs

@@ -1,19 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Models
-{
-    public class FakeToken
-    {
-        public long nbf { get; set; }
-        public long exp { get; set; }
-        public string iss { get; set; } = "https://dev-graph.dadeschools.net";
-        public string aud { get; set; } = "damage_assessment";
-        public long iat { get; set; }
-        public string at_hash { get; set; } = "Mw4sAsR_U3MfpqsffDhAqg";
-        public string s_hash { get; set; } = "xADDtg6lVxAXUIFK8hm0Iw";
-        public string sid { get; set; } = "A5EE26B57C27F28ADFEA8C021BB7C4F1";
-        public string sub { get; set; }
-        public long auth_time { get; set; }
-        public string idp { get; set; } = "Dadeschools";
-        public string[] amr { get; set; } = {"external"};
-
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Models/UserCredentials.cs

@@ -1,5 +1,5 @@
 public class UserCredentials
 {
     public string username { get; set; }
-    public string password { get; set; }
+   // public string? password { get; set; }
 }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs

@@ -17,18 +17,9 @@ const int maxRetryForCircuitBraker = 5;
 const int intervalForCircuitBraker = 5; //5 seconds
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build =>
+
-{
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-builder.Services.AddLogging(builder =>
-{
-    //builder.AddConsole(); // Optional: Add other providers if needed
-    builder.AddFile("logs/UserAccess-{Date}.txt"); // Specify the file path and format
-});
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-var mode = builder.Configuration.GetValue<string>("ModeSettings:mode");
 
 
 builder.Services.AddAuthentication().
@@ -59,27 +50,22 @@ builder.Services.AddAuthorization(options =>
         .RequireAuthenticatedUser()
         .AddAuthenticationSchemes("DamageApp")
         .Build();
-
+    var DadeschoolsPolicy = new AuthorizationPolicyBuilder()
-    var DadeschoolsPolicy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser()
+        .RequireAuthenticatedUser()
         .AddAuthenticationSchemes("Dadeschools")
         .Build();
-
-    var DadeschoolsPolicyOffline = new AuthorizationPolicyBuilder().RequireAssertion(_ => true)
-                   .Build();
-
     var allPolicy = new AuthorizationPolicyBuilder()
         .RequireAuthenticatedUser()
         .AddAuthenticationSchemes("DamageApp", "Dadeschools")
         .Build();
     options.AddPolicy("DamageApp", DamageAppPolicy);
-    options.AddPolicy("Dadeschools", mode == "online" ? DadeschoolsPolicy : DadeschoolsPolicyOffline);
+    options.AddPolicy("Dadeschools", DadeschoolsPolicy);
     options.AddPolicy("AllPolicies", allPolicy);
     options.DefaultPolicy = options.GetPolicy("DamageApp")!;
 });
 
 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
@@ -153,7 +139,6 @@ if (app.Environment.IsDevelopment())
     }
 }
 
-app.UseCors("DamageAppCorsPolicy");
 app.UseAuthentication();
 app.UseAuthorization();
 

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

@@ -2,19 +2,15 @@
 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;
 
-
 namespace DamageAssesment.Api.UsersAccess.Providers
 {
     public class UsersAccessProvider : IUsersAccessProvider
@@ -22,23 +18,21 @@ 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 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()
@@ -61,61 +55,18 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                 userAccessDbContext.SaveChanges();
             }
         }
-        private string GetToken()
+
-        {
+        public async Task<(bool IsSuccess, IEnumerable<Models.User> Users, string ErrorMessage)> GetUsersAsync()
-            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()
         {
             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);
-
-                        string FirstName = null, LastName = null, EmployeeName = null;
-                        if (employee != null)
-                        {
-                            string[] names = employee.Name.Split(' ');
-                            EmployeeName = employee.Name;
-                            FirstName = names[0];
-                            LastName = EmployeeName.Replace(FirstName + " ", "");
-                        }
-                        userslist.Add(new
-                        {
-                            Id = user.Id,
-                            EmployeeId = user.EmployeeId,
-                            EmployeeCode = user.EmployeeCode,
-                            FirstName = FirstName,
-                            LastName = LastName,
-                            EmployeeName = EmployeeName,
-                            RoleId = user.RoleId,
-                            RoleName = (role != null) ? role.Name : null,
-                            IsActive = user.IsActive,
-                            CreatedDate = user.CreateDate,
-                            UpdatedDate = user.UpdateDate
-                        });
-                    }
                     logger?.LogInformation($"{users.Count} Items(s) found");
-                    // var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users);
+                    var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users);
-                    return (true, userslist, null);
+                    return (true, result, null);
                 }
                 return (false, null, "Not found");
             }
@@ -125,42 +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);
-                    string FirstName = null, LastName = null, EmployeeName = null;
-                    if (employee != null)
-                    {
-                        string[] names = employee.Name.Split(' ');
-                        EmployeeName = employee.Name;
-                        FirstName = names[0];
-                        LastName = EmployeeName.Replace(FirstName + " ", "");
-                    }
-                    var data = new
-                    {
-                        Id = user.Id,
-                        EmployeeId = user.EmployeeId,
-                        EmployeeCode = user.EmployeeCode,
-                        FirstName = FirstName,
-                        LastName = LastName,
-                        EmployeeName = EmployeeName,
-                        RoleId = user.RoleId,
-                        RoleName = (role != null) ? role.Name : null,
-                        IsActive = user.IsActive,
-                        CreatedDate = user.CreateDate,
-                        UpdatedDate = user.UpdateDate
-                    };
                     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");
             }
@@ -206,12 +133,18 @@ namespace DamageAssesment.Api.UsersAccess.Providers
 
                     if (_user != null)
                     {
-                        Db.User vUsers = mapper.Map<Models.User, Db.User>(user);
+                        int count = userAccessDbContext.Users.Where(u => u.Id != user.Id).Count();
-                        vUsers.UpdateDate = DateTime.Now;
+                        if (count == 0)
-                        userAccessDbContext.Users.Update(vUsers);
+                        {
-                        userAccessDbContext.SaveChanges();
+                            await userAccessDbContext.SaveChangesAsync();
-                        user.Id = Id;
+                            logger?.LogInformation($"Employee Id:  {user.EmployeeId} updated successfuly");
-                        return (true, user, "Successful");
+                            return (true, mapper.Map<Db.User, Models.User>(_user), $"Employee Id:  {_user.EmployeeId} updated successfuly");
+                        }
+                        else
+                        {
+                            logger?.LogInformation($"Employee Id:  {user.EmployeeId} is already exist");
+                            return (false, null, $"Employee Id:  {user.EmployeeId} is already exist");
+                        }
                     }
                     else
                     {
@@ -257,19 +190,7 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                 return (false, null, ex.Message);
             }
         }
-
+        public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
-        public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> AuthenticateAsync(string username, string password)
-        {
-            var mode = configuration.GetValue<string>("ModeSettings:mode");
-            if (mode == "online")
-                return await DadeSchoolAuthenticateAsync(username, password);
-            else if (mode == "offline") return await DadeSchoolAuthenticateFakeAsync(username, password);
-            else return (false, null, "Invalid mode");
-        }
-
-
-
-        private async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
         {
             try
             {
@@ -291,44 +212,6 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                     return (true, JsonConvert.DeserializeObject<DadeSchoolToken>(responseString), "");
                 }
                 return (false, null, responseString);
-
-            }
-            catch (Exception ex)
-            {
-                return (false, null, ex.Message);
-            }
-        }
-
-        private async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateFakeAsync(string username, string password)
-        {
-            try
-            {
-                var defaultPassword = configuration.GetValue<string>("ModeSettings:userPassword");
-                if (password != defaultPassword)
-                    return (false, null, "Invalid Password");
-
-                long unixTimeNow = (long)DateTime.UtcNow.Subtract(DateTime.UnixEpoch).TotalSeconds;
-                var tokenObject = new Models.FakeToken
-                {
-                    nbf = unixTimeNow,
-                    exp = unixTimeNow + 259200,
-                    iat = unixTimeNow,
-                    auth_time = unixTimeNow,
-                    sub = username
-
-                };
-                var tokenString = JsonConvert.SerializeObject(tokenObject);
-                var jwtToken = await tokenServiceProvider.ConvertJsonToDadeSchoolsJwt(tokenString);
-
-                var response = new DadeSchoolToken
-                {
-                    access_token = jwtToken,
-                    expires_in = 262800,
-                    scope = "openid profile",
-                    token_type = "Bearer"
-                };
-
-                return (true, response, "");
             }
             catch (Exception ex)
             {
@@ -336,40 +219,19 @@ namespace DamageAssesment.Api.UsersAccess.Providers
             }
 
         }
-
+        public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employecode)
-        private string DecodeJwtToken(string token)
         {
-            try
+          
+            if (employecode != null)
               {
-                var handler = new JwtSecurityTokenHandler();
+                //implementation for dadeschools authentication
-                var jsonToken = handler.ReadToken(token);
+                // var employees = await employeeServiceProvider.getEmployeesAsync();
-                var tokenS = handler.ReadToken(token) as JwtSecurityToken;
+                // var employee = employees.Where(e=> e.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
-
-                if (tokenS == null)
-                    return null;
-
-                var payload = tokenS.Payload.SerializeToJson();
-                return payload;
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync()
-        {
-            var dadeschoolsToken = GetToken();
-            var decodedToken = DecodeJwtToken(dadeschoolsToken);
-            var tokenObject = decodedToken == null ? null : JObject.Parse(decodedToken);
-
-            if (tokenObject == null)
-                return (false, null, "JWT authentication is required");
-
-            var employecode = (string)tokenObject["sub"];
                 var user = userAccessDbContext.Users.Where(x => x.IsActive == true && x.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
+       
                           if (user != null)
                           {
+
                               var r = await GetRolesAsync();
                               var role = r.Roles.Where(x => x.Id == user.RoleId).SingleOrDefault();
 
@@ -388,7 +250,7 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                                   Audience = "",
                                   NotBefore = DateTime.Now,
                                   Subject = new ClaimsIdentity(authClaims),
-                    Expires = DateTime.Now.AddDays(3),
+                                  Expires = DateTime.Now.AddMinutes(30),
                                   SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(tokenkey), SecurityAlgorithms.HmacSha256)
                               };
                               var token = tokenhandler.CreateToken(tokendesc);
@@ -401,7 +263,12 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                           {
                               return (false, null, "user inactive or not exist.");
                           }
+                  }
 
+              else
+              {
+                  return (false, null, "Credentials are required to authenticate.");
+              }
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync()
         {

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

@@ -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/TokenServiceProvider.cs

@@ -6,10 +6,8 @@ using DamageAssesment.Api.UsersAccess.Db;
 using DamageAssesment.Api.UsersAccess.Interfaces;
 using DamageAssesment.Api.UsersAccess.Models;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
-using Newtonsoft.Json.Linq;
 
 namespace DamageAssesment.Api.UsersAccess.Services
 {
@@ -17,11 +15,9 @@ namespace DamageAssesment.Api.UsersAccess.Services
     {
         private readonly UsersAccessDbContext usersAccessDbContext;
         private readonly JwtSettings jwtSettings;
-        private readonly IConfiguration configuration;
+        public TokenServiceProvider(IOptions<JwtSettings> options, UsersAccessDbContext usersAccessDbContext)
-        public TokenServiceProvider(IOptions<JwtSettings> options, UsersAccessDbContext usersAccessDbContext, IConfiguration configuration)
         {
             this.usersAccessDbContext = usersAccessDbContext;
-            this.configuration = configuration;
             this.jwtSettings = options.Value;
         }
         public async Task<string> GenerateToken(Models.User user)
@@ -59,27 +55,5 @@ namespace DamageAssesment.Api.UsersAccess.Services
             var jwttoken = new JwtSecurityTokenHandler().WriteToken(token);
             return new TokenResponse() { jwttoken = jwttoken, refreshtoken = await GenerateToken(user) };
         }
-
-        public async Task<string> ConvertJsonToDadeSchoolsJwt(string json)
-        {
-            var jsonObject = JObject.Parse(json);
-            var claims = new Claim[jsonObject.Count];
-            int i = 0;
-            foreach (var property in jsonObject.Properties())
-            {
-                claims[i++] = new Claim(property.Name, property.Value.ToString());
-            }
-            var securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetValue<string>("Dadeschools:TokenClientSecret")));
-            var credentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256);
-            var tokenDescriptor = new SecurityTokenDescriptor
-            {
-                Subject = new ClaimsIdentity(claims),
-                Expires = DateTime.UtcNow.AddDays(3),
-                SigningCredentials = credentials
-            };
-            var tokenHandler = new JwtSecurityTokenHandler();
-            var token = tokenHandler.CreateToken(tokenDescriptor);
-            return tokenHandler.WriteToken(token);
-        }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/appsettings.json

@@ -8,24 +8,17 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  //"EndPointSettings": {
-  //  "EmployeeUrlBase": "http://localhost:5135"
-  //},
   "EndPointSettings": {
-    "EmployeeUrlBase": "http://damageassesment.api.employees:80"
+    "EmployeeUrlBase": "http://localhost:5135"
   },
   "RessourceSettings": {
     "Employee": "/Employees",
     "EmployeeById": "/Employees/{0}"
   },
-  "ModeSettings": {
-    "mode": "offline",
-    "userPassword": "^R,cVAvEy7Z.qPkH9"
-  },
   "AllowedHosts": "*",
   "Dadeschools": {
-    "Authority": "https://graph2.dadeschools.net",
+    "Authority": "https://dev-graph.dadeschools.net",
-    "TokenUrl": "https://graph2.dadeschools.net/connect/token",
+    "TokenUrl": "https://dev-graph.dadeschools.net/connect/token",
     "ClientId": "dmapi",
     "ClientSecret": "bfce2c8d-2064-4a02-b19d-7f1d42b16eae",
     "TokenClientId": "damage_assessment_postman",
@@ -47,5 +40,6 @@
   "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/docker-compose.asf.yml

@@ -0,0 +1,80 @@
+version: '3.4'
+
+services:
+  answers:
+    image: santhoshsnair/damageassesmentapianswers:latest
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "6001:80"
+
+  attachments:
+    image: santhoshsnair/damageassesmentapiattachments:latest
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "6002:80"
+
+
+  employees:
+    image: santhoshsnair/damageassesmentapiemployees:latest
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "6003:80"
+
+
+  locations:
+    image: santhoshsnair/damageassesmentapilocations:latest
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "6004:80"
+
+
+  questions:
+    image: santhoshsnair/damageassesmentapiquestions:latest
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "6005:80"
+
+
+  responses:
+    image: santhoshsnair/damageassesmentapisurveyresponses:latest
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+      - services__Answers=http://10.0.0.4:19081/dasapp/answers/
+      - services__Locations=http://10.0.0.4:19081/dasapp/locations/
+      - services__Questions=http://10.0.0.4:19081/dasapp/questions/
+      - services__Employees=http://10.0.0.4:19081/dasapp/employees/
+      - services__Attachments=http://10.0.0.4:19081/dasapp/attachments/
+      - services__Surveys=http://10.0.0.4:19081/dasapp/survey/
+ 
+    ports:
+      - "6006:80"
+
+
+  surveys:
+    image: santhoshsnair/damageassesmentapisurveys:latest
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "6007:80"
+
+
+  doculinks:
+    image: santhoshsnair/damageassesmentapidoculinks:latest
+    environment:
+      - ASPNETCORE_ENVIRONMENT=Development
+    ports:
+      - "6009:80"
+  sqlserver:
+    image: mcr.microsoft.com/mssql/server:2019-latest
+    environment:
+      - SA_PASSWORD=your_password
+      - ACCEPT_EULA=Y
+    ports:
+      - "1433:1433"
+    volumes:
+      - ./sql_data:/var/opt/mssql/data

DamageAssesmentApi/docker-compose.dcproj

@@ -9,7 +9,9 @@
     <DockerServiceName>damageassesment.api.answers</DockerServiceName>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="docker-compos.tst.yml" />
     <None Include="docker-compose.sql.yml" />
+    <None Include="docker-compose.asf.yml" />
     <None Include="docker-compose.override.yml">
       <DependentUpon>docker-compose.yml</DependentUpon>
     </None>

db/migrate-sqldb_v1.ps1

@@ -10,8 +10,7 @@ $microservices = @(
     "DamageAssesment.Api.Locations",
     "DamageAssesment.Api.Questions",
     "DamageAssesment.Api.Responses",
-    "DamageAssesment.Api.Surveys",
+    "DamageAssesment.Api.Surveys"
-    "DamageAssesment.Api.UsersAccess"
 )