Group by issue in responses

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

@@ -1,6 +1,7 @@
 using DamageAssesment.Api.Answers.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.OpenApi.Any;
 
 namespace DamageAssesment.Api.Answers.Controllers
 {
@@ -15,7 +16,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers
         /// </summary>
-        [Authorize(Roles = "admin")]
+        
         [HttpGet("answers")]
         public async Task<ActionResult> GetAnswersAsync() {
         
@@ -31,7 +32,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Get an answer based on answerId.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
+
         [HttpGet("answers/{id}")]
         public async Task<ActionResult> GetAnswerByIdAsync(int id)
         {
@@ -47,7 +48,6 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers based on responseId.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpGet("answers/byresponse/{responseid}")]
         public async Task<IActionResult> GetAnswersByResponseId(int responseid)
         {
@@ -61,7 +61,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers based on questionId.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpGet("answers/byquestion/{questionid}")]
         public async Task<IActionResult> AnswersByQuestionId(int questionid)
         {
@@ -75,7 +75,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Update an existing answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpPut("answers")]
         public async Task<IActionResult> UpdateAnswer(Models.Answer answer)
         {
@@ -96,7 +96,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Save a new answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpPost("answers")]
         public async Task<IActionResult> CreateAnswer(Models.Answer answer)
         {
@@ -114,7 +114,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         ///  Delete an existing answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpDelete("answers/{id}")]
         public async Task<IActionResult> DeleteAnswer(int id)
         {

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

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

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

@@ -1,7 +1,6 @@
 using Azure;
 using DamageAssesment.Api.Attachments.Interfaces;
 using DamageAssesment.Api.Attachments.Models;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System.Net.Http.Headers;
@@ -22,7 +21,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Get all attachments.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpGet("attachments")]
         public async Task<ActionResult> GetAttachmentsAsync()
         {
@@ -38,7 +37,6 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Get all attachments by attachmentId.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpGet("attachments/{id}")]
         public async Task<ActionResult> GetAttachmentbyIdAsync(int id)
         {
@@ -82,7 +80,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Save new Attachment(s)
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpPost("attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo)
         {
@@ -109,7 +107,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Modify an new attachment.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpPut("attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
         {
@@ -140,7 +138,6 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// download an existing attachment.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpGet("attachments/download/{id}")]
         public async Task<IActionResult> downloadfile(int id)
         {
@@ -215,7 +212,6 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Delete an existing attachment.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpDelete("attachments/{id}")]
         public async Task<IActionResult> DeleteAttachment(int id)
         {

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

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

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

@@ -2,10 +2,8 @@
 using DamageAssesment.Api.DocuLinks.Interfaces;
 using DamageAssesment.Api.DocuLinks.Models;
 using DamageAssesment.Api.DocuLinks.Providers;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System.Data;
 
 namespace DamageAssesment.Api.DocuLinks.Controllers
 {
@@ -26,7 +24,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// Get all Doculink type.
         /// </summary>
         [HttpGet]
-        [Authorize(Roles = "admin")]
         [Route("doculinks/types")]
         [Route("doculinks/types/{language:alpha}")]
         public async Task<IActionResult> GetLinkTypesAsync(string? language)
@@ -42,7 +39,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// Get a Doculink type by id.
         /// </summary>
         [HttpGet]
-        [Authorize(Roles = "admin")]
         [Route("doculinks/types/{id}")]
         [Route("doculinks/types/{id}/{language:alpha}")]
         public async Task<IActionResult> GetLinkTypeAsync(int id, string? language)
@@ -57,7 +53,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Update a existing Doculink type.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpPut]
         [Route("doculinks/types/{id}")]
         public async Task<IActionResult> UpdateLinkType(int id, Models.LinkType linkType)
@@ -79,7 +74,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Create a new Doculink type.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks/types")]
         public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
@@ -98,7 +92,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Delete a  existing Doculink type by id.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpDelete]
         [Route("doculinks/types/{id}")]
         public async Task<IActionResult> DeleteLinkType(int id)
@@ -113,7 +106,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// download an existing attachment.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpGet("doculinks/download/{id}")]
         public async Task<IActionResult> downloadfile(int id)
         {
@@ -188,8 +180,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Get all Doculink.
         /// </summary>
-        
+        /// 
-        [Authorize(Roles = "admin")]
         [Route("doculinks")]
         [Route("doculinks/{linktype:alpha}")]
         [Route("doculinks/{linktype:alpha}/{language:alpha}")]
@@ -206,7 +197,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 +213,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]
@@ -239,7 +228,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Get a Doculink by id.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpGet]
         [Route("doculinks/{id}")]
         [Route("doculinks/{id}/{linktype:alpha}")]
@@ -254,9 +242,8 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// Upload new document.
+        /// update existing doclink.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpPut]
         [Route("doculinks/{id}")]
         public async Task<IActionResult> UpdateDocument(int id, ReqDoculink documentInfo)
@@ -296,7 +283,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Create new doclink.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks")]
         public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo)
@@ -322,9 +308,8 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             }
         }
         /// <summary>
-        /// Delete document by id.
+        /// Delete Doculink by id.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpDelete]
         [Route("doculinks/{id}")]
         public async Task<IActionResult> DeleteDocument(int id)

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

@@ -10,7 +10,6 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

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

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

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

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

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

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

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

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

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

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

@@ -21,6 +21,10 @@ namespace DamageAssesment.Api.Locations.Db
 
         [StringLength(2)]
         public string SchoolType { get; set; }
+        public int? DataValue { get; set; }
+        public int? Enrollment { get; set; }
+        public double? Longitute { get; set; }
+        public double? Latitude { get; set; }
 
     }
 }

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

@@ -11,5 +11,9 @@ namespace DamageAssesment.Api.Locations.Models
         public string Name { get; set; }
         public string MaintenanceCenter { get; set; }
         public string SchoolType { get; set; }
+        public int? DataValue { get; set; }
+        public int? Enrollment { get; set; }
+        public double? Longitute { get; set; }
+        public double? Latitude { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

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

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

@@ -28,6 +28,8 @@ namespace DamageAssesment.Api.Locations.Providers
                 var locations = await locationDbContext.Locations.AsNoTracking().ToListAsync();
                 if (locations != null)
                 {
+                    int maxenrollment = (int)locations.Max(a => a.Enrollment);
+                    foreach (Db.Location item in locations) { item.DataValue = GetHeatmapdata(item.Enrollment, maxenrollment); }
                     logger?.LogInformation($"{locations.Count} Locations(s) found");
                     var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(locations);
                     return (true, result, null);
@@ -46,9 +48,12 @@ namespace DamageAssesment.Api.Locations.Providers
             try
             {
                 logger?.LogInformation("Query Location");
+
+                int maxenrollment = (int)await locationDbContext.Locations.AsNoTracking().MaxAsync(a => a.Enrollment);
                 var location = await locationDbContext.Locations.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
                 if (location != null)
-                {
+                {if(maxenrollment>0)
+                        location.DataValue = GetHeatmapdata(location.Enrollment, maxenrollment);
                     logger?.LogInformation($"{location}  found");
                     var result = mapper.Map<Db.Location, Models.Location>(location);
                     return (true, result, null);
@@ -61,6 +66,10 @@ namespace DamageAssesment.Api.Locations.Providers
                 return (false, null, ex.Message);
             }
         }
+        private int GetHeatmapdata(int? enrollment,int maxenrollment)
+        {
+            return (enrollment != null ? enrollment.Value : 0) * 100 / maxenrollment;
+        }
         public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> PostLocationAsync(Models.Location location)
         {
             try
@@ -139,9 +148,9 @@ namespace DamageAssesment.Api.Locations.Providers
         {
             if (!locationDbContext.Locations.Any())
             {
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0091", RegionId = 5, Name = "BOB GRAHAM EDUCATION CENTER", MaintenanceCenter = "1", SchoolType = "K8" });
+                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0091", RegionId = 5, Name = "BOB GRAHAM EDUCATION CENTER", MaintenanceCenter = "1", SchoolType = "K8", DataValue = 25,Enrollment=780,Latitude= 25.83604,Longitute= -80.21618 });
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0092", RegionId = 1, Name = "NORMAN S. EDELCUP/SUNNY ISLES BEACH K-8", MaintenanceCenter = "1", SchoolType = "K8" });
+                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0092", RegionId = 1, Name = "NORMAN S. EDELCUP/SUNNY ISLES BEACH K-8", MaintenanceCenter = "1", SchoolType = "K8", DataValue = 46, Enrollment = 650, Latitude = 20.83604, Longitute = -40.21618 });
-                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "7511", RegionId = 4, Name = "MIAMI SPRINGS SHS", MaintenanceCenter = "2", SchoolType = "S" });
+                locationDbContext.Locations.Add(new Db.Location() { LocationCode = "7511", RegionId = 4, Name = "MIAMI SPRINGS SHS", MaintenanceCenter = "2", SchoolType = "S", DataValue = 12, Enrollment = 500, Latitude = 53.83604, Longitute = -60.21618 });
                 //locationDbContext.Locations.Add(new Db.Location() { Id = 3, LocationCode = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
                 //locationDbContext.Locations.Add(new Db.Location() { Id = 4, LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
                 //locationDbContext.Locations.Add(new Db.Location() { Id = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });

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

@@ -1,5 +1,4 @@
 using DamageAssesment.Api.Questions.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Mvc;
 
@@ -12,13 +11,16 @@ namespace DamageAssesment.Api.Questions.Controllers
 
         public QuestionsController(IQuestionsProvider questionsProvider)
         {
+
             this.questionsProvider = questionsProvider;
+
         }
+
         /// <summary>
         /// GET request for retrieving questions.
         /// </summary>
+
         // get all questions
-        [Authorize(Roles = "admin,survey,user,report")]
         [Route("questions")]
         [Route("questions/{language:alpha}")]
         [HttpGet]
@@ -36,7 +38,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// GET request for retrieving a question by ID.
         /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
         [Route("questions/{id}/{language:alpha}")]
         [Route("questions/{id:int}")]
         [HttpGet]
@@ -55,7 +56,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving survey questions based on a survey ID.
         /// Uri: {Optional language}/GetSurveyQuestions/{surveyId} :Default returns question in all languages 
         /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
         [Route("questions/bysurvey/{surveyId:int}")]
         [Route("questions/bysurvey/{surveyId:int}/{language:alpha}")]
         [HttpGet]
@@ -72,7 +72,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// PUT request for updating a question (multilingual).
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpPut("questions")]
         public async Task<IActionResult> UpdateQuestion(Models.Question question)
         {
@@ -93,7 +92,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// POST request for creating a multiple question (multilingual).
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpPost("questions/multiple")]
         public async Task<IActionResult> CreateQuestions(List<Models.Question> questions)
         {
@@ -135,7 +133,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question (multilingual).
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpPost("questions")]
         public async Task<IActionResult> CreateQuestion(Models.Question question)
         {
@@ -154,7 +151,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question based on ID.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpDelete("questions/{id}")]
         public async Task<IActionResult> DeleteQuestion(int id)
         {
@@ -170,7 +166,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving question categories.
         /// </summary>
 
-        [Authorize(Roles = "admin,user,report")]
         [HttpGet("questions/categories")]
         [HttpGet("questions/categories/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoriesAsync(string? language)
@@ -185,7 +180,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// GET request for retrieving a question category by ID.
         /// </summary>
-        [Authorize(Roles = "admin,report")]
+
         [HttpGet("questions/categories/{id:int}")]
         [HttpGet("questions/categories/{id:int}/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language)
@@ -202,7 +197,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// PUT request for updating a question category.
         /// </summary>
-        [Authorize(Roles = "admin,survey,report")]
+
         [HttpPut("questions/categories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
@@ -224,7 +219,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question category.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpPost("questions/categories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
@@ -243,7 +237,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question category based on ID.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpDelete("questions/categories/{id}")]
         public async Task<IActionResult> DeleteQuestionCategory(int id)
         {

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

@@ -12,7 +12,7 @@
         public bool IsRequired { get; set; }
         public bool Comment { get; set; }
         public bool Key { get; set; }
-        public int SurveyId { get; set; }
+        public int? SurveyId { get; set; }
         public int CategoryId { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

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

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

@@ -31,7 +31,8 @@ namespace DamageAssesment.Api.Questions.Providers
                 questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" });
                 questionDbContext.SaveChanges();
             }
-            if (!questionDbContext.QuestionsTranslations.Any())
+
+            if (!questionDbContext.QuestionCategories.Any())
             {
                 questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" });
                 questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -8,5 +8,9 @@
         public string Name { get; set; }
         public string MaintenanceCenter { get; set; }
         public string SchoolType { get; set; }
+        public int? DataValue { get; set; }
+        public int? Enrollment { get; set; }
+        public double? Longitute { get; set; }
+        public double? Latitude { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs

@@ -5,10 +5,6 @@ using DamageAssesment.Api.Responses.Providers;
 using Microsoft.EntityFrameworkCore;
 using Polly;
 using System.Reflection;
-using Microsoft.OpenApi.Models;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.IdentityModel.Tokens;
-using System.Text;
 
 var builder = WebApplication.CreateBuilder(args);
 const int maxApiCallRetries = 3;
@@ -18,24 +14,6 @@ const int intervalForCircuitBraker = 5; //5 seconds
 
 
 // Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(item =>
-{
-    item.RequireHttpsMetadata = true;
-    item.SaveToken = true;
-    item.TokenValidationParameters = new TokenValidationParameters()
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        ClockSkew = TimeSpan.Zero
-    };
-});
 
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
@@ -48,7 +26,6 @@ builder.Services.AddScoped<IQuestionServiceProvider, QuestionServiceProvider>();
 builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
 builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>();
 builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>();
-builder.Services.AddHttpContextAccessor();
 builder.Services.AddScoped<IExcelExportService, ExcelExportService>();
 
 builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
@@ -59,40 +36,12 @@ builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-
+builder.Services.AddSwaggerGen(c =>
-builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
+    c.IncludeXmlComments(xmlPath);
-
-    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
-    {
-        Name = "Bearer",
-        BearerFormat = "JWT",
-        Scheme = "bearer",
-        Description = "Specify the authorization token.",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.Http,
-    };
-
-    options.AddSecurityDefinition("jwt_auth", securityDefinition);
-
-    // Make sure swagger UI requires a Bearer token specified
-    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
-    {
-        Reference = new OpenApiReference()
-        {
-            Id = "jwt_auth",
-            Type = ReferenceType.SecurityScheme
-        }
-    };
-    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
-    {
-        {securityScheme, new string[] { }},
-    };
-    options.AddSecurityRequirement(securityRequirements);
 });
 builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
 {
@@ -107,7 +56,6 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
-app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -9,7 +9,7 @@
     }
   },
   "profiles": {
-    "DamageAssesment.Api.Responses": {
+    "DamageAssesment.Api.SurveyResponses": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,

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

@@ -2,7 +2,6 @@
 using DamageAssesment.Api.Responses.Db;
 using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
-using DamageAssesment.Api.Responses.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System.Reflection;
@@ -22,10 +21,8 @@ namespace DamageAssesment.Api.Responses.Providers
         private readonly IQuestionServiceProvider questionServiceProvider;
         private readonly ISurveyServiceProvider surveyServiceProvider;
         private readonly IMapper mapper;
-        private readonly IHttpContextAccessor httpContextAccessor;
-        private string token;
 
-        public SurveyResponsesProvider(SurveyResponseDbContext surveyResponseDbContext, ILogger<SurveyResponsesProvider> logger, IAnswerServiceProvider answerServiceProvider, IRegionServiceProvider regionServiceProvider, ILocationServiceProvider locationServiceProvider, IEmployeeServiceProvider employeeServiceProvider, IAttachmentServiceProvider attachmentServiceProvider, IQuestionServiceProvider questionServiceProvider, ISurveyServiceProvider surveyServiceProvider, IMapper mapper, IHttpContextAccessor httpContextAccessor)
+        public SurveyResponsesProvider(SurveyResponseDbContext surveyResponseDbContext, ILogger<SurveyResponsesProvider> logger, IAnswerServiceProvider answerServiceProvider, IRegionServiceProvider regionServiceProvider, ILocationServiceProvider locationServiceProvider, IEmployeeServiceProvider employeeServiceProvider, IAttachmentServiceProvider attachmentServiceProvider, IQuestionServiceProvider questionServiceProvider, ISurveyServiceProvider surveyServiceProvider, IMapper mapper)
         {
             this.surveyResponseDbContext = surveyResponseDbContext;
             this.logger = logger;
@@ -36,20 +33,8 @@ namespace DamageAssesment.Api.Responses.Providers
             this.attachmentServiceProvider = attachmentServiceProvider;
             this.questionServiceProvider = questionServiceProvider;
             this.surveyServiceProvider = surveyServiceProvider;
-            this.httpContextAccessor = httpContextAccessor;
             this.mapper = mapper;
             SeedData();
-
-            token = httpContextAccessor.HttpContext.Request.Headers.Authorization;
-            if (token != null)
-            {
-                token = token.Replace("Bearer ", string.Empty);
-            }
-            else
-            {
-                token = "";
-            }
-            // seedData();
         }
 
         public void SeedData()
@@ -139,7 +124,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);
                 surveys = surveys.Where(s => s.IsEnabled == true && s.Status == SurveyStatus.ACTIVE.ToString()).ToList();
                 if (employeeid == null || employeeid == 0)
                     return (true, surveys, null);
@@ -160,7 +145,7 @@ namespace DamageAssesment.Api.Responses.Providers
             {
                 logger?.LogInformation("Querying to get SurveyResponse object from DB");
 
-                var surveys = await surveyServiceProvider.getSurveysAsync(language, token);
+                var surveys = await surveyServiceProvider.getSurveysAsync(language);
                 // returning only historic data: end date is less than current date.
                 surveys = surveys.Where(s => s.Status == SurveyStatus.INACTIVE.ToString()).ToList();
                 if (employeeid == null || employeeid == 0)
@@ -185,7 +170,7 @@ namespace DamageAssesment.Api.Responses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
 
                 if (survey != null)
                 {
@@ -216,7 +201,7 @@ namespace DamageAssesment.Api.Responses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
 
                 if (survey != null)
                 {
@@ -247,7 +232,7 @@ namespace DamageAssesment.Api.Responses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
 
                 if (survey != null)
                 {
@@ -278,8 +263,8 @@ namespace DamageAssesment.Api.Responses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
-                var question = await questionServiceProvider.getQuestionsAsync(questionId, token);
+                var question = await questionServiceProvider.getQuestionsAsync(questionId);
                 bool IsCorrectAnswer = answer.ToLower().Equals("yes") || answer.ToLower().Equals("no") ? true : false;
 
 
@@ -440,10 +425,9 @@ namespace DamageAssesment.Api.Responses.Providers
         {
             try
             {
-                var answersList = await answerServiceProvider.getAnswersAsync(token);
+                var answersList = await answerServiceProvider.getAnswersAsync();
                 if (answersList == null || !answersList.Any())
                     return null;
-
                 //get all the answers for the particular survey
                 var surveyAnswers = answersList.Join(
                                        surveyResponses,
@@ -463,8 +447,8 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (surveyAnswers == null || !surveyAnswers.Any())
                     return null;
 
-                var regions = await regionServiceProvider.getRegionsAsync(token);
+                var regions = await regionServiceProvider.getRegionsAsync();
-                var locations = await locationServiceProvider.getLocationsAsync(token);
+                var locations = await locationServiceProvider.getLocationsAsync();
 
                 if (regions == null || !regions.Any() || locations == null || !locations.Any())
                     return null;
@@ -526,22 +510,24 @@ namespace DamageAssesment.Api.Responses.Providers
         {
             try
             {
-                var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId, token);
+                var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId);
-                var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id, token);
+                var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id);
-                var allQuestions = await questionServiceProvider.getQuestionsAsync(null,token);
+                var allQuestions = await questionServiceProvider.getQuestionsAsync(null);
                 var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
-
+                var Locations = await locationServiceProvider.getLocationsAsync();
-                var result = new
+                var location = Locations.Where(a => a.Id == surveyResponse.LocationId).FirstOrDefault();
-                {
+                var result = new{
                     surveyResponse.Id,
                     surveyResponse.SurveyId,
                     surveyResponse.LocationId,
                     surveyResponse.EmployeeId,
                     surveyResponse.ClientDevice,
                     surveyResponse.KeyAnswerResult,
-                    surveyResponse.Longitute,
+                    DataValue=(location!=null?location.DataValue:0),
-                    surveyResponse.Latitude,
+                    Enrollment= (location != null ? location.Enrollment : 0),
+                    Longitute = (location != null ? location.Longitute : surveyResponse.Longitute),
+                    Latitude=(location != null ? location.Latitude : surveyResponse.Latitude),
                     Employee = employee,
                     answers = from ans in answers
                               select new
@@ -575,27 +561,31 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (employeeid == 0)
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync(token);
+                    employees = await employeeServiceProvider.getEmployeesAsync();
                 }
                 else
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token);
+                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
                 }
                 surveyResonses = surveyResonses
                 .OrderByDescending(obj => obj.Id)
                 .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//obj.EmployeeId,
                 .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
                 .ToList();
-
+                var answers = await answerServiceProvider.getAnswersAsync();
-                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var questions = await questionServiceProvider.getQuestionsAsync(null);
-                var questions = await questionServiceProvider.getQuestionsAsync(null, token);
+                var Locations = await locationServiceProvider.getLocationsAsync();
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
 
                 //var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId);
 
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+
+                if (employeeid == 0)
+                {
                     var result = from r in surveyResonses
+                                 join loc in Locations on r.LocationId equals loc.Id
                                  select new
                                  {
                                      r.Id,
@@ -603,16 +593,18 @@ namespace DamageAssesment.Api.Responses.Providers
                                      r.LocationId,
                                      r.EmployeeId,
                                      r.ClientDevice,
-                                 r.KeyAnswerResult,
+                                    // r.KeyAnswerResult,
-                                 r.Longitute,
+                                     loc.DataValue,
-                                 r.Latitude,
+                                     loc.Enrollment,
-                                 Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                     loc.Longitute,
+                                     loc.Latitude,
+                                    // 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(),
@@ -622,6 +614,44 @@ namespace DamageAssesment.Api.Responses.Providers
                                  };
                     return result;
                 }
+                else
+                {
+                    object _employee = new { };
+                    if (employee != null)
+                    {
+                        _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
+                    }
+                    var result = from r in surveyResonses
+                                 join loc in Locations on r.LocationId equals loc.Id
+                                 select new
+                                 {
+                                     r.Id,
+                                     r.SurveyId,
+                                     r.LocationId,
+                                     r.EmployeeId,
+                                     r.ClientDevice,
+                                   //  r.KeyAnswerResult,
+                                     loc.DataValue,
+                                     loc.Enrollment,
+                                     loc.Longitute,
+                                     loc.Latitude,
+                                   //  Employee = _employee,
+                                     answers = from ans in answers
+                                               where ans.SurveyResponseId == r.Id
+                                               select new
+                                               {
+                                                   ans.Id,
+                                             //      ans.QuestionId,
+                                                   ans.AnswerText,
+                                                   ans.Comment,
+                                                   Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
+                                                   Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
+                                               }
+                                 };
+
+                    return result;
+                }
+            }
             catch (Exception ex)
             {
                 logger?.LogError($"Exception Found : {ex.Message} - Ref: SurveyResponsesProvider.getSurveyResponseBySurveyIdAsync()");
@@ -642,12 +672,12 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (employeeid == 0)
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync(token);
+                    employees = await employeeServiceProvider.getEmployeesAsync();
                 }
                 else
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token);
+                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
 
                     if (employee != null)
                     {
@@ -656,11 +686,13 @@ namespace DamageAssesment.Api.Responses.Providers
                 }
 
 
-                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var answers = await answerServiceProvider.getAnswersAsync();
-                var questions = await questionServiceProvider.getQuestionsAsync(null,token);
+                var questions = await questionServiceProvider.getQuestionsAsync(null);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
+                var Locations = await locationServiceProvider.getLocationsAsync();
                 var result = from r in surveyResonses
+                             join loc in Locations on r.LocationId equals loc.Id
                              select new
                              {
                                  r.Id,
@@ -668,16 +700,18 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                                 r.KeyAnswerResult,
+                               //  r.KeyAnswerResult,
-                                 r.Longitute,
+                                 loc.DataValue,
-                                 r.Latitude,
+                                 loc.Enrollment,
-                                 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(),
+                                 loc.Longitute,
+                                 loc.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(),
                                  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(),
@@ -685,6 +719,8 @@ namespace DamageAssesment.Api.Responses.Providers
                                            }
                              };
                 return result;
+
+
             }
             catch (Exception ex)
             {
@@ -700,12 +736,12 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (string.IsNullOrEmpty(language)) language = "en";
                 List<Db.SurveyResponse> surveyResonses;
                 surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(a => a.SurveyId == surveyId).ToListAsync();
-                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var answers = await answerServiceProvider.getAnswersAsync();
-                var Locations = await locationServiceProvider.getLocationsAsync(token);
+                var Locations = await locationServiceProvider.getLocationsAsync();
-                var regions = await regionServiceProvider.getRegionsAsync(token);
+                var regions = await regionServiceProvider.getRegionsAsync();
-                var questions = await questionServiceProvider.getQuestionsAsync(language, token);
+                var questions = await questionServiceProvider.getQuestionsAsync(language);
-                var categories = await questionServiceProvider.GetQuestionCategoriesAsync(language, token);
+                var categories = await questionServiceProvider.GetQuestionCategoriesAsync(language);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
                 List<object> questionLists = new List<object>();
                 var allques = from res in surveyResonses
                               join loc in Locations on res.LocationId equals loc.Id
@@ -837,8 +873,8 @@ namespace DamageAssesment.Api.Responses.Providers
                 {
                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
                 }
-                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var answers = await answerServiceProvider.getAnswersAsync();
-                var locations = await locationServiceProvider.getLocationsAsync(token);
+                var locations = await locationServiceProvider.getLocationsAsync();
                 var maintenanceCenters = locations.DistinctBy(m => m.MaintenanceCenter);
 
                 //get all the answers for the particular survey
@@ -904,12 +940,12 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (employeeid == 0)
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.LocationId == locationId).ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync(token);
+                    employees = await employeeServiceProvider.getEmployeesAsync();
                 }
                 else
                 {
                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid && x.LocationId == locationId).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token);
+                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
 
                     if (employee != null)
                     {
@@ -921,12 +957,14 @@ 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 answers = await answerServiceProvider.getAnswersAsync();
-                var questions = await questionServiceProvider.getQuestionsAsync(null,token);
+                var questions = await questionServiceProvider.getQuestionsAsync(null);
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
+                var Locations = await locationServiceProvider.getLocationsAsync();
                 var result = from r in surveyResonses
+                             join loc in Locations on r.LocationId equals loc.Id
                              select new
                              {
                                  r.Id,
@@ -934,16 +972,18 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                                 r.KeyAnswerResult,
+                               //  r.KeyAnswerResult,
-                                 r.Longitute,
+                                 loc.DataValue,
-                                 r.Latitude,
+                                 loc.Enrollment,
-                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 loc.Longitute,
+                                 loc.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(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
 
                                            select new
                                            {
-                                               ans.QuestionId,
+                                          //     ans.QuestionId,
                                                ans.Id,
                                                ans.AnswerText,
                                                ans.Comment,
@@ -952,6 +992,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                            }
                              };
                 return result;
+
             }
             catch (Exception ex)
             {
@@ -974,12 +1015,12 @@ namespace DamageAssesment.Api.Responses.Providers
                 if (employeeid == 0)
                 {
                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync();
-                    employees = await employeeServiceProvider.getEmployeesAsync(token);
+                    employees = await employeeServiceProvider.getEmployeesAsync();
                 }
                 else
                 {
                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id && x.EmployeeId == employeeid).ToListAsync();
-                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token);
+                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
 
                     if (employee != null)
                     {
@@ -993,10 +1034,11 @@ namespace DamageAssesment.Api.Responses.Providers
                 .ToList();
                 //var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync();
                 // var employees = await employeeServiceProvider.getEmployeesAsync();
-                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var answers = await answerServiceProvider.getAnswersAsync();
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
-
+                var Locations = await locationServiceProvider.getLocationsAsync();
                 var result = from r in surveyResponses
+                             join loc in Locations on r.LocationId equals loc.Id
                              select new
                              {
                                  r.Id,
@@ -1004,10 +1046,12 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.LocationId,
                                  r.EmployeeId,
                                  r.ClientDevice,
-                                 r.KeyAnswerResult,
+                             //    r.KeyAnswerResult,
-                                 r.Longitute,
+                                 loc.DataValue,
-                                 r.Latitude,
+                                 loc.Enrollment,
-                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 loc.Longitute,
+                                 loc.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(),
                                  answers = from ans in answers
                                            where ans.SurveyResponseId == r.Id
                                            && ans.QuestionId == question.Id
@@ -1015,7 +1059,7 @@ namespace DamageAssesment.Api.Responses.Providers
 
                                            select new
                                            {
-                                               ans.QuestionId,
+                                              // ans.QuestionId,
                                                AnswerId = ans.Id,
                                                ans.AnswerText,
                                                ans.Comment,
@@ -1037,12 +1081,12 @@ namespace DamageAssesment.Api.Responses.Providers
         {
             if (answerRequest != null)
             {
-                var answer = await answerServiceProvider.PostAnswersAsync(new Models.Answer { QuestionId = answerRequest.QuestionId, AnswerText = answerRequest.AnswerText, Comment = answerRequest.Comment, SurveyResponseId = surveyResponseId }, token);
+                var answer = await answerServiceProvider.PostAnswersAsync(new Models.Answer { QuestionId = answerRequest.QuestionId, AnswerText = answerRequest.AnswerText, Comment = answerRequest.Comment, SurveyResponseId = surveyResponseId });
                 if (answer != null)
                 {
                     List<AnswerInfo> listAnswerInfo = new List<AnswerInfo>();
                     listAnswerInfo.Add(new AnswerInfo { AnswerId = answer.Id, postedFiles = answerRequest.PostedFiles });
-                    var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo }, token);
+                    var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo });
 
                     string message = $"Answer for question {answerRequest.QuestionId} saved to the database";
                     logger?.LogInformation(message);
@@ -1063,6 +1107,7 @@ namespace DamageAssesment.Api.Responses.Providers
             }
         }
 
+
         public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.Request request)
         {
             try

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

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

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

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

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

@@ -1,4 +1,4 @@
-using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
 using Microsoft.AspNetCore.Mvc.Routing;
 using Newtonsoft.Json;
@@ -11,11 +11,11 @@ namespace DamageAssesment.Api.Responses.Services
         {
         }
 
-        public async Task<List<Employee>> getEmployeesAsync(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())
@@ -29,12 +29,12 @@ namespace DamageAssesment.Api.Responses.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.Responses/Services/HttpUtil.cs

@@ -1,5 +1,4 @@
-using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.Responses.Models;
 using System.Net.Http.Headers;
 using System.Text;
 
@@ -15,18 +14,20 @@ namespace DamageAssesment.Api.Responses.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
             {
                 var request = new HttpRequestMessage(method, url);
                 request.Headers.Accept.Clear();
                 request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
+
+                //request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
                 if (method == HttpMethod.Post)
                 {
                     request.Content = new StringContent(JsonInput, Encoding.UTF8, "application/json");
                 }
+
                 var response = await httpClient.SendAsync(request, CancellationToken.None);
                 response.EnsureSuccessStatusCode();
                 var responseString = await response.Content.ReadAsStringAsync();

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

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

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)
         {
             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);
                 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)
         {
             try
             {
@@ -38,7 +37,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);
                 var questions = JsonConvert.DeserializeObject<List<QuestionCategory>>(responseJsonString);
 
                 if (questions == null || !questions.Any())
@@ -51,12 +50,13 @@ namespace DamageAssesment.Api.Responses.Services
                 return new List<QuestionCategory>();
             }
         }
-        public async Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId, string token)
+
+        public async Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId)
         {
             try
             {
                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:SurveyQuestion"), surveyId);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var questions = JsonConvert.DeserializeObject<List<SurveyQuestions>>(responseJsonString);
 
                 if (questions == null || !questions.Any())
@@ -71,12 +71,12 @@ namespace DamageAssesment.Api.Responses.Services
         }
 
 
-        public async Task<Question> getQuestionsAsync(int questionId, string token)
+        public async Task<Question> getQuestionsAsync(int questionId)
         {
             try
             {
                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:QuestionById"), questionId);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var question = JsonConvert.DeserializeObject<Question>(responseJsonString);
 
                 if (question == null)

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

@@ -9,11 +9,11 @@ namespace DamageAssesment.Api.Responses.Services
         public RegionServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<RegionServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Region"), configuration.GetValue<string>("EndPointSettings:LocationUrlBase"))
         {
         }
-        public async Task<List<Region>> getRegionsAsync(string token)
+        public async Task<List<Region>> getRegionsAsync()
         {
             try
             {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var regions = JsonConvert.DeserializeObject<List<Region>>(responseJsonString);
 
                 if (regions == null || !regions.Any())

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

@@ -10,13 +10,13 @@ namespace DamageAssesment.Api.Responses.Services
         {
         }
 
-        public async Task<List<Survey>> getSurveysAsync(string language, string token)
+        public async Task<List<Survey>> getSurveysAsync(string language)
         {
             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);
                 var surveys = JsonConvert.DeserializeObject<List<Survey>>(responseJsonString);
 
                 if (surveys == null || !surveys.Any())
@@ -30,12 +30,12 @@ namespace DamageAssesment.Api.Responses.Services
             }
         }
 
-        public async Task<Survey> getSurveyAsync(int surveyId, string token)
+        public async Task<Survey> getSurveyAsync(int surveyId)
         {
             try
             {
                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:SurveyById"), surveyId);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
                 var survey = JsonConvert.DeserializeObject<Survey>(responseJsonString);
 
                 if (survey == null)

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

@@ -34,7 +34,55 @@ 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

@@ -1,5 +1,4 @@
 using DamageAssesment.Api.Surveys.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Surveys.Controllers
@@ -16,7 +15,6 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// GET request for retrieving surveys.
         /// </summary>
-        [Authorize(Roles ="admin,survey,user,report")]
         [Route("surveys")]
         [Route("surveys/{language:alpha}")]
         [HttpGet]
@@ -29,11 +27,39 @@ namespace DamageAssesment.Api.Surveys.Controllers
             }
             return NoContent();
         }
-
+        /// <summary>
+        /// GET request for retrieving all active surveys.
+        /// </summary>
+        [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>
+        [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>
-        [Authorize(Roles = "admin,survey,user,report")]
         [Route("surveys/{id:int}")]
         [Route("surveys/{id:int}/{language:alpha}")]
         [HttpGet]
@@ -49,7 +75,6 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// POST request for creating a new survey.
         /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
         [HttpPost("surveys")]
         public async Task<ActionResult> PostSurveysAsync(Models.Survey survey)
         {
@@ -63,8 +88,6 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// PUT request for updating an existing survey (surveyId,Updated Survey data).
         /// </summary>
-
-        [Authorize(Roles = "admin,survey")]
         [HttpPut("surveys/{id}")]
         public async Task<ActionResult> PutSurveysAsync(int id, Models.Survey survey)
         {
@@ -82,7 +105,6 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <summary>
         /// DELETE request for deleting a survey by ID.
         /// </summary>
-        [Authorize(Roles = "admin,survey")]
         [HttpDelete("surveys/{id}")]
         public async Task<ActionResult> DeleteSurveysAsync(int id)
         {

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

@@ -3,6 +3,7 @@
     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

@@ -6,7 +6,6 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
 using System.Text;
 using System.Reflection;
-using Microsoft.OpenApi.Models;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -35,44 +34,14 @@ builder.Services.AddControllers();
 builder.Services.AddScoped<ISurveyProvider, SurveysProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 builder.Services.AddEndpointsApiExplorer();
-
+//builder.Services.AddSwaggerGen();
-builder.Services.AddSwaggerGen(options =>
+builder.Services.AddSwaggerGen(c =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    options.IncludeXmlComments(xmlPath);
+    c.IncludeXmlComments(xmlPath);
-
-    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
-    {
-        Name = "Bearer",
-        BearerFormat = "JWT",
-        Scheme = "bearer",
-        Description = "Specify the authorization token.",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.Http,
-    };
-
-    options.AddSecurityDefinition("jwt_auth", securityDefinition);
-
-    // Make sure swagger UI requires a Bearer token specified
-    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
-    {
-        Reference = new OpenApiReference()
-        {
-            Id = "jwt_auth",
-            Type = ReferenceType.SecurityScheme
-        }
-    };
-
-    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
-    {
-        {securityScheme, new string[] { }},
-    };
-
-    options.AddSecurityRequirement(securityRequirements);
 });
-
 builder.Services.AddDbContext<SurveysDbContext>(option =>
 {
     option.UseInMemoryDatabase("Surveys");

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

@@ -101,6 +101,43 @@ 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/DamageAssesment.Api.UsersAccess.Test.csproj

@@ -1,30 +0,0 @@
-<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.3.2" />
-    <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.1.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\DamageAssesment.Api.UsersAccess\DamageAssesment.Api.UsersAccess.csproj" />
-  </ItemGroup>
-
-</Project>

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

@@ -1,44 +0,0 @@
-using DamageAssesment.Api.UsersAccess.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit.Sdk;
-
-namespace DamageAssesment.Api.UsersAccess.Test
-{
-    public class MockData
-    {
-        public static async Task<(bool, Models.TokenResponse, string)> getTokenResponse(bool status, string message)
-        {
-            return (status, new Models.TokenResponse { jwttoken = "1234", refreshtoken = "12345" }, message);
-        }
-
-        public static async Task<(bool, List<User>, string)> getUsers(bool status, string message)
-        {
-            List<User> users = new List<User>();
-            users.Add(new User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now });
-            users.Add(new User { Id = 2, EmployeeCode = "Emp2", EmployeeId = 2, RoleId = 1, IsActive = true, CreateDate = DateTime.Now });
-            users.Add(new User { Id = 3, EmployeeCode = "Emp3", EmployeeId = 3, RoleId = 1, IsActive = true, CreateDate = DateTime.Now });
-            return (status, users, message);
-        }
-
-        public static async Task<(bool, User, string)> getUser(bool status, string message)
-        {
-            User user = getUsers(status, message).Result.Item2.FirstOrDefault();
-            return (status, user, message);
-        }
-
-        public static async Task<(bool, List<Role>, string)> getRoles(bool status, string message)
-        {
-            List<Role> roles = new List<Role>();
-            roles.Add(new Role { Id = 1, Name = "Role 1" });
-            roles.Add(new Role { Id = 2, Name = "Role 2" });
-            roles.Add(new Role { Id = 3, Name = "Role 3" });
-
-            return (status, roles, message);
-        }
-
-    }
-}

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

@@ -1,194 +0,0 @@
-using DamageAssesment.Api.UsersAccess.Controllers;
-using DamageAssesment.Api.UsersAccess.Interfaces;
-using Microsoft.AspNetCore.Mvc;
-using Moq;
-using Xunit;
-
-namespace DamageAssesment.Api.UsersAccess.Test
-{
-    public class UsersAccessTest
-    {
-        private Mock<IUsersAccessProvider> mockService;
-
-        public UsersAccessTest()
-        {
-            mockService = new Mock<IUsersAccessProvider>();
-        }
-        [Fact(DisplayName = "Get Token - Ok case")]
-        public async Task GetTokenAsync_ShouldReturnStatusCode200()
-        {
-            var response = await MockData.getTokenResponse(true,null);
-            mockService.Setup(service => service.AuthenticateAsync("Emp1")).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.AuthenticateAsync("Emp1");
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "Get Token - Unauthorized case")]
-        public async Task GetTokenAsync_ShouldReturnStatusCode401()
-        {
-            var response = await MockData.getTokenResponse(false, null);
-            mockService.Setup(service => service.AuthenticateAsync("Emp1")).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (UnauthorizedObjectResult)await controller.AuthenticateAsync("Emp1");
-            Assert.Equal(401, result.StatusCode);
-        }
-
-
-        [Fact(DisplayName = "RefreshToken - Ok case")]
-        public async Task RefreshTokenAsync_ShouldReturnStatusCode200()
-        {
-            var response = await MockData.getTokenResponse(true, null);
-            mockService.Setup(service => service.RefreshTokenAsync(null)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.RefreshTokenAsync(null);
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "RefreshToken - Unauthorized case")]
-        public async Task RefreshTokenAsync_ShouldReturnStatusCode401()
-        {
-            var response = await MockData.getTokenResponse(false, null);
-            mockService.Setup(service => service.RefreshTokenAsync(null)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (UnauthorizedObjectResult)await controller.RefreshTokenAsync(null);
-            Assert.Equal(401, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "GetUsers - Ok case")]
-        public async Task GetUsersAsync_ShouldReturnStatusCode200()
-        {
-            var response = await MockData.getUsers(true, null);
-            mockService.Setup(service => service.GetUsersAsync()).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.GetUsersAsync();
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "GetUsers - NoContent case")]
-        public async Task GetUsersAsync_ShouldReturnStatusCode204()
-        {
-            var response = await MockData.getUsers(false, null);
-            mockService.Setup(service => service.GetUsersAsync()).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (NoContentResult)await controller.GetUsersAsync();
-            Assert.Equal(204, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "GetUser - Ok case")]
-        public async Task GetUserAsync_ShouldReturnStatusCode200()
-        {
-            var response = await MockData.getUser(true, null);
-            mockService.Setup(service => service.GetUsersAsync(1)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.GetUsersAsync(1);
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "GetUser - NotFound case")]
-        public async Task GetUserAsync_ShouldReturnStatusCode204()
-        {
-            var response = await MockData.getUser(false, null);
-            mockService.Setup(service => service.GetUsersAsync(1)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (NotFoundResult)await controller.GetUsersAsync(1);
-            Assert.Equal(404, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "GetRoles - Ok case")]
-        public async Task GetRolesAsync_ShouldReturnStatusCode200()
-        {
-            var response = await MockData.getRoles(true, null);
-            mockService.Setup(service => service.GetRolesAsync()).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.GetRolesAsync();
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "GetRoles - NoContent case")]
-        public async Task GetRolesAsync_ShouldReturnStatusCode204()
-        {
-            var response = await MockData.getRoles(false, null);
-            mockService.Setup(service => service.GetRolesAsync()).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (NoContentResult)await controller.GetRolesAsync();
-            Assert.Equal(204, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "PostUser - Ok case")]
-        public async Task PostUserAsync_ShouldReturnStatusCode200()
-        {
-            var response = await MockData.getUser(true, null);
-            var user = new Models.User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now };
-            mockService.Setup(service => service.PostUserAsync(user)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.PostUserAsync(user);
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "PostUser - Bad Request case")]
-        public async Task PostUserAsync_ShouldReturnStatusCode400()
-        {
-            var response = await MockData.getUser(false, null);
-            var user = new Models.User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now };
-            mockService.Setup(service => service.PostUserAsync(user)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (BadRequestObjectResult)await controller.PostUserAsync(user);
-            Assert.Equal(400, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "PutUser - Ok case")]
-        public async Task PutUserAsync_ShouldReturnStatusCode200()
-        {
-            var response = await MockData.getUser(true, null);
-            var user = new Models.User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now };
-            mockService.Setup(service => service.PutUserAsync(1,user)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.PutUserAsync(1,user);
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "PutUser - BadRequest case")]
-        public async Task PutUserAsync_ShouldReturnStatusCode400()
-        {
-            var response = await MockData.getUser(false, null);
-            var user = new Models.User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now };
-            mockService.Setup(service => service.PutUserAsync(1,user)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (BadRequestObjectResult)await controller.PutUserAsync(1,user);
-            Assert.Equal(400, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "PutUser - Not Found case")]
-        public async Task PutUserAsync_ShouldReturnStatusCode404()
-        {
-            var response = await MockData.getUser(false, "Not Found");
-            var user = new Models.User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now };
-            mockService.Setup(service => service.PutUserAsync(1, user)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (NotFoundObjectResult)await controller.PutUserAsync(1,user);
-            Assert.Equal(404, result.StatusCode);
-        }
-
-
-        [Fact(DisplayName = "DeleteUser - Ok case")]
-        public async Task DeleteUserAsync_ShouldReturnStatusCode200()
-        {
-            var response = await MockData.getUser(true, null);
-                    mockService.Setup(service => service.DeleteUserAsync(1)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.DeleteUserAsync(1);
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "DeleteUser - Not Found case")]
-        public async Task DeleteUserAsync_ShouldReturnStatusCode404()
-        {
-            var response = await MockData.getUser(false, "Not Found");
-            mockService.Setup(service => service.DeleteUserAsync(1)).ReturnsAsync(response);
-            var controller = new UsersAccessController(mockService.Object);
-            var result = (NotFoundResult)await controller.DeleteUserAsync(1);
-            Assert.Equal(404, result.StatusCode);
-        }
-    }
-}

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

@@ -1,127 +0,0 @@
-using DamageAssesment.Api.UsersAccess.Interfaces;
-using DamageAssesment.Api.UsersAccess.Models;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-
-namespace DamageAssesment.Api.UsersAccess.Controllers
-{
-    [ApiController]
-    public class UsersAccessController : ControllerBase
-    {
-        private IUsersAccessProvider userAccessProvider;
-
-        public UsersAccessController(IUsersAccessProvider userAccessProvider)
-        {
-            this.userAccessProvider = userAccessProvider;
-        }
-        [HttpPost("dadeschooltoken")]
-        public async Task<ActionResult> DadeSchoolAuthenticateAsync(string username, string 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);
-              }
-              return Unauthorized(result.ErrorMessage);
-        }
-
-        [Authorize(Policy = "Dadeschools")]
-        [HttpPost("refreshtoken")]
-        public async Task<ActionResult> RefreshTokenAsync(TokenResponse tokenResponse)
-        {
-            var result = await userAccessProvider.RefreshTokenAsync(tokenResponse);
-            if (result.IsSuccess)
-            {
-                return Ok(result.TokenResponse);
-            }
-            return Unauthorized(result.ErrorMessage);
-        }
-
-        [Authorize(Policy = "DamageApp", Roles ="admin")]
-        [HttpGet("users")]
-        public async Task<ActionResult> GetUsersAsync()
-        {
-            var result = await userAccessProvider.GetUsersAsync();
-            if (result.IsSuccess)
-            {
-                return Ok(result.Users);
-            }
-            return NoContent();
-        }
-
-        [Authorize(Policy = "DamageApp", Roles = "admin")]
-        [HttpGet("users/{Id}")]
-        public async Task<ActionResult> GetUsersAsync(int Id)
-        {
-            var result = await userAccessProvider.GetUsersAsync(Id);
-            if (result.IsSuccess)
-            {
-                return Ok(result.User);
-            }
-            return NotFound();
-        }
-
-        [Authorize(Policy = "DamageApp", Roles = "admin")]
-        [HttpGet("roles")]
-        public async Task<ActionResult> GetRolesAsync()
-        {
-            var result = await userAccessProvider.GetRolesAsync();
-            if (result.IsSuccess)
-            {
-                return Ok(result.Roles);
-            }
-            return NoContent();
-        }
-        [Authorize(Policy = "DamageApp", Roles = "admin")]
-        [HttpPost("users")]
-        public async Task<ActionResult> PostUserAsync(User user)
-        {
-            var result = await userAccessProvider.PostUserAsync(user);
-            if (result.IsSuccess)
-            {
-                return Ok(result.User);
-            }
-            return BadRequest(result.ErrorMessage);
-        }
-
-        [Authorize(Policy = "DamageApp", Roles = "admin")]
-        [HttpPut("users/{Id}")]
-        public async Task<ActionResult> PutUserAsync(int Id, User user)
-        {
-            var result = await userAccessProvider.PutUserAsync(Id, user);
-            if (result.IsSuccess)
-            {
-                return Ok(result.User);
-            }
-            if (result.ErrorMessage == "Not Found")
-                return NotFound(result.ErrorMessage);
-
-            return BadRequest(result.ErrorMessage);
-        }
-
-        [Authorize(Policy = "DamageApp", Roles = "admin")]
-        [HttpDelete("users/{Id}")]
-        public async Task<ActionResult> DeleteUserAsync(int Id)
-        {
-            var result = await userAccessProvider.DeleteUserAsync(Id);
-            if (result.IsSuccess)
-            {
-                return Ok(result.User);
-            }
-            return NotFound();
-        }
-
-
-    }
-}

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

@@ -1,23 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <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.Extensions.Http.Polly" Version="7.0.10" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
-  </ItemGroup>
-
-</Project>

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

@@ -1,21 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Text.Json.Serialization;
-
-namespace DamageAssesment.Api.UsersAccess.Db
-{
-    public class Role
-    {
-        [Key]
-        public int Id { get; set; }
-
-        [StringLength(100)]
-        [Required]
-        public string Name { get; set; }
-
-        // add a status field
-
-        [StringLength(100)]
-        public string? Description { get; set; }
-    }
-}

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

@@ -1,17 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace DamageAssesment.Api.UsersAccess.Db
-{
-    public  class Token
-    {
-        [Key]
-        public int Id { get; set; }
-        [Required]
-        [ForeignKey("User")]
-        public int UserId { get; set; }
-        public string? RefreshToken { get; set; }
-        public bool? IsActive { get; set; }
-    }
-}

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

@@ -1,31 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Text.Json.Serialization;
-
-namespace DamageAssesment.Api.UsersAccess.Db
-{
-    public class User
-    {
-        [Key]
-        public int Id { get; set; }
-
-        [ForeignKey("Employee")]
-        public int EmployeeId { get; set; }
-
-        [Required]
-        [StringLength(50)]
-        public string EmployeeCode { get; set; }
-
-        [ForeignKey("Role")]
-        [Required]
-        public int RoleId { get; set; }
-        [Required]
-        public bool IsActive { get; set; } = true;
-
-        [Required]
-        public DateTime CreateDate { get; set; } = DateTime.Now;
-
-        public DateTime? UpdateDate { get; set; }
-
-    }
-}

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

@@ -1,32 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-
-namespace DamageAssesment.Api.UsersAccess.Db
-{
-    public class UsersAccessDbContext : DbContext
-    {
-        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)
-        {
-
-        }
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-
-            modelBuilder.Entity<User>()
-                .Property(item => item.Id)
-                .ValueGeneratedOnAdd();
-
-            modelBuilder.Entity<Role>()
-            .Property(item => item.Id)
-            .ValueGeneratedOnAdd();
-
-            modelBuilder.Entity<Token>()
-            .Property(item => item.Id)
-            .ValueGeneratedOnAdd();
-        }
-    }
-}

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

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

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/IRoleProvider.cs

@@ -1,12 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Interfaces
-{
-    public interface IRoleProvider
-    {
-       Task<(bool IsSuccess, IEnumerable< Models.Role> Roles, string ErrorMessage)> GetRolesAsync();
-       Task<(bool IsSuccess, Models.Role Roles, string ErrorMessage)> GetRolesAsync(int Id);
-       Task<(bool IsSuccess, Models.Role Role, string ErrorMessage)> PostRoleAsync(Models.Role Role);
-       Task<(bool IsSuccess, Models.Role Role, string ErrorMessage)> PutRoleAsync(int Id,Models.Role Role);
-       Task<(bool IsSuccess, Models.Role Role, string ErrorMessage)> DeleteRoleAsync(int Id);
-
-    }
-}

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

@@ -1,11 +0,0 @@
-using DamageAssesment.Api.UsersAccess.Models;
-using System.Security.Claims;
-
-namespace DamageAssesment.Api.UsersAccess.Interfaces
-{
-    public interface ITokenServiceProvider
-    {
-        Task<string> GenerateToken(Models.User user);
-        Task<TokenResponse> TokenAuthenticate(Models.User user, Claim[] claims);
-    }
-}

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

@@ -1,18 +0,0 @@
-using DamageAssesment.Api.UsersAccess.Models;
-
-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, 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(string employeCode);
-        public Task<(bool IsSuccess, Models.DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password);
-        public Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)>RefreshTokenAsync(TokenResponse tokenResponse);
-        public void seedData();
-    }
-}

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

@@ -1,10 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Models
-{
-    public class DadeSchoolToken
-    {
-        public string access_token { get; set; }
-        public int expires_in { get; set; }
-        public string token_type { get; set; }
-        public string scope { get; set; }
-    }
-}

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

@@ -1,14 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Models
-{
-    public class Employee
-    {
-        public int Id { get; set; }
-        public string EmployeeCode { get; set; }
-        public string Name { get; set; }
-        public DateTime BirthDate { get; set; }
-        public string OfficePhoneNumber { get; set; }
-        public string Email { get; set; }
-        public bool IsActive { get; set; }
-        public string PreferredLanguage { get; set; }
-    }
-}

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

@@ -1,9 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-namespace DamageAssesment.Api.UsersAccess.Models
-{
-
-    public class JwtSettings
-    {
-        public string securitykey { get; set; }
-    }
-}

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

@@ -1,8 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Models
-{
-    public class Role { 
-        public int Id { get; set; }
-        public string Name { get; set; }
-        public string Description { get; set; }
-    }
-}

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

@@ -1,10 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Models
-{
-    public  class Token
-    { 
-        public string Id { get; set; }
-        public int UserId { get; set; } 
-        public string RefreshToken { get; set; }
-        public bool IsActive { get; set; }
-    }
-}

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

@@ -1,8 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Models
-{
-    public class TokenResponse
-    {
-        public string? jwttoken { get; set; }
-        public string? refreshtoken { get; set; }
-    }
-}

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

@@ -1,13 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Models
-{
-    public class User
-    {
-        public int Id { get; set; }
-        public int EmployeeId { get; set; }
-        public string EmployeeCode { get; set; }
-        public int RoleId { get; set; }
-        public bool IsActive { get; set; }
-        public DateTime CreateDate { get; set; }
-        public DateTime UpdateDate { get; set; }
-    }
-}

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

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

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Profiles/UsersAccessProfile.cs

@@ -1,14 +0,0 @@
-namespace DamageAssesment.Api.UsersAccess.Profiles
-{
-    public class UsersAccessProfile : AutoMapper.Profile
-    {
-        public UsersAccessProfile()
-        {
-            CreateMap<Db.User, Models.User>();
-            CreateMap<Models.User, Db.User>();
-
-            CreateMap<Db.Role, Models.Role>();
-            CreateMap<Models.Role, Db.Role>();
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs

@@ -1,147 +0,0 @@
-using DamageAssesment.Api.UsersAccess.Db;
-using DamageAssesment.Api.UsersAccess.Interfaces;
-using DamageAssesment.Api.UsersAccess.Providers;
-using DamageAssesment.Api.UsersAccess.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.IdentityModel.Tokens;
-using System.Text;
-using Polly;
-using DamageAssesment.Api.UsersAccess.Services;
-using Microsoft.OpenApi.Models;
-using System.Reflection;
-using Microsoft.AspNetCore.Authorization;
-
-const int maxApiCallRetries = 3;
-const int intervalToRetry = 2; //2 seconds
-const int maxRetryForCircuitBraker = 5;
-const int intervalForCircuitBraker = 5; //5 seconds
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-
-
-builder.Services.AddAuthentication().
-    AddJwtBearer("DamageApp", item =>
-{
-
-    item.RequireHttpsMetadata = true;
-    item.SaveToken = true;
-    item.TokenValidationParameters = new TokenValidationParameters()
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        ClockSkew = TimeSpan.Zero
-    };
-}).AddJwtBearer("Dadeschools", options =>
-{
-    options.Authority = builder.Configuration["Dadeschools:Authority"];
-    options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" };
-    options.TokenValidationParameters.ValidateAudience = false;
-});
-
-
-builder.Services.AddAuthorization(options =>
-{
-    var DamageAppPolicy = new AuthorizationPolicyBuilder()
-        .RequireAuthenticatedUser()
-        .AddAuthenticationSchemes("DamageApp")
-        .Build();
-    var DadeschoolsPolicy = new AuthorizationPolicyBuilder()
-        .RequireAuthenticatedUser()
-        .AddAuthenticationSchemes("Dadeschools")
-        .Build();
-    var allPolicy = new AuthorizationPolicyBuilder()
-        .RequireAuthenticatedUser()
-        .AddAuthenticationSchemes("DamageApp", "Dadeschools")
-        .Build();
-    options.AddPolicy("DamageApp", DamageAppPolicy);
-    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
-builder.Services.AddScoped<IUsersAccessProvider, UsersAccessProvider>();
-builder.Services.AddScoped<ITokenServiceProvider, TokenServiceProvider>();
-builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
-
-builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
-    AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
-    AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker)));
-
-builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
-builder.Services.AddEndpointsApiExplorer();
-//builder.Services.AddSwaggerGen();
-
-builder.Services.AddSwaggerGen(options =>
-{
-
-    // Include XML comments from your assembly
-    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
-    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    //options.IncludeXmlComments(xmlPath);
-
-    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
-    {
-        Name = "Bearer",
-        BearerFormat = "JWT",
-        Scheme = "bearer",
-        Description = "Specify the authorization token.",
-        In = ParameterLocation.Header,
-        Type = SecuritySchemeType.Http,
-    };
-
-    options.AddSecurityDefinition("jwt_auth", securityDefinition);
-
-    // Make sure swagger UI requires a Bearer token specified
-    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
-    {
-        Reference = new OpenApiReference()
-        {
-            Id = "jwt_auth",
-            Type = ReferenceType.SecurityScheme
-        }
-    };
-
-    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
-    {
-        {securityScheme, new string[] { }},
-    };
-
-    options.AddSecurityRequirement(securityRequirements);
-});
-
-builder.Services.AddDbContext<UsersAccessDbContext>(option =>
-{
-    option.UseInMemoryDatabase("UsersAccess");
-});
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-
-    using (var serviceScope = app.Services.CreateScope())
-    {
-        var services = serviceScope.ServiceProvider;
-        var usersAccessProvider = services.GetRequiredService<IUsersAccessProvider>();
-        usersAccessProvider.seedData();
-    }
-}
-
-app.UseAuthentication();
-app.UseAuthorization();
-
-app.MapControllers();
-app.Run();

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

@@ -1,37 +0,0 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Users": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5027"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "publishAllPorts": true
-    }
-  },
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:28382",
-      "sslPort": 0
-    }
-  }
-}

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

@@ -1,381 +0,0 @@
-using AutoMapper;
-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 System.IdentityModel.Tokens.Jwt;
-using System.Security.Claims;
-using System.Text;
-
-namespace DamageAssesment.Api.UsersAccess.Providers
-{
-    public class UsersAccessProvider : IUsersAccessProvider
-    {
-        private readonly UsersAccessDbContext userAccessDbContext;
-        private readonly ILogger<UsersAccessProvider> logger;
-        private readonly IMapper mapper;
-        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)
-        {
-            this.userAccessDbContext = userAccessDbContext;
-            this.employeeServiceProvider = employeeServiceProvider;
-            this.logger = logger;
-            this.mapper = mapper;
-            jwtSettings = options.Value;
-            this.tokenServiceProvider = tokenServiceProvider;
-            this.httpContextAccessor = httpContextAccessor;
-            this.configuration = configuration;
-            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.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.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()
-        {
-            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);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, object 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 (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PostUserAsync(Models.User user)
-        {
-            try
-            {
-                if (user != null)
-                {
-                    var _user = mapper.Map<Models.User, Db.User>(user);
-                    userAccessDbContext.Users.Add(_user);
-                    user.Id = _user.Id;
-                    await userAccessDbContext.SaveChangesAsync();
-                    return (true, user, "Successful");
-                }
-                else
-                {
-                    logger?.LogInformation($"null object cannot be added");
-                    return (false, null, $"null object cannot be added");
-                }
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PutUserAsync(int Id, Models.User user)
-        {
-            try
-            {
-                if (user != null)
-                {
-                    var _user = await userAccessDbContext.Users.AsNoTracking().Where(s => s.Id == Id).SingleOrDefaultAsync();
-
-                    if (_user != null)
-                    {
-                        int count = userAccessDbContext.Users.Where(u => u.Id != user.Id).Count();
-                        if (count == 0)
-                        {
-                            await userAccessDbContext.SaveChangesAsync();
-                            logger?.LogInformation($"Employee Id:  {user.EmployeeId} updated successfuly");
-                            return (true, mapper.Map<Db.User, Models.User>(_user), $"Employee Id:  {_user.EmployeeId} updated successfuly");
-                        }
-                        else
-                        {
-                            logger?.LogInformation($"Employee Id:  {user.EmployeeId} is already exist");
-                            return (false, null, $"Employee Id:  {user.EmployeeId} is already exist");
-                        }
-                    }
-                    else
-                    {
-                        logger?.LogInformation($"User Id : {Id} Not found");
-                        return (false, null, "Not Found");
-                    }
-                }
-                else
-                {
-                    logger?.LogInformation($"User Id: {Id} Bad Request");
-                    return (false, null, "Bad request");
-                }
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, Models.User User, string ErrorMessage)> DeleteUserAsync(int Id)
-        {
-            try
-            {
-                var user = await userAccessDbContext.Users.Where(x => x.Id == Id).SingleOrDefaultAsync();
-
-                if (user != null)
-                {
-                    userAccessDbContext.Users.Remove(user);
-                    await userAccessDbContext.SaveChangesAsync();
-                    logger?.LogInformation($"User Id: {Id} deleted Successfuly");
-                    return (true, mapper.Map<Db.User, Models.User>(user), $"User Id: {Id} deleted Successfuly");
-                }
-                else
-                {
-                    logger?.LogInformation($"User Id : {Id} Not found");
-                    return (false, null, "Not Found");
-                }
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employecode)
-        {
-          
-            if (employecode != null)
-              {
-                //implementation for dadeschools authentication
-                // var employees = await employeeServiceProvider.getEmployeesAsync();
-                // var employee = employees.Where(e=> e.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
-                var user = userAccessDbContext.Users.Where(x => x.IsActive == true && x.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
-       
-                          if (user != null)
-                          {
-
-                              var r = await GetRolesAsync();
-                              var role = r.Roles.Where(x => x.Id == user.RoleId).SingleOrDefault();
-
-                              var authClaims = new List<Claim> {
-                               new Claim(ClaimTypes.Name, user.EmployeeCode),
-                               new Claim(ClaimTypes.Role, role.Name),
-                               new Claim(JwtRegisteredClaimNames.Jti,Guid.NewGuid().ToString())
-
-                              };
-
-                              /// Generate Token
-                              var tokenhandler = new JwtSecurityTokenHandler();
-                              var tokenkey = Encoding.UTF8.GetBytes(jwtSettings.securitykey);
-                              var tokendesc = new SecurityTokenDescriptor
-                              {
-                                  Audience = "",
-                                  NotBefore = DateTime.Now,
-                                  Subject = new ClaimsIdentity(authClaims),
-                                  Expires = DateTime.Now.AddMinutes(30),
-                                  SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(tokenkey), SecurityAlgorithms.HmacSha256)
-                              };
-                              var token = tokenhandler.CreateToken(tokendesc);
-                              string finaltoken = tokenhandler.WriteToken(token);
-
-                              var response = new TokenResponse() { jwttoken = finaltoken, refreshtoken = await tokenServiceProvider.GenerateToken(mapper.Map<Db.User,Models.User>(user)) };
-                              return (true, response, "Authentication success and token issued.");
-                          }
-                          else
-                          {
-                              return (false, null, "user inactive or not exist.");
-                          }
-                  }
-
-              else
-              {
-                  return (false, null, "Credentials are required to authenticate.");
-              }
-        }
-        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
-            {
-                logger?.LogInformation("Gell all Roles from DB");
-                var roles = await userAccessDbContext.Roles.ToListAsync();
-                if (roles != null)
-                {
-                    logger?.LogInformation($"{roles.Count} Items(s) found");
-                    var result = mapper.Map<IEnumerable<Db.Role>, IEnumerable<Models.Role>>(roles);
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> RefreshTokenAsync(TokenResponse tokenResponse)
-        {
-            //Generate token
-            var tokenhandler = new JwtSecurityTokenHandler();
-            var tokenkey = Encoding.UTF8.GetBytes(this.jwtSettings.securitykey);
-            SecurityToken securityToken;
-            var principal = tokenhandler.ValidateToken(tokenResponse.jwttoken, new TokenValidationParameters
-            {
-                ValidateIssuerSigningKey = true,
-                IssuerSigningKey = new SymmetricSecurityKey(tokenkey),
-                ValidateIssuer = false,
-                ValidateAudience = false,
-
-            }, out securityToken);
-
-            var token = securityToken as JwtSecurityToken;
-            if (token != null && !token.Header.Alg.Equals(SecurityAlgorithms.HmacSha256))
-            {
-                return (false, null, "Unauthorized");
-            }
-            var username = principal.Identity?.Name;
-
-            var tokens = await userAccessDbContext.Tokens.ToListAsync();
-            var users = await userAccessDbContext.Users.ToListAsync();
-
-            var user = (from u in users
-                        join t in tokens
-                        on u.Id equals t.UserId
-                        where u.EmployeeId == 1
-                        && t.RefreshToken == tokenResponse.refreshtoken
-                        select u).FirstOrDefault();
-
-            if (user == null)
-                return (false, null, "Invalid Token Response object provided");
-
-            var _user = mapper.Map<Db.User, Models.User>(user);
-            var response = tokenServiceProvider.TokenAuthenticate(_user, principal.Claims.ToArray()).Result;
-            return (true, response, "Token authenticated and refreshed.");
-        }
-
-
-    }
-}

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

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

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

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

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

@@ -1,25 +0,0 @@
-using DamageAssesment.Api.UsersAccess.Interfaces;
-
-namespace DamageAssesment.Api.UsersAccess.Services
-{
-    public class ServiceProviderBase
-    {
-        protected readonly IConfiguration configuration;
-        protected readonly IHttpUtil httpUtil;
-        protected readonly ILogger<ServiceProviderBase> logger;
-        protected string ressource;
-        protected string urlBase;
-        protected string url;
-
-
-        public ServiceProviderBase(IConfiguration configuration, IHttpUtil httpUtil, ILogger<ServiceProviderBase> logger, string ressource, string urlBase)
-        {
-            this.configuration = configuration;
-            this.httpUtil = httpUtil;
-            this.logger = logger;
-            this.ressource = ressource;
-            this.urlBase = urlBase;
-            url = urlBase + ressource;
-        }
-    }
-}

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

@@ -1,59 +0,0 @@
-using System.IdentityModel.Tokens.Jwt;
-using System.Security.Claims;
-using System.Security.Cryptography;
-using System.Text;
-using DamageAssesment.Api.UsersAccess.Db;
-using DamageAssesment.Api.UsersAccess.Interfaces;
-using DamageAssesment.Api.UsersAccess.Models;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Options;
-using Microsoft.IdentityModel.Tokens;
-
-namespace DamageAssesment.Api.UsersAccess.Services
-{
-    public class TokenServiceProvider : ITokenServiceProvider
-    {
-        private readonly UsersAccessDbContext usersAccessDbContext;
-        private readonly JwtSettings jwtSettings;
-        public TokenServiceProvider(IOptions<JwtSettings> options, UsersAccessDbContext usersAccessDbContext)
-        {
-            this.usersAccessDbContext = usersAccessDbContext;
-            this.jwtSettings = options.Value;
-        }
-        public async Task<string> GenerateToken(Models.User user)
-        {
-            var randomnumber = new byte[32];
-            using (var ramdomnumbergenerator = RandomNumberGenerator.Create())
-            {
-                ramdomnumbergenerator.GetBytes(randomnumber);
-                string refreshtoken = Convert.ToBase64String(randomnumber);
-                var token = await usersAccessDbContext.Tokens.FirstOrDefaultAsync(item => item.UserId == user.Id);
-                if (token != null)
-                {
-                    token.RefreshToken = refreshtoken;
-                }
-                else
-                {
-                    usersAccessDbContext.Tokens.Add(new Db.Token()
-                    {
-                        UserId = user.Id,
-                        RefreshToken = refreshtoken,
-                        IsActive = true
-                    });
-                }
-                await usersAccessDbContext.SaveChangesAsync();
-
-                return refreshtoken;
-            }
-        }
-
-        public async Task<TokenResponse> TokenAuthenticate(Models.User user, Claim[] claims)
-        {
-            var token = new JwtSecurityToken(claims: claims, expires: DateTime.Now.AddSeconds(20),
-              signingCredentials: new SigningCredentials(new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtSettings.securitykey)), SecurityAlgorithms.HmacSha256)
-            );
-            var jwttoken = new JwtSecurityTokenHandler().WriteToken(token);
-            return new TokenResponse() { jwttoken = jwttoken, refreshtoken = await GenerateToken(user) };
-        }
-    }
-}

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

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

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/appsettings.json

@@ -1,40 +0,0 @@
-{
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
-  },
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "EndPointSettings": {
-    "EmployeeUrlBase": "http://localhost:5135"
-  },
-  "RessourceSettings": {
-    "Employee": "/Employees",
-    "EmployeeById": "/Employees/{0}"
-  },
-  "AllowedHosts": "*",
-  "Dadeschools": {
-    "Authority": "https://dev-graph.dadeschools.net",
-    "TokenUrl": "https://dev-graph.dadeschools.net/connect/token",
-    "ClientId": "dmapi",
-    "ClientSecret": "bfce2c8d-2064-4a02-b19d-7f1d42b16eae",
-    "TokenClientId": "damage_assessment_postman",
-    "TokenClientSecret": "e4774164-f018-44c9-b9d2-3a29fc21db3c",
-    "scope": "openid profile",
-    "grant_type": "password",
-    "Name": "Dadeschools Identity Server"
-  },
-  "Scopes": [
-    {
-      "Name": "openid",
-      "Description": "Request an authentication token on your behalf"
-    },
-    {
-      "Name": "profile",
-      "Description": "Read basic information about you such as your date of brith and full name"
-    }
-  ]
-}

DamageAssesmentApi/DamageAssesment.sln

@@ -41,10 +41,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Respons
 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -115,14 +111,6 @@ Global
 		{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
-		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE