Revert "Merged PR 53: fixed survey put issue, and added export excel in responses

fixed survey put issue, amd added export excel 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.Answers/appsettings.json

@@ -11,7 +11,8 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     //"AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "AnswerConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    // "AnswerConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;",
+    "AnswerConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
 
   }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments.Test/AttachmentsServiceTest.cs

@@ -20,7 +20,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentsAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse();
             mockAttachmentService.Setup(service => service.GetAttachmentsAsync()).ReturnsAsync(mockResponse);
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
@@ -33,7 +33,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentsAsync_ShouldReturnStatusCode204()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
             mockAttachmentService.Setup(service => service.GetAttachmentsAsync()).ReturnsAsync(mockResponse);
 
@@ -47,7 +47,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockAttachmentService.Setup(service => service.GetAttachmentByIdAsync(1)).ReturnsAsync(mockResponse);
 
@@ -61,7 +61,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task GetAttachmentAsync_ShouldReturnStatusCode404()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockAttachmentService.Setup(service => service.GetAttachmentByIdAsync(99)).ReturnsAsync(mockResponse);
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
@@ -73,7 +73,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PostAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse();
             var AttachmentResponse = await MockData.GetAttachmentInfo(0);
             var mockInputAttachment = await MockData.getInputAttachmentData();
@@ -89,7 +89,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PostAttachmentAsync_ShouldReturnStatusCode400()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockInputAttachment = await MockData.getInputAttachmentData();
             var mockResponse = await MockData.getBadRequestResponse();
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
@@ -105,7 +105,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PutAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse();
             var AttachmentResponse = await MockData.GetAttachmentInfo(1);
             var mockInputAttachment = await MockData.getInputAttachmentData();
@@ -121,7 +121,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task PutAttachmentAsync_ShouldReturnStatusCode400()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockInputAttachment = await MockData.getInputAttachmentData();
             var mockResponse = await MockData.getBadRequestResponse();
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
@@ -136,7 +136,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task DeleteAttachmentAsync_ShouldReturnStatusCode200()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockAttachmentService.Setup(service => service.DeleteAttachmentAsync(1)).ReturnsAsync(mockResponse);
             mockUploadService.Setup(service => service.Deletefile(""));
@@ -150,7 +150,7 @@ namespace DamageAssesment.Api.Attachments.Test
         public async Task DeleteAttachmentAsync_ShouldReturnStatusCode404()
         {
             var mockAttachmentService = new Mock<IAttachmentsProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockAttachmentService.Setup(service => service.DeleteAttachmentAsync(1)).ReturnsAsync(mockResponse);
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);

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;
@@ -13,17 +12,16 @@ namespace DamageAssesment.Api.Attachments.Controllers
     {
         private IAttachmentsProvider AttachmentProvider;
         private IUploadService UploadService;
-        private IAzureBlobService azureBlobService;
 
-        public AttachmentsController(IAttachmentsProvider AttachmentsProvider,  IAzureBlobService azureBlobService)
+        public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService uploadService)
         {
             this.AttachmentProvider = AttachmentsProvider;
-            this.azureBlobService = azureBlobService;
+            this.UploadService = uploadService;  
         }
         /// <summary>
         /// Get all attachments.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
         [HttpGet("attachments")]
         public async Task<ActionResult> GetAttachmentsAsync()
         {
@@ -39,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)
         {
@@ -83,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)
         {
@@ -92,7 +89,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                 if (attachmentInfo.Answers.Count > 0)
                 {
                     var Attachments =  await this.AttachmentProvider.GetAttachmentCounter();
-                    List<Models.Attachment> attachments = await azureBlobService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
+                    List<Models.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
                     var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments);
                     if (result.IsSuccess)
                     {
@@ -110,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)
         {
@@ -121,7 +118,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
                     var res =  await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
                     if (res.IsSuccess)
                     {
-                        List<Models.Attachment> attachments = await azureBlobService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
+                        List<Models.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
                         var result = await this.AttachmentProvider.PutAttachmentAsync(attachments);
                         if (result.IsSuccess)
                         {
@@ -141,7 +138,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)
         {
@@ -150,7 +146,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
             if (result.IsSuccess)
             {
                 // deleting file from folder
-                azureBlobService.Movefile(result.Attachment.URI);
+                UploadService.Movefile(result.Attachment.URI);
                 return Ok(result.Attachment);
             }
             return NotFound();

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

@@ -1,15 +1,10 @@
 using Azure.Storage.Blobs.Models;
-using DamageAssesment.Api.Attachments.Models;
 
 namespace DamageAssesment.Api.Attachments.Interfaces
 {
     public interface IAzureBlobService
     {
         Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files);
-        Task<List<Attachment>> UploadAttachment(int responseId, int answerId, int counter, List<IFormFile> postedFile);
+        void DeleteFile(string path);
-        Task<List<Attachment>> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
-        Task<List<Attachment>> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
-        void Deletefile(string path);
-        void Movefile(string path);
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -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.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
@@ -95,7 +45,6 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
-app.UseAuthentication();
 app.UseAuthorization();
 app.UseHttpsRedirection();
 

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

@@ -3,9 +3,6 @@ using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs.Specialized;
 using DamageAssesment.Api.Attachments.Interfaces;
-using DamageAssesment.Api.Attachments.Models;
-using System.Diagnostics.Metrics;
-using System.Text;
 
 namespace DamageAssesment.Api.Attachments.Providers
 {
@@ -13,95 +10,11 @@ namespace DamageAssesment.Api.Attachments.Providers
     {
         BlobServiceClient _blobClient;
         BlobContainerClient _containerClient;
-        string azureConnectionString;
+        string azureConnectionString = "<Primary Connection String>";
-        private string uploadpath = "";
+        public AzureBlobService()
-        private string Deletepath = "";
-        public AzureBlobService(IConfiguration configuration)
         {
-            uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
+            _blobClient = new BlobServiceClient(azureConnectionString);
-            Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
+            _containerClient = _blobClient.GetBlobContainerClient("apiimages");
-            _blobClient = new BlobServiceClient(configuration.GetValue<string>("Fileupload:BlobConnectionString"));
-            _containerClient = _blobClient.GetBlobContainerClient(configuration.GetValue<string>("Fileupload:BlobContainerName"));
-        }
-        public async Task<List<Attachment>> UploadAttachment(int responseId, int answerId, int counter, List<IFormFile> postedFile)
-        {
-            var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
-            String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
-            List<Models.Attachment> attachments = new List<Models.Attachment>();
-            foreach (IFormFile item in postedFile)
-            {
-
-                counter++;
-                var UserfileName = Path.GetFileName(item.FileName);
-                var extension = System.IO.Path.GetExtension(UserfileName);
-                var fileName = String.Format("Attachment_{0}{1}", counter, extension);
-                var stream = item.OpenReadStream();
-                BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
-                string dbPath = fullDirectoryPath + "/" + fileName;
-                var result = await client.UploadAsync(stream, true);
-                attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
-            }
-            return attachments;
-        }
-        public async Task<List<Attachment>> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers)
-        {
-            List<Models.Attachment> attachments = new List<Models.Attachment>();
-            try
-            {
-                foreach (var item in answers)
-                {
-                    int answerId = item.AnswerId;
-                    var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
-                    String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
-                    foreach (var file in item.postedFiles)
-                    {
-                        counter++;
-
-                        var UserfileName = Path.GetFileName(file.FileName);
-                        var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
-                        byte[] byteArray = Convert.FromBase64String(file.FileContent);
-                        MemoryStream stream = new MemoryStream(byteArray);
-                        BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
-                        string dbPath = fullDirectoryPath + "/" + fileName;
-                        var result = await client.UploadAsync(stream, true);
-                        attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
-                    }
-                }
-                return attachments;
-            }
-            catch (Exception ex)
-            {
-                return new List<Models.Attachment>();
-            }
-
-
-        }
-        public async Task<List<Attachment>> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments)
-        {
-            List<Models.Attachment> Dbattachments = new List<Models.Attachment>();
-            foreach (Models.Attachment searchFile in attachments)
-            {
-                Movefile(searchFile.URI);
-            }
-            foreach (var item in answers)
-            {
-                int answerId = item.AnswerId;
-                var pathToSave = Path.Combine(uploadpath, "Response-" + responseId);
-                String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId);
-                foreach (var file in item.postedFiles)
-                {
-                    Models.Attachment attachment = attachments.Where(a => a.Id == file.AttachmentId).FirstOrDefault();
-                    var UserfileName = Path.GetFileName(file.FileName);
-                    var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
-                    byte[] byteArray = Convert.FromBase64String(file.FileContent);
-                    MemoryStream stream = new MemoryStream(byteArray);
-                    BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName);
-                    string dbPath = fullDirectoryPath + "/" + fileName;
-                    var result = await client.UploadAsync(stream, true);
-                    Dbattachments.Add(new Models.Attachment { Id = attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
-                }
-            }
-            return Dbattachments;
         }
 
         public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
@@ -122,52 +35,10 @@ namespace DamageAssesment.Api.Attachments.Providers
 
             return azureResponse;
         }
-        public string getMovefilename(string movefilename)
+        public void DeleteFile(string url)
         {
-            var list = movefilename.Split('.');
+            var blob = _containerClient.GetBlockBlobClient(url);
-            if (list.Length > 0)
+            blob.DeleteIfExists();
-                list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") + "_" + DateTime.Now.ToShortTimeString().Replace("/", "_") + "." + list[list.Length - 1];
-            return string.Join("_", list);
-        }
-        public void Movefile(string path)
-        {
-            try
-            {
-                if (path != "")
-                {
-                    string MovePath = getMovefilename(path.Replace(uploadpath, Deletepath));
-                    // Get references to the source and destination blobs
-                    BlobClient sourceBlobClient = _containerClient.GetBlobClient(path);
-                    BlobClient destinationBlobClient = _containerClient.GetBlobClient(MovePath);
-                    // Start the copy operation from the source to the destination
-                    destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri);
-
-                    // Check if the copy operation completed successfully
-                    WaitForCopyToComplete(destinationBlobClient);
-
-                    // Delete the source blob after a successful copy
-                    sourceBlobClient.DeleteIfExists();
-                }
-            }
-            catch (Exception ex)
-            {
-
-            }
-        }
-        static void WaitForCopyToComplete(BlobClient blobClient)
-        {
-            BlobProperties properties = blobClient.GetProperties();
-
-            while (properties.CopyStatus == CopyStatus.Pending)
-            {
-                Task.Delay(TimeSpan.FromSeconds(1));
-                properties = blobClient.GetProperties();
-            }
-        }
-        public void Deletefile(string url)
-        {
-            BlobClient sourceBlobClient = _containerClient.GetBlobClient(url);
-            sourceBlobClient.DeleteIfExists();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json

@@ -11,14 +11,12 @@
   "AllowedHosts": "*",
   "Fileupload": {
     "folderpath": "DMS_Attachments/Active",
-    "Deletepath": "DMS_Attachments/Deleted",
+    "Deletepath": "DMS_Attachments/Deleted"
-    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
-    "BlobContainerName": "doculinks"
   },
   "ConnectionStrings": {
     //"AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "AttachmentConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    // "AttachmentConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
-
+    "AttachmentConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
   }
 }
   

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

@@ -15,9 +15,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentsLanguageAsync_ShouldReturnStatusCode204()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", null)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en",null)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "", null);
@@ -29,7 +29,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentsLinkTypeAsync_ShouldReturnStatusCode204()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
 
@@ -42,12 +42,12 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentsAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponses();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", null)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en", null)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms", "en", null);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms","en", null);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -55,7 +55,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetActiveDocumentsAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
 
@@ -69,7 +69,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetActiveDocumentsLinkTypeIdAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponses();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
 
@@ -82,7 +82,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentsLinkTypeIdAsync_ShouldReturnStatusCode204()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
             mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
 
@@ -95,9 +95,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.GetDocumentAsync(1, "forms", "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(1,"forms","en")).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1, "forms", "en");
@@ -109,7 +109,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentAsync_ShouldReturnStatusCode404()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.GetDocumentAsync(99, "forms", "en")).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -120,7 +120,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PostDocumentAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputDocument = await MockData.getInputDocumentData();
             var DocumentResponse = await MockData.GetDocuLinksInfo(0);
@@ -135,7 +135,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PostDocumentAsync_ShouldReturnStatusCode400()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockInputDocument = await MockData.getInputDocumentData();
             var mockResponse = await MockData.getBadRequestResponse();
             ReqDoculink documentInfo = null;
@@ -150,13 +150,13 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PutDocumentAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputDocument = await MockData.getInputDocumentData();
             var DocumentResponse = await MockData.GetDocuLinksInfo(1);
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1, DocumentResponse);
+            var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1,DocumentResponse);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -165,12 +165,12 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PutDocumentAsync_ShouldReturnStatusCode400()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputDocument = await MockData.getInputDocumentData();
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(99, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99, null);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99,null);
             Assert.Equal(400, result.StatusCode);
         }
 
@@ -178,7 +178,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task DeleteDocumentAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -190,7 +190,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task DeleteDocumentAsync_ShouldReturnStatusCode404()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -206,7 +206,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse();
             mockDocumentService.Setup(service => service.GetLinkTypesAsync("en")).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
@@ -219,7 +219,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode204()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNoContentResponse();
             mockDocumentService.Setup(service => service.GetLinkTypesAsync("en")).ReturnsAsync(mockResponse);
 
@@ -233,9 +233,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1, "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1,"en")).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1, "en");
 
@@ -246,7 +246,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.GetLinkTypeAsync(99, "en")).ReturnsAsync(mockResponse);
 
@@ -259,7 +259,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(0);
             mockDocumentService.Setup(service => service.PostLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
@@ -273,7 +273,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode400()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
             var mockResponse = await LinkTypeMockData.getBadRequestResponse();
             mockDocumentService.Setup(service => service.PostLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
@@ -287,12 +287,12 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument);
+            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1,mockInputDocument);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -301,12 +301,12 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99, mockInputDocument);
+            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99,mockInputDocument);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -315,10 +315,10 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode400()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getBadRequestResponse();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument);
 
@@ -329,7 +329,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
 
             mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
@@ -342,7 +342,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
             var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IAzureBlobService>();
+            var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
 

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

@@ -14,28 +14,25 @@ namespace DamageAssesment.Api.DocuLinks.Test
         public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponses()
         {
             List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
-
+            
             for (int i = 1; i < 4; i++)
             {
                 Dictionary<string, string> dicttitle = new Dictionary<string, string>();
-                Dictionary<string, string> dictdesc = new Dictionary<string, string>();
+                Dictionary<string, string> dictdesc = new Dictionary<string, string>(); 
                 dicttitle.Add("en", "test"); dicttitle.Add("fr", "tester");
-                dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester");
+                dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester"); 
                 List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
                 DocuLinksTranslations.Add(new DoculinkTranslation()
                 {
                     Language = "en",
-                    title = "tel" + i,
+                    title = "tel"+i,
-                    description = "Sample" + i
+                    description = "Sample"+i
                 });
                 List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
                 doclinksAttachments.Add(new DoculinkAttachments()
                 {
-                    docName = "",
+                    docName = "",Path="www.google.com",
-                    Path = "www.google.com",
+                    IsAttachments=false,CustomOrder=1
-                    IsAttachments = false,
-                    Language = "en",
-                    CustomOrder = 1
                 });
                 list.Add(new DocuLinks.Models.ResDoculink()
                 {
@@ -43,10 +40,10 @@ namespace DamageAssesment.Api.DocuLinks.Test
                     Id = i,
                     linkTypeId = i,
                     IsActive = true,
-                    titles = dicttitle,
+                    titles= dicttitle,
-                    description = dictdesc,
+                    description=dictdesc,
-                    CustomOrder = i,
+                    CustomOrder=i,
-                    doclinksAttachments = doclinksAttachments
+                    doclinksAttachments= doclinksAttachments
                 });
             }
            // List<ResDoculinks> doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
@@ -123,8 +120,8 @@ namespace DamageAssesment.Api.DocuLinks.Test
         {
 
             List<FileModel> fileModels = new List<FileModel>();
-            fileModels.Add(new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt", IsAttachments = true, CustomOrder = 1 });
+            fileModels.Add( new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt",IsAttachments=true,CustomOrder=1 });
-            return new ReqDoculink() { Id = id, linkTypeId = 1, CustomOrder = 1, Files = fileModels };
+            return new ReqDoculink() { Id=id, linkTypeId = 1, CustomOrder = 1, Files = fileModels };
         }
         public static async Task<DocuLinks.Models.Doculink> getInputDocumentData()
         {
@@ -134,14 +131,13 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 Language = "en",
                 title = "tel",
                 description = "Sample"
-            });
+            }); 
             List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
             doclinksAttachments.Add(new DoculinkAttachments()
             {
                 docName = "",
                 Path = "www.google.com",
                 IsAttachments = false,
-                Language = "en",
                 CustomOrder = 1
             });
             return new Models.Doculink
@@ -149,9 +145,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 Id = 1,
                 linkTypeId = 1,
                 IsActive = true,
-                CustomOrder = 1,
+                CustomOrder=1,
                 documentsTranslations = DocuLinksTranslations,
-                doclinksAttachments = doclinksAttachments
+                doclinksAttachments= doclinksAttachments
             };
         }
         public static async Task<List<DocuLinks.Models.Doculink>> getInputDocuLinksData()
@@ -169,7 +165,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
                 docName = "",
                 Path = "www.google.com",
                 IsAttachments = false,
-                Language="en",
                 CustomOrder = 1
             });
             List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();

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

@@ -2,7 +2,6 @@
 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;
 
@@ -13,20 +12,18 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
     {
         private readonly IDoculinkProvider documentsProvider;
         private readonly IUploadService uploadService;
-        private readonly IAzureBlobService azureBlobService;
 
-        public DoculinkController(IDoculinkProvider documentsProvider, IAzureBlobService azureBlobService)
+        public DoculinkController(IDoculinkProvider documentsProvider,IUploadService uploadService)
         {
 
             this.documentsProvider = documentsProvider;
-            this.azureBlobService = azureBlobService;
+            this.uploadService = uploadService; 
 
         }
         /// <summary>
         /// Get all Doculink type.
         /// </summary>
         [HttpGet]
-        [Authorize(Roles = "admin")]
         [Route("doculinks/types")]
         [Route("doculinks/types/{language:alpha}")]
         public async Task<IActionResult> GetLinkTypesAsync(string? language)
@@ -41,7 +38,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Get a Doculink type by id.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpGet]
         [Route("doculinks/types/{id}")]
         [Route("doculinks/types/{id}/{language:alpha}")]
@@ -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)
@@ -111,10 +104,9 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// Get all documents.
+        /// Get all Doculink.
         /// </summary>
-        
+        /// 
-        [Authorize(Roles = "admin")]
         [Route("doculinks")]
         [Route("doculinks/{linktype:alpha}")]
         [Route("doculinks/{linktype:alpha}/{language:alpha}")]
@@ -162,7 +154,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}")]
@@ -179,7 +170,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// update existing doclink.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpPut]
         [Route("doculinks/{id}")]
         public async Task<IActionResult> UpdateDocument(int id,ReqDoculink documentInfo)
@@ -190,7 +180,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 if (dbdoc.IsSuccess)
                 {
                     var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink= await azureBlobService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
+                    Models.Doculink DocuLink= uploadService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
                     var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
                     if (result.IsSuccess)
                     {
@@ -205,7 +195,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Create new doclink.
         /// </summary>
-       // [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks")]
         public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo)
@@ -214,8 +203,8 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             {
                 if (documentInfo != null)
                 {
-                    //var documents = await this.documentsProvider.GetDocumentCounter();
+                    var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink= await azureBlobService.UploadDocument(1, documentInfo);
+                    Models.Doculink DocuLink= uploadService.UploadDocument(documents.counter, documentInfo);
                     var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
                     if (result.IsSuccess)
                     {
@@ -233,7 +222,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Delete Doculink by id.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpDelete]
         [Route("doculinks/{id}")]
         public async Task<IActionResult> DeleteDocument(int id)
@@ -245,7 +233,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 // deleting file from folder
                 foreach (var item in result.Document.doclinksAttachments)
                 {
-                    azureBlobService.Movefile(item.Path);
+                    uploadService.Movefile(item.Path);
                 }
                 return Ok(result.Document);
             }

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

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

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

@@ -15,6 +15,5 @@ namespace DamageAssesment.Api.DocuLinks.Db
         public string Path { get; set; }
         public bool IsAttachments { get; set; }
         public int CustomOrder { get; set; }
-        public string Language { get; set; }
     }
 }

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

@@ -15,7 +15,7 @@ namespace DamageAssesment.Api.DocuLinks.Db
         protected override void OnConfiguring(DbContextOptionsBuilder options)
         {
             // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("DoculinkConnection"));
+            options.UseSqlServer(_Configuration.GetConnectionString("DoculinConnection"));
         }
         public DbSet<Db.Doculink> Documents { get; set; }
         public DbSet<Db.LinkType> LinkTypes { get; set; }

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

@@ -1,14 +1,10 @@
 using Azure.Storage.Blobs.Models;
-using DamageAssesment.Api.DocuLinks.Models;
 
 namespace DamageAssesment.Api.DocuLinks.Interfaces
 {
     public interface IAzureBlobService
     {
         Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files);
-        Task<Models.Doculink> UploadDocument(int counter, ReqDoculink documentInfo);
-        Task<Models.Doculink> UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
         void DeleteFile(string path);
-        void Movefile(string path);
     }
 }

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

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

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

@@ -17,7 +17,6 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public string? FileExtension { get; set; }
         public int CustomOrder { get; set; }
         public string url { get;set; }
-        public string Language { get; set; }
         public bool IsAttachments { get; set; }
     }
 }

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();
@@ -75,7 +25,7 @@ builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<DoculinkDbContext>(option =>
 {
-    option.UseSqlServer("DoculinkConnection");
+    option.UseSqlServer("DoculinConnection");
 });
 var app = builder.Build();
 
@@ -86,7 +36,6 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
-app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,129 +1,20 @@
 
-using Azure;
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs.Specialized;
 using DamageAssesment.Api.DocuLinks.Interfaces;
-using DamageAssesment.Api.DocuLinks.Models;
-using Microsoft.AspNetCore.Mvc.Filters;
-using Microsoft.Extensions.Configuration;
-using Microsoft.VisualBasic;
-using System.ComponentModel;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DamageAssesment.Api.DocuLinks.Providers
 {
-    public class AzureBlobService : IAzureBlobService
+    public class AzureBlobService: IAzureBlobService
     {
         BlobServiceClient _blobClient;
         BlobContainerClient _containerClient;
-        string azureConnectionString;
+        string azureConnectionString = "<Primary Connection String>";
-        private string uploadpath = "";
+        public AzureBlobService()
-        private string Deletepath = "";
-        public AzureBlobService(IConfiguration configuration)
         {
-            uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
+            _blobClient = new BlobServiceClient(azureConnectionString);
-            Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
+            _containerClient = _blobClient.GetBlobContainerClient("apiimages");
-            _blobClient = new BlobServiceClient(configuration.GetValue<string>("Fileupload:BlobConnectionString"));
-            _containerClient = _blobClient.GetBlobContainerClient(configuration.GetValue<string>("Fileupload:BlobContainerName"));
-        }
-        public async Task<Models.Doculink> UploadDocument(int counter, ReqDoculink documentInfo)
-        {
-            Models.Doculink Documents = new Models.Doculink();
-            List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-            try
-            {
-                string path = "", UserfileName = "";
-                if (documentInfo.Files != null)
-                {
-
-                    int counter1 = 1;
-                    foreach (var item in documentInfo.Files)
-                    {
-                        if (item.IsAttachments)
-                        {
-                            UserfileName = Path.GetFileName(item.FileName);
-                            var fileName = String.Format("Document_{0}_{1}{2}", counter, counter1, item.FileExtension);
-                            byte[] byteArray = Convert.FromBase64String(item.FileContent);
-                            MemoryStream stream = new MemoryStream(byteArray);
-                            BlobClient client = _containerClient.GetBlobClient(uploadpath + "/" + fileName);
-                            var result = await client.UploadAsync(stream, true);
-                            path = uploadpath + "/" + fileName;
-                            counter1++;
-                        }
-                        else
-                            path = item.url;
-                        attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder, Language = item.Language });
-                    }
-                }
-                Documents = new Models.Doculink()
-                {
-                    linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations = documentInfo.documentsTranslations,
-                    doclinksAttachments = attachments,
-                    IsDeleted = false,
-                    CustomOrder = documentInfo.CustomOrder,
-                    IsActive = true
-                };
-
-                return Documents;
-            }
-            catch (Exception ex)
-            {
-                return new Models.Doculink();
-            }
-
-
-        }
-
-        public async Task<Models.Doculink> UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo)
-        {
-            try
-            {
-                foreach (var item in document.doclinksAttachments)
-                {
-                    Movefile(item.Path);
-                }
-                string path = "", UserfileName = "";
-                List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-                int counter1 = 1;
-                foreach (var item in documentInfo.Files)
-                {
-                    if (item.IsAttachments)
-                    {
-                        UserfileName = Path.GetFileName(item.FileName);
-                        var fileName = String.Format("Document_{0}_{1}{2)", document.Id, counter1, item.FileExtension);
-                        byte[] byteArray = Encoding.UTF8.GetBytes(item.FileContent);
-                        MemoryStream stream = new MemoryStream(byteArray);
-                        BlobClient client = _containerClient.GetBlobClient(uploadpath + "/" + fileName);
-                        path = uploadpath + "/" + fileName;
-                        var result = await client.UploadAsync(stream, true);
-                        counter1++;
-                    }
-                    else
-                        path = item.url;
-                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder, Language = item.Language });
-                }
-                Models.Doculink Documents = new Models.Doculink()
-                {
-                    Id = documentInfo.Id,
-                    linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations = documentInfo.documentsTranslations,
-                    IsActive = true,
-                    IsDeleted = false,
-                    CustomOrder = documentInfo.CustomOrder,
-                    doclinksAttachments = attachments
-                };
-
-                return Documents;
-            }
-
-            catch (Exception ex)
-            {
-                return new Models.Doculink();
-            }
         }
 
         public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files)
@@ -144,52 +35,10 @@ namespace DamageAssesment.Api.DocuLinks.Providers
 
             return azureResponse;
         }
-        public string getMovefilename(string movefilename)
-        {
-            var list = movefilename.Split('.');
-            if (list.Length > 0)
-                list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") + "_" + DateTime.Now.ToShortTimeString().Replace("/", "_") + "." + list[list.Length - 1];
-            return string.Join("_", list);
-        }
-        public void Movefile(string path)
-        {
-            try
-            {
-                if (path != "")
-                {
-                    string MovePath = getMovefilename(path.Replace(uploadpath, Deletepath));
-                    // Get references to the source and destination blobs
-                    BlobClient sourceBlobClient = _containerClient.GetBlobClient(path);
-                    BlobClient destinationBlobClient = _containerClient.GetBlobClient(MovePath);
-                    // Start the copy operation from the source to the destination
-                    destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri);
-
-                    // Check if the copy operation completed successfully
-                    WaitForCopyToComplete(destinationBlobClient);
-
-                    // Delete the source blob after a successful copy
-                    sourceBlobClient.DeleteIfExists();
-                }
-            }
-            catch (Exception ex)
-            {
-
-            }
-        }
-        static void WaitForCopyToComplete(BlobClient blobClient)
-        {
-            BlobProperties properties = blobClient.GetProperties();
-
-            while (properties.CopyStatus == CopyStatus.Pending)
-            {
-                Task.Delay(TimeSpan.FromSeconds(1));
-                properties = blobClient.GetProperties();
-            }
-        }
         public void DeleteFile(string url)
         {
-            BlobClient sourceBlobClient = _containerClient.GetBlobClient(url);
+            var blob = _containerClient.GetBlockBlobClient(url);
-            sourceBlobClient.DeleteIfExists();
+            blob.DeleteIfExists();
         }
     }
 }

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

@@ -6,8 +6,10 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System;
+using System.Collections.Immutable;
 using System.Diagnostics.Eventing.Reader;
 using System.Reflection.Metadata;
+using System.Xml;
 using System.Xml.Linq;
 
 namespace DamageAssesment.Api.DocuLinks.Providers
@@ -19,22 +21,20 @@ namespace DamageAssesment.Api.DocuLinks.Providers
         private DoculinkDbContext DocumentDbContext;
         private ILogger<DoculinkProvider> logger;
         private IUploadService uploadservice;
-        private IAzureBlobService azureBlobService;
         private IMapper mapper;
 
-        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IAzureBlobService azureBlobService)
+        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice)
         {
             this.DocumentDbContext = DocumentDbContext;
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-            this.azureBlobService = azureBlobService;
+            SeedData();
-            //SeedData();
         }
 
 
 
-        private async Task SeedDataAsync()
+        private void SeedData()
         {
             if (!DocumentDbContext.LinkTypes.Any())
             {
@@ -65,13 +65,20 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 int counter = 0;
                 for (int i = 1; i <= 4; i++)
                 {
-                    FileModel fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
+                    int linkTypeId = 2;
+                    FileModel fileModel = new FileModel();
+                    if (i < 3)
+                    {
+                        linkTypeId = 1;
+
+                        fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 };
+                    }
+                    else
+                        fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
                     ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
-                    Db.DoculinkTranslation documents = new Db.DoculinkTranslation { DocumentId = i, title = "Test" + i, description = "ss" + i, Language = "en" };
+                    Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
-                    Models.Doculink document = await azureBlobService.UploadDocument(counter, documentInfo);
                     DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
                     DocumentDbContext.SaveChanges();
-                    DocumentDbContext.DocumentsTranslations.AddRange(documents);
                     var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(document.doclinksAttachments);
                     dbattachments.ForEach(a => a.DocumentId = i);
                     DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
@@ -79,6 +86,34 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     counter++;
                 }
             }
+            if (!DocumentDbContext.DocumentsTranslations.Any())
+            {
+                string[] titles = {
+                         "Mobile App Damage Assessment Instructions",
+                         "PC Damage Assessment Instructions",
+                         "Emergency Evacuation centers",
+                         "Mobile App Damage Assessment Instructions" };
+                string[] esTranslations = {
+                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil",
+                         "Instrucciones de Evaluación de Daños del PC",
+                         "Centros de Evacuación de Emergencia",
+                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil"  };
+                string[] frTranslations = {
+                      "Instructions d'Évaluation des Dommages de l'Application Mobile",
+                      "Instructions d'Évaluation des Dommages du PC",
+                       "Centres d'Évacuation d'Urgence",
+                       "Instructions d'Évaluation des Dommages de l'Application Mobile" };
+                List<Db.DoculinkTranslation> documents = new List<Db.DoculinkTranslation>();
+                for (int i = 0; i < 4; i++)
+                {
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = titles[i], description = titles[i], Language = "en" });
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = esTranslations[i], description = esTranslations[i], Language = "es" });
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = frTranslations[i], description = frTranslations[i], Language = "fr" });
+                }
+                DocumentDbContext.DocumentsTranslations.AddRange(documents);
+                DocumentDbContext.SaveChanges();
+            }
+
         }
         public List<Models.DoculinkTranslation> GetDocumentTranslations(int id, string? language)
         {
@@ -135,19 +170,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             MultiLanguage = dicttitle;
             return MultiLanguage;
         }
-        private List<Models.DoculinkAttachments> GetDocumentAttachment(int id, string? language)
+
-        {
-            if (string.IsNullOrEmpty(language))
-            {
-                return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                    DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
-            }
-            else
-            {
-                return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList());
-            }
-        }
         public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
         {
 
@@ -155,7 +178,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             {
                 logger?.LogInformation("Query Question");
                 var documents = new List<Db.Doculink>();
-                if (linkTypeId == null)
+                if (linkTypeId==null)
                     documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
                 else
                     documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
@@ -169,9 +192,10 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         item.titles = multilan.titles;
                         item.description = multilan.description;
                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
+                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
                     }
-                    // List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
+                   // List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -204,8 +228,10 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         item.titles = multilan.titles;
                         item.description = multilan.description;
                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
-                        item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
+                        item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
                     }
+                    //List<ResDoculinks> doculinks =  result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -258,7 +284,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
                             DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
 
-                    result.doclinksAttachments = GetDocumentAttachment(id, "");
+                    result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -290,7 +317,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
                     result.titles = multilan.titles;
                     result.description = multilan.description;
-                    result.doclinksAttachments = GetDocumentAttachment(id, language);
+                    result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -401,7 +429,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 result.titles = multilan.titles;
                 result.description = multilan.description;
                 result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, ""));
-                result.doclinksAttachments = GetDocumentAttachment(id, "");
+                result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
+                    DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
                 Document.IsActive = false;
                 DocumentDbContext.Documents.Update(Document);
                 DocumentDbContext.SaveChanges();
@@ -419,7 +448,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
         {
             try
             {
-                int AttachmentId = DocumentDbContext.Documents.Max(a => a.Id);
+                int AttachmentId = DocumentDbContext.DoclinksAttachments.Max(a => a.Id);
                 return (true, AttachmentId, "");
             }
             catch (Exception ex)

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

@@ -30,9 +30,9 @@ namespace DamageAssesment.Api.DocuLinks.Providers
         {
             Models.Doculink Documents = new Models.Doculink();
             List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-            try
+            try 
             {
-                string path = "", UserfileName = "";
+                string path = "", UserfileName="";
                 var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
                 if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
                     Directory.CreateDirectory(fullDirectoryPath);
@@ -51,27 +51,20 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         }
                         else
                             path = item.url;
-                        attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder, Language = item.Language });
+                        attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
                     }
                 }
-                Documents = new Models.Doculink()
+                Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
-                {
+                    documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
-                    linkTypeId = documentInfo.linkTypeId,
+                    IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true};
-                    documentsTranslations = documentInfo.documentsTranslations,
+            
-                    doclinksAttachments = attachments,
-                    IsDeleted = false,
-                    CustomOrder = documentInfo.CustomOrder,
-                    IsActive = true
-                };
-
                 return Documents;
             }
-            catch (Exception ex)
+            catch (Exception ex) {
-            {
                 return new Models.Doculink();
             }
 
-
+           
         }
         public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo)
         {
@@ -87,28 +80,27 @@ namespace DamageAssesment.Api.DocuLinks.Providers
 
                 string path = "", UserfileName = "";
                 List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-                int counter1 = 1;
                 foreach (var item in documentInfo.Files)
                 {
+                    counter++;
                     if (item.IsAttachments)
                     {
                         UserfileName = Path.GetFileName(item.FileName);
-                        var fileName = String.Format("Document_{0}_{1}{2}", document.Id, counter1, item.FileExtension);
+                        var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
                         path = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
-                        counter1++;
                     }
                     else
                         path = item.url;
-                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder, Language = item.Language });
+                    attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
                 }
                 Models.Doculink Documents = new Models.Doculink()
                 {
                     Id = documentInfo.Id,
                     linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations = documentInfo.documentsTranslations,
+                    documentsTranslations=documentInfo.documentsTranslations,
                     IsActive = true,
-                    IsDeleted = false,
+                    IsDeleted=false,
                     CustomOrder = documentInfo.CustomOrder,
                     doclinksAttachments = attachments
                 };
@@ -116,8 +108,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 return Documents;
             }
 
-            catch (Exception ex)
+             catch (Exception ex) {
-            {
                 return new Models.Doculink();
             }
         }
@@ -126,7 +117,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             if (path != "")
             {
                 FileInfo file = new FileInfo(path);
-                if (file?.Exists ?? false)//check file exsit or not  
+                if (file?.Exists??false)//check file exsit or not  
                 {
                     file.Delete();
                 }
@@ -142,8 +133,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 FileInfo file = new FileInfo(path);
                 if (file?.Exists ?? false)//check file exsit or not  
                 {
-                    string filename = file.Name.Replace(file.Extension, " ") + DateTime.Now.ToShortDateString().Replace("/", "_") + file.Extension;
+                    string filename = file.Name.Replace(file.Extension, " ") + DateTime.Now.ToShortDateString().Replace("/","_") + file.Extension;
-                    file.MoveTo(pathToSave + "\\" + filename);
+                    file.MoveTo(pathToSave+"\\"+ filename);
                 }
             }
         }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json

@@ -1,7 +1,4 @@
 {
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
-  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
@@ -10,14 +7,13 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    //"DoculinkConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    //"DoculinConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;",
-    "DoculinkConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"DoculinConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
+    "DoculinConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
 
   },
   "Fileupload": {
     "folderpath": "DASA_Documents/Active",
-    "Deletepath": "DASA_Documents/Deleted",
+    "Deletepath": "DASA_Documents/Deleted"
-    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
-    "BlobContainerName": "doculinks"
   }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/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)
         {
@@ -49,12 +48,11 @@ namespace DamageAssesment.Api.Employees.Controllers
             return NotFound();
 
         }
-
+   
         /// <summary>
         /// 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/Providers/EmployeesProvider.cs

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

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

@@ -9,9 +9,15 @@
     }
   },
   "AllowedHosts": "*",
+  "settings": {
+    "endpoint1": "xxx",
+    "endpoint2": "xxx",
+    "endpoint3": "xxx"
+  },
   "ConnectionStrings": {
-    //"EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    //"EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;",
-    "EmployeeConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"EmployeeConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
+    "EmployeeConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
 
   }
 }

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/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.UseSqlServer("LocationConnection");
 });
-
-
 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/appsettings.json

@@ -9,12 +9,10 @@
     }
   },
   "AllowedHosts": "*",
-  //"ConnectionStrings": {
-  //  "LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-  //},
   "ConnectionStrings": {
-    //"LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    //"LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;",
-    "LocationConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    // "LocationConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
+    "LocationConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
 
   }
 }

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

@@ -1,5 +1,4 @@
 using DamageAssesment.Api.Questions.Interfaces;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
@@ -11,13 +10,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")]
+        // get all questions
         [Route("questions")]
         [Route("questions/{language:alpha}")]
         [HttpGet]
@@ -35,7 +37,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]
@@ -54,7 +55,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]
@@ -71,7 +71,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)
         {
@@ -90,31 +89,9 @@ namespace DamageAssesment.Api.Questions.Controllers
             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
         }
         /// <summary>
-        /// POST request for creating a multiple question (multilingual).
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPost("questions/multiple")]
-        public async Task<IActionResult> CreateQuestions(List<Models.Question> questions)
-        {
-            if (questions != null)
-            {
-                var result = await this.questionsProvider.PostQuestionsAsync(questions);
-                if (result.IsSuccess)
-                {
-                    return Ok(result.Question);
-                }
-                if (result.ErrorMessage == "Not Found")
-                    return NotFound(result.ErrorMessage);
-
-                return BadRequest(result.ErrorMessage);
-            }
-            return CreatedAtRoute("DefaultApi", questions);
-        }
-        /// <summary>
         /// POST request for creating a new question (multilingual).
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpPost("questions")]
         public async Task<IActionResult> CreateQuestion(Models.Question question)
         {
@@ -133,7 +110,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)
         {
@@ -149,7 +125,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)
@@ -164,7 +139,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)
@@ -181,7 +156,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)
         {
@@ -203,7 +178,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)
         {
@@ -222,7 +196,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/Interfaces/IQuestionsProvider.cs

@@ -8,7 +8,6 @@ namespace DamageAssesment.Api.Questions.Interfaces
         Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language);
         Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string language);
         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
-        Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions);
         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id);
 

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

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

DamageAssesmentApi/DamageAssesment.Api.Questions/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.UseSqlServer("QuestionConnection");
@@ -93,7 +43,7 @@ if (app.Environment.IsDevelopment())
         questionProvider.SeedData();
     }
 }
-app.UseAuthentication();
+
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -334,7 +334,16 @@ namespace DamageAssesment.Api.Questions.Providers
             try
             {
                 logger?.LogInformation("Query Question");
-                var result = InsertQuestion(Question);
+                var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
+                var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
+                dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
+                questionDbContext.Questions.Add(dbquestion);
+                dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
+                questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
+                questionDbContext.SaveChanges();
+                Question.Id = dbquestion.Id;
+                var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
+                result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id,""));
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -343,39 +352,6 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        private Models.MultiLanguage InsertQuestion(Models.Question Question)
-        {
-            var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
-            var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
-            dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
-            questionDbContext.Questions.Add(dbquestion);
-            questionDbContext.SaveChanges();
-            dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
-            questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
-            questionDbContext.SaveChanges();
-            Question.Id = dbquestion.Id;
-            var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
-            result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
-            return result;
-        }
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions)
-        {
-            try
-            {
-                List<Models.MultiLanguage> results = new List<MultiLanguage>();
-                logger?.LogInformation("Query Question");
-                foreach (Models.Question Question in Questions)
-                {
-                    results.Add(InsertQuestion(Question));
-                }
-                return (true, results, null);
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
         public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
         {
             try

DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json

@@ -11,7 +11,8 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     //"QuestionConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "QuestionConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    // "QuestionConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
+    "QuestionConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
 
   }
 }

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

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

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

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

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

@@ -12,11 +12,9 @@ namespace DamageAssesment.SurveyResponses.Test
     public class SurveyResponsesServiceTest
     {
         Mock<ISurveysResponse> mockSurveyResponseService;
-        Mock<IExcelExportService> mockExcelExportService;
         public SurveyResponsesServiceTest()
         {
             mockSurveyResponseService = new Mock<ISurveysResponse>();
-            mockExcelExportService = new Mock<IExcelExportService>();
         }
 
         [Fact(DisplayName = "Get Responses - Ok case")]
@@ -25,16 +23,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);
             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);
             var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
             Assert.Equal(400, result.StatusCode);
         }
@@ -44,9 +43,9 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1,1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
             Assert.Equal(200, result.StatusCode);
         }
 
@@ -54,9 +53,9 @@ namespace DamageAssesment.SurveyResponses.Test
         public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1,1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
             Assert.Equal(204, result.StatusCode);
         }
 
@@ -68,9 +67,9 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1,1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1,1);
             Assert.Equal(200, result.StatusCode);
         }
 
@@ -79,7 +78,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);
             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -89,9 +88,9 @@ 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);
+            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);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes",1);
             Assert.Equal(200, result.StatusCode);
         }
 
@@ -100,8 +99,8 @@ 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);
-            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes",1);
             Assert.Equal(204, result.StatusCode);
         }
 
@@ -111,8 +110,8 @@ namespace DamageAssesment.SurveyResponses.Test
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1,1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -122,7 +121,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);
             var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -133,7 +132,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);
             var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -143,7 +142,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);
             var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -154,7 +153,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);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -164,7 +163,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);
             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
             Assert.Equal(204, result.StatusCode);
         }
@@ -176,7 +175,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);
             var result = (OkObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
             Assert.Equal(200, result.StatusCode);
         }
@@ -187,7 +186,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);
             var result = (BadRequestObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
             Assert.Equal(400, result.StatusCode);
         }
@@ -198,7 +197,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);
             var result = (OkObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
             Assert.Equal(200, result.StatusCode);
         }
@@ -209,7 +208,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);
             var result = (BadRequestObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
             Assert.Equal(400, result.StatusCode);
         }
@@ -220,7 +219,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);
             var result = (OkObjectResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
@@ -230,7 +229,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);
             var result = (NotFoundResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
             Assert.Equal(404, result.StatusCode);
         }

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

@@ -1,26 +1,22 @@
 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)
         {
             this.surveyResponseProvider = surveyResponseProvider;
-            this.excelExportService = excelExportService;
         }
         /// <summary>
         /// GET request for retrieving survey responses.
         /// </summary>
 
-        [Authorize(Roles = "admin,survey,user,report")]
         [Route("responses/{employeeid:int}")]
         [Route("responses")]
         [HttpGet]
@@ -40,7 +36,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,13 +54,12 @@ 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]
-        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid, int? employeeid)
+        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid,int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid, employeeid ?? 0);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid,employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -79,7 +73,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 +91,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 +107,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 +124,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 +140,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 +156,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 +173,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 +188,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)
         {
@@ -212,11 +198,7 @@ namespace DamageAssesment.Api.Responses.Controllers
             else
                 return BadRequest(result.ErrorMessage);
         }
-        /// <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}")]
@@ -231,41 +213,7 @@ namespace DamageAssesment.Api.Responses.Controllers
             }
             return NoContent();
         }
-        /// <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)
-        {
-            var result = await this.surveyResponseProvider.ExportSurveyResponsesAsync(surveyid, language, IsAdmin);
-            if (result.IsSuccess && result.surveyResponses.Count > 0)
-            {
 
-                byte[] fileContents = excelExportService.ExportToExcel<object>(result.surveyResponses);
-                return File(fileContents, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "data.xlsx");
-                //return Ok(result.Surveys);
-            }
-            return NoContent();
-        }
-        //[Route("responses/surveys/active")]
-        //[Route("responses/surveys/active/{language:alpha}")]
-        //[HttpGet]
-        //public async Task<ActionResult> GetActiveSurveysAsync( string? language)
-        //{
-        //    var result = await this.surveyResponseProvider.GetActiveSurveysAsync(null, language);
-        //    if (result.IsSuccess)
-        //    {
-        //        return Ok(result.Surveys);
-        //    }
-        //    return NoContent();
-        //}
-
-        /// <summary>
-        /// Get all historical surveys .
-        /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
         [Route("responses/surveys/historic")]
         [Route("responses/surveys/historic/{language:alpha}")]
         [Route("responses/surveys/historic/{employeeid:int}")]

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

@@ -11,8 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="ClosedXML" Version="0.102.1" />
-    <PackageReference Include="EPPlus" Version="6.2.10" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
       <PrivateAssets>all</PrivateAssets>

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

@@ -1,7 +0,0 @@
-namespace DamageAssesment.Api.Responses.Interfaces
-{
-    public interface IExcelExportService
-    {
-        public byte[] ExportToExcel<T1>(List<object> responses);
-    }
-}

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,8 @@ namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface IQuestionServiceProvider
     {
-        Task<List<Question>> getQuestionsAsync(string language, string token);
+        Task<List<Question>> getQuestionsAsync();
-        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);
     }
 }

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/Interfaces/ISurveysResponse.cs

@@ -7,9 +7,8 @@ namespace DamageAssesment.Api.Responses.Interfaces
     {
         Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId, int employeeid);
         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyResponseAsync(Models.SurveyResponse surveyResponse);
-        // Task<(bool IsSuccess,dynamic surveyResponses, string ErrorMessage)> GetSurveyResponseAsync(int responseId);
+       // Task<(bool IsSuccess,dynamic surveyResponses, string ErrorMessage)> GetSurveyResponseAsync(int responseId);
         Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync(int employeeid);
-        Task<(bool IsSuccess, List<object> surveyResponses, string ErrorMessage)> ExportSurveyResponsesAsync(int surveyId, string language, bool IsAdmin);
         Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetActiveSurveysAsync(int? employeeid, string language);
         Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetHistoricSurveysAsync(int? employeeid, string language);
         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse);

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

@@ -11,7 +11,6 @@ namespace DamageAssesment.Api.Responses.Models
 
         public int? AnswerId { get; set; }
         public bool IsDeleted { get; set; }
-        public string FileName { get; set; }
 
         public Attachment(int answerId, string uri)
         {

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

@@ -4,7 +4,6 @@
     {
         public int Id { get; set; }
         public int RegionId { get; set; }
-        public string LocationCode { get; set; }
         public string Name { get; set; }
         public string MaintenanceCenter { get; set; }
         public string SchoolType { get; set; }

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

@@ -1,10 +0,0 @@
-namespace DamageAssesment.Api.Responses.Models
-{
-    public class QuestionCategory
-    {
-        public int Id { get; set; }
-        public string IconName { get; set; }
-        public string IconLibrary { get; set; }
-        public object Titles { get; set; }
-    }
-}

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

@@ -2,20 +2,13 @@
 
 namespace DamageAssesment.Api.Responses.Models
 {
-    public enum SurveyStatus
-    {
-        PENDING,
-        ACTIVE,
-        INACTIVE
-    }
     public class Survey
     {
         public int Id { get; set; }
         public bool IsEnabled { get; set; }
-        public DateTime? StartDate { get; set; }
+        public DateTime StartDate { get; set; }
-        public DateTime? EndDate { get; set; }
+        public DateTime EndDate { get; set; }
         public DateTime CreatedDate { get; set; }
-        public string Status { get; set; }
         public Dictionary<string, string> Titles { get; set; }
     }
 }

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

@@ -1,24 +0,0 @@
-namespace DamageAssesment.Api.Responses.Models
-{
-    public class SurveyExport
-    {
-        public int Id { get; set; }
-        public string SurveyQuestion { get; set; }  
-        public string Answer { get; set; }
-        public string Category { get; set; }
-
-        public string School { get; set; }
-        public string Location { get; set; }
-        public string Region { get; set; }
-
-        public string MC { get; set; }
-        public string ResponseDate { get; set; }
-        public string Notes { get; set; }
-
-        public string Attachment1 { get; set; }
-        public string Attachment2 { get; set; }
-        public string Attachment3 { get; set; }
-        public string Attachment4 { get; set; }
-        public string Attachment5 { 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,8 +26,6 @@ builder.Services.AddScoped<IQuestionServiceProvider, QuestionServiceProvider>();
 builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
 builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>();
 builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>();
-builder.Services.AddScoped<IExcelExportService, ExcelExportService>();
-builder.Services.AddHttpContextAccessor();
 
 builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
     AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
@@ -59,40 +35,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 +55,6 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
-app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "DamageAssesment.Api.Responses": {
+    "DamageAssesment.Api.SurveyResponses": {
       "commandName": "Project",
       "launchBrowser": true,
       "launchUrl": "swagger",

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

@@ -1,62 +0,0 @@
-using ClosedXML.Excel;
-using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.Responses.Models;
-using OfficeOpenXml;
-using System.Collections.Generic;
-
-namespace DamageAssesment.Api.Responses.Providers
-{
-    public class ExcelExportService: IExcelExportService
-    {
-        public byte[] ExportToExcel<T1>(List<object> responses)
-        { 
-            ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
-            using (var package = new ExcelPackage())
-            {
-                // Create the first worksheet and populate it with responses
-                var workSheet1 = package.Workbook.Worksheets.Add("responses");
-                PopulateWorksheet(workSheet1, responses);
-                return package.GetAsByteArray();
-            }
-        }
-        private void PopulateWorksheet(ExcelWorksheet worksheet, List<object> data)
-        {
-            if (data.Count > 0)
-            {
-                var properties = data[0].GetType().GetProperties();
-                List<int> IsAttchments = new List<int>();
-                // Add column headers
-                for (int col = 1; col <= properties.Length; col++)
-                {
-                    worksheet.Cells[1, col].Value = properties[col - 1].Name;
-                    if(properties[col - 1].Name.ToLower().Contains("attachment"))
-                        IsAttchments.Add(col);
-                }
-
-                // Add data
-                for (int row = 2; row <= data.Count + 1; row++)
-                {
-                    for (int col = 1; col <= properties.Length; col++)
-                    {
-                       
-                            string value = Convert.ToString(properties[col - 1].GetValue(data[row - 2]));
-                        if (IsAttchments.Where(a => a == col).Count() > 0 && !string.IsNullOrEmpty(value))
-                        {
-                            List<string> attachments = value.Split("##").ToList();
-                            try
-                            {
-                                Uri linkUri = new Uri(attachments[1]);
-                                worksheet.Cells[row, col].Value = attachments[0];
-                                worksheet.Cells[row, col].Style.Font.UnderLine = true;
-                            }
-                            catch { worksheet.Cells[row, col].Value = attachments[1]; }
-                        }
-                        else
-                            worksheet.Cells[row, col].Value = value;
-                        
-                    }
-                }
-            }
-        }
-    }
-}

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

@@ -2,11 +2,7 @@
 using DamageAssesment.Api.Responses.Db;
 using DamageAssesment.Api.Responses.Interfaces;
 using DamageAssesment.Api.Responses.Models;
-using DamageAssesment.Api.Responses.Services;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using System.Reflection;
-using System.Text.Json;
 
 namespace DamageAssesment.Api.Responses.Providers
 {
@@ -22,10 +18,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 +30,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()
@@ -61,6 +43,7 @@ namespace DamageAssesment.Api.Responses.Providers
                 // Create and save SurveyResponse records with references to existing Employee and Location records
                 surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 1, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
                 surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
+
                 surveyResponseDbContext.SaveChanges();
             }
         }
@@ -135,8 +118,8 @@ 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();
+                surveys = surveys.Where(s => s.IsEnabled == true && s.StartDate <= DateTime.Now && s.EndDate >= DateTime.Now).ToList();
                 if (employeeid == null || employeeid == 0)
                     return (true, surveys, null);
                 List<int> listOfsurveysId = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid.Value).Select(y => y.SurveyId).ToListAsync();
@@ -156,9 +139,9 @@ 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();
+                surveys = surveys.Where(s => s.EndDate < DateTime.Now).ToList();
                 if (employeeid == null || employeeid == 0)
                     return (true, surveys, null);
                 var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).ToListAsync();
@@ -181,7 +164,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)
                 {
@@ -212,7 +195,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)
                 {
@@ -243,7 +226,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)
                 {
@@ -274,8 +257,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;
 
 
@@ -324,26 +307,6 @@ namespace DamageAssesment.Api.Responses.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, List<object> surveyResponses, string ErrorMessage)> ExportSurveyResponsesAsync(int surveyId, string language, bool isadmin)
-        {
-            try
-            {
-                var responses = await getAllSurveyResponsesExcelAsync(surveyId, language, isadmin);
-
-                if (responses != null)
-                    return (true, responses, "Request Successful.");
-                else
-                {
-                    responses = null;
-                    return (true, responses, "Empty object returned");
-                }
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
 
         public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyResponseAsync(Models.SurveyResponse surveyResponse)
         {
@@ -436,7 +399,7 @@ namespace DamageAssesment.Api.Responses.Providers
         {
             try
             {
-                var answersList = await answerServiceProvider.getAnswersAsync(token);
+                var answersList = await answerServiceProvider.getAnswersAsync();
                 if (answersList == null || !answersList.Any())
                     return null;
 
@@ -459,8 +422,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;
@@ -470,18 +433,18 @@ namespace DamageAssesment.Api.Responses.Providers
                 var result = from answer in surveyAnswers
                              from location in locations
                              where answer.LocationId.Equals(location.Id)
-                             select new 
+                             select new
                              {
-                                answer.Id,
+                                 answer.Id,
-                                answer.QuestionId,
+                                 answer.QuestionId,
-                                answer.AnswerText,
+                                 answer.AnswerText,
-                                answer.Comment,
+                                 answer.Comment,
-                                location.RegionId,
+                                 location.RegionId,
-                                LocationId = location.Id,
+                                 LocationId = location.Id,
-                                answer.SurveyResponseId
+                                 answer.SurveyResponseId
                              };
 
-               
+
 
                 //group records by answer and region
                 var q = from e in result
@@ -489,13 +452,13 @@ namespace DamageAssesment.Api.Responses.Providers
                         select new
                         {
                             g.Key.RegionId,
-                            Answers = new 
+                            Answers = new
                             {
                                 g.Key.AnswerText,
                                 Counter = g.Count()
                             }
                         };
-                
+
                 //build the result
 
                 List<dynamic> resultList = new List<dynamic>();
@@ -503,9 +466,9 @@ namespace DamageAssesment.Api.Responses.Providers
                 {
                     var answers = from u in q.ToList()
                                   where u.RegionId.Equals(region.Id)
-                                  select u.Answers; 
+                                  select u.Answers;
-   
+
-                    resultList.Add(new { RegionId = region.Id, region.Name, region.Abbreviation, Answers = answers});
+                    resultList.Add(new { RegionId = region.Id, region.Name, region.Abbreviation, Answers = answers });
                 }
                 //return the object result
                 return new { Regions = resultList };
@@ -522,11 +485,11 @@ 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();
                 var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
                 var result = new
                 {
@@ -571,47 +534,85 @@ 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);
                 }
 
-                var answers = await answerServiceProvider.getAnswersAsync(token);
+                var answers = await answerServiceProvider.getAnswersAsync();
-                var questions = await questionServiceProvider.getQuestionsAsync(null, token);
+                var questions = await questionServiceProvider.getQuestionsAsync();
                 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();
-                var result = from r in surveyResonses
-                             select new
-                             {
-                                 r.Id,
-                                 r.SurveyId,
-                                 r.LocationId,
-                                 r.EmployeeId,
-                                 r.ClientDevice,
-                                 r.KeyAnswerResult,
-                                 r.Longitute,
-                                 r.Latitude,
-                                 Employee = (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.AnswerText,
-                                               ans.Comment,
-                                               Questions = (from q in surveyQuestions 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 }
 
-                                           }
+                if (employeeid == 0)
-                             };
+                {
-                return result;
+                    var result = from r in surveyResonses
+                                 select new
+                                 {
+                                     r.Id,
+                                     r.SurveyId,
+                                     r.LocationId,
+                                     r.EmployeeId,
+                                     r.ClientDevice,
+                                     r.KeyAnswerResult,
+                                     r.Longitute,
+                                     r.Latitude,
+                                     Employee = (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.AnswerText,
+                                                   ans.Comment,
+                                                   Questions = (from q in surveyQuestions 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;
+                }
+                else
+                {
+                    object _employee = new { };
+                    if (employee != null)
+                    {
+                        _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
+                    }
+                    var result = from r in surveyResonses
+                                 select new
+                                 {
+                                     r.Id,
+                                     r.SurveyId,
+                                     r.LocationId,
+                                     r.EmployeeId,
+                                     r.ClientDevice,
+                                     r.KeyAnswerResult,
+                                     r.Longitute,
+                                     r.Latitude,
+                                     Employee = _employee,
+                                     answers = from ans in answers
+                                               where ans.SurveyResponseId == r.Id
+                                               select new
+                                               {
+                                                   ans.Id,
+                                                   ans.QuestionId,
+                                                   ans.AnswerText,
+                                                   ans.Comment,
+                                                   Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
+                                                   Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
+                                               }
+                                 };
+
+                    return result;
+                }
             }
             catch (Exception ex)
             {
@@ -633,12 +634,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)
                     {
@@ -647,9 +648,9 @@ 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();
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
                 var result = from r in surveyResonses
                              select new
@@ -676,134 +677,6 @@ namespace DamageAssesment.Api.Responses.Providers
                                            }
                              };
                 return result;
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError($"Exception Found : {ex.Message} - Ref: SurveyResponsesProvider.getSurveyResponseBySurveyIdAsync()");
-                return null;
-            }
-        }
-        //Method to get All Survey Responses for excel export
-        private async Task<List<object>> getAllSurveyResponsesExcelAsync(int surveyId, string language, bool isadmin)
-        {
-            try
-            {
-                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 Locations = await locationServiceProvider.getLocationsAsync(token);
-                var regions = await regionServiceProvider.getRegionsAsync(token);
-                var questions = await questionServiceProvider.getQuestionsAsync(language, token);
-                var categories = await questionServiceProvider.GetQuestionCategoriesAsync(language, token);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
-                List<object> questionLists = new List<object>();
-                var allques = from res in surveyResonses
-                              join loc in Locations on res.LocationId equals loc.Id
-                              join reg in regions on loc.RegionId equals reg.Id
-                              join ans in answers on res.Id equals ans.SurveyResponseId
-                              join q in questions on ans.QuestionId equals q.Id
-                              join qc in categories on q.CategoryId equals qc.Id
-                              select new
-                              {
-                                  responseId = res.Id,
-                                  questionId = q.Id,
-                                  QuestionNumber = q.QuestionNumber,
-                                  Category = JsonSerializer.Deserialize<Dictionary<string, string>>(qc.Titles.ToString())[language],
-                                  question = q.Text[language],
-                                  answerId = ans.Id,
-                                  AnswerText = ans.AnswerText,
-                                  Comment = ans.Comment,
-                                  Location = loc.LocationCode,
-                                  school = loc.Name,
-                                  Region = reg.Name,
-                                  MC = loc.MaintenanceCenter,
-                                  ResponseDate = res.CreatedDate,
-                                  EmployeeId = res.EmployeeId,
-                                  ClientDevice = res.ClientDevice,
-                                  Attachments = attachments.Where(a => a.AnswerId == ans.Id).Select(a => a.FileName + "##" + a.URI).ToList()
-                              };
-                List<object> allresoponses = new List<object>();
-                foreach (var item in allques)
-                {
-
-                    List<string> ansattachments = item.Attachments.ToList();
-
-                    //// Initialize the attachment dictionary
-                    //var attachmentsobject = new Dictionary<string, string>();
-                    //for (int i = 0; i < ansattachments.Count; i++)
-                    //{
-                    //    attachmentsobject["Attachment"+(i+1).ToString()] = ansattachments[i];
-                    //}
-
-
-                    string[] variables = new string[5];
-                    for (int i = 0; i < 5; i++) // Assuming you want to assign 5 values
-                    {
-                        if (i < ansattachments.Count())
-                        {
-                            variables[i] = ansattachments[i];
-                        }
-                        else
-                        {
-                            variables[i] = string.Empty; // or null, or any other default value
-                        }
-                    }
-
-                    // Now, you can access the values using the variables
-                    string att1 = variables[0], att2 = variables[1], att3 = variables[2], att4 = variables[3], att5 = variables[4];
-                    object response;
-                    if (isadmin)
-                    {
-                        response = new
-                        {
-                            SurveyQuestion = item.question,
-                            Answer = item.AnswerText,
-                            Category = item.Category,
-                            School = item.school,
-                            Location = item.Location,
-                            Region = item.Region,
-                            MC = item.MC,
-                            ResponseDate = item.ResponseDate.ToString(),
-                            Notes = item.Comment,
-                            Attachment1 = att1,
-                            Attachment2 = att2,
-                            Attachment3 = att3,
-                            Attachment4 = att4,
-                            Attachment5 = att5,
-                            User = item.EmployeeId,
-                            DeviceType = item.ClientDevice,
-                            Reference = item.responseId
-                        };
-                        // Add the attachment dictionary to the response object
-                        // response = new { response, Attachments = attachments };
-                    }
-                    else
-                    {
-                        response = new
-                        {
-                            SurveyQuestion = item.question,
-                            Answer = item.AnswerText,
-                            Category = item.Category,
-                            School = item.school,
-                            Location = item.Location,
-                            Region = item.Region,
-                            MC = item.MC,
-                            ResponseDate = item.ResponseDate.ToString(),
-                            Notes = item.Comment,
-                            Attachment1 = att1,
-                            Attachment2 = att2,
-                            Attachment3 = att3,
-                            Attachment4 = att4,
-                            Attachment5 = att5
-                        };
-
-                        // Add the attachment dictionary to the response object
-                        //  response = new { response, Attachments = attachments };
-                    }
-                    allresoponses.Add(response);
-                }
-                return allresoponses;
 
 
             }
@@ -814,6 +687,7 @@ namespace DamageAssesment.Api.Responses.Providers
             }
         }
 
+
         //Method to get Answers By Maintenance Center by surveyId
         private async Task<dynamic> getResultsByMaintenanceCenterAsync(int surveyId, int employeeid)
         {
@@ -828,8 +702,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
@@ -858,7 +732,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                        select new
                                        {
                                            g.Key.MaintenanceCenter,
-                                           Answers = new 
+                                           Answers = new
                                            {
                                                g.Key.AnswerText,
                                                Counter = g.Count()
@@ -895,12 +769,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)
                     {
@@ -908,10 +782,10 @@ 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();
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
                 var result = from r in surveyResonses
                              select new
@@ -924,7 +798,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = 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
 
@@ -939,6 +813,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                            }
                              };
                 return result;
+
             }
             catch (Exception ex)
             {
@@ -961,12 +836,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)
                     {
@@ -976,8 +851,8 @@ namespace DamageAssesment.Api.Responses.Providers
 
                 //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 result = from r in surveyResponses
                              select new
@@ -990,7 +865,7 @@ namespace DamageAssesment.Api.Responses.Providers
                                  r.KeyAnswerResult,
                                  r.Longitute,
                                  r.Latitude,
-                                 Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
+                                 Employee = 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
@@ -1020,12 +895,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);
@@ -1046,13 +921,14 @@ namespace DamageAssesment.Api.Responses.Providers
             }
         }
 
+
         public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.Request request)
         {
             try
             {
                 if (request != null)
                 {
-                    var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId, ClientDevice = request.ClientDevice, KeyAnswerResult = request.KeyAnswerResult, Latitude = Convert.ToDouble(request.Latitude), Longitute = Convert.ToDouble(request.Longitute), CreatedDate=DateTime.Now });
+                    var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId, ClientDevice = request.ClientDevice, KeyAnswerResult = request.KeyAnswerResult, Latitude = Convert.ToDouble(request.Latitude), Longitute = Convert.ToDouble(request.Longitute), CreatedDate = DateTime.Now });
                     if (response.IsSuccess)
                     {
                         var surveyResponse = response.SurveyResponse;

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

@@ -10,13 +10,11 @@ namespace DamageAssesment.Api.Responses.Services
         {
         }
 
-        public async Task<List<Question>> getQuestionsAsync(string language, string token)
+        public async Task<List<Question>> getQuestionsAsync()
         {
             try
             {
-                if (!string.IsNullOrEmpty(language))
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
-                    url = url + "/" + language;
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                 var questions = JsonConvert.DeserializeObject<List<Question>>(responseJsonString);
 
                 if (questions == null || !questions.Any())
@@ -29,37 +27,17 @@ namespace DamageAssesment.Api.Responses.Services
                 return new List<Question>();
             }
         }
-        public async Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language, string token)
-        {
-            try
-            {
-                url = urlBase + configuration.GetValue<string>("RessourceSettings:QuestionCategory");
 
-                if (!string.IsNullOrEmpty(language))
+        public async Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId)
-                    url = url + "/" + language;
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
-                var questions = JsonConvert.DeserializeObject<List<QuestionCategory>>(responseJsonString);
-
-                if (questions == null || !questions.Any())
-                    return new List<QuestionCategory>();
-                else return questions;
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError($"Exception Found : {ex.Message} - Ref: QuestionServiceProvider.GetQuestionCategoriesAsync()");
-                return new List<QuestionCategory>();
-            }
-        }
-        public async Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId, string token)
         {
             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())
-                    return new List<SurveyQuestions>();
+                    return new List<SurveyQuestions>() ;
                 else return questions;
             }
             catch (Exception ex)
@@ -70,12 +48,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

@@ -4,19 +4,19 @@ using Newtonsoft.Json;
 
 namespace DamageAssesment.Api.Responses.Services
 {
-    public class SurveyServiceProvider :ServiceProviderBase, ISurveyServiceProvider
+    public class SurveyServiceProvider : ServiceProviderBase, ISurveyServiceProvider
     {
         public SurveyServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Survey"), configuration.GetValue<string>("EndPointSettings:SurveyUrlBase"))
         {
         }
 
-        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,15 +30,15 @@ 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 )
+                if (survey == null)
                     return null;
                 else return survey;
             }

DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json

@@ -6,14 +6,7 @@
     }
   },
   "AllowedHosts": "*",
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
-  },
-  "ConnectionStrings": {
-    //"ResponsesConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "ResponsesConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
 
-  },
   //"EndPointSettings": {
   //  "AnswerUrlBase": "http://localhost:5200",
   //  "LocationUrlBase": "http://localhost:5213",
@@ -23,6 +16,7 @@
   //  "AttachmentUrlBase": "http://localhost:5243",
   //  "SurveyUrlBase": "http://localhost:5009"
   //},
+  //Endpoints for docker-container  
   "EndPointSettings": {
     "AnswerUrlBase": "http://damageassesment.api.answers:80",
     "LocationUrlBase": "http://damageassesment.api.locations:80",
@@ -37,7 +31,6 @@
     "EmployeeById": "/employees/{0}",
     "Question": "/questions",
     "QuestionById": "/questions/{0}",
-    "QuestionCategory": "/questions/categories",
     "SurveyQuestion": "/questions/bysurvey/{0}",
     "Survey": "/surveys",
     "SurveyById": "/surveys/{0}",
@@ -46,5 +39,10 @@
     "AnswerByResponse": "/answers/byresponse/{0}",
     "Location": "/locations",
     "Region": "/regions"
+  },
+  "ConnectionStrings": {
+    //"SurveyResponseConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
+    // "ResponsesConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;",
+    "ResponsesConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
   }
 }

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Migrations/20230817221348_InitialSurveyResponse.Designer.cs

@@ -0,0 +1,55 @@
+// <auto-generated />
+using DamageAssesment.Api.SurveyResponses.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.SurveyResponses.Migrations
+{
+    [DbContext(typeof(SurveyResponseDbContext))]
+    [Migration("20230817221348_InitialSurveyResponse")]
+    partial class InitialSurveyResponse
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("DamageAssesment.Api.SurveyResponses.Db.SurveyResponse", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("EmployeeId")
+                        .IsRequired()
+                        .HasMaxLength(6)
+                        .HasColumnType("nvarchar(6)");
+
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(4)
+                        .HasColumnType("nvarchar(4)");
+
+                    b.Property<int>("SurveyId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SurveyResponses");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Migrations/20230817221348_InitialSurveyResponse.cs

@@ -0,0 +1,36 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace DamageAssesment.Api.SurveyResponses.Migrations
+{
+    /// <inheritdoc />
+    public partial class InitialSurveyResponse : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "SurveyResponses",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    SurveyId = table.Column<int>(type: "int", nullable: false),
+                    LocationId = table.Column<string>(type: "nvarchar(4)", maxLength: 4, nullable: false),
+                    EmployeeId = table.Column<string>(type: "nvarchar(6)", maxLength: 6, nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_SurveyResponses", x => x.Id);
+                });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "SurveyResponses");
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.SurveyResponses/Migrations/SurveyResponseDbContextModelSnapshot.cs

@@ -0,0 +1,52 @@
+// <auto-generated />
+using DamageAssesment.Api.SurveyResponses.Db;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace DamageAssesment.Api.SurveyResponses.Migrations
+{
+    [DbContext(typeof(SurveyResponseDbContext))]
+    partial class SurveyResponseDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "7.0.9")
+                .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("DamageAssesment.Api.SurveyResponses.Db.SurveyResponse", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("EmployeeId")
+                        .IsRequired()
+                        .HasMaxLength(6)
+                        .HasColumnType("nvarchar(6)");
+
+                    b.Property<string>("LocationId")
+                        .IsRequired()
+                        .HasMaxLength(4)
+                        .HasColumnType("nvarchar(4)");
+
+                    b.Property<int>("SurveyId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("SurveyResponses");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

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]
@@ -33,7 +31,6 @@ namespace DamageAssesment.Api.Surveys.Controllers
         /// <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 +46,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 +59,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 +76,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/Db/Survey.cs

@@ -13,9 +13,9 @@ namespace DamageAssesment.Api.Surveys.Db
 
         public bool IsEnabled { get; set; }
 
-        public DateTime? StartDate { get; set; }
+        public DateTime StartDate { get; set; }
 
-        public DateTime? EndDate { get; set; }
+        public DateTime EndDate { get; set; }
 
         public DateTime CreatedDate { get; set; } = DateTime.Now;
         /*

DamageAssesmentApi/DamageAssesment.Api.Surveys/Models/Survey.cs

@@ -21,8 +21,8 @@ namespace DamageAssesment.Api.Surveys.Models
     {
         public int Id { get; set; }
         public bool IsEnabled { get; set; }
-        public DateTime? StartDate { get; set; }
+        public DateTime StartDate { get; set; }
-        public DateTime? EndDate { get; set; }
+        public DateTime EndDate { get; set; }
-        public DateTime? CreatedDate { get; set; }
+        public DateTime CreatedDate { get; set; }
     }
 }

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.UseSqlServer("SurveyConnection");

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

@@ -85,21 +85,14 @@ namespace DamageAssesment.Api.Surveys.Providers
             MultiLanguage = dict;
             return MultiLanguage;
         }
-        public string GetStatus(DateTime? StartDate,DateTime? EndDate)
+        public string GetStatus(DateTime StartDate,DateTime EndDate)
         {
-            try
+            if (StartDate > DateTime.Now)
-            {
+                return SurveyStatus.PENDING.ToString();
-                if (StartDate > DateTime.Now)
+            else if (StartDate <= DateTime.Now && EndDate > DateTime.Now)
-                    return SurveyStatus.PENDING.ToString();
+                return SurveyStatus.ACTIVE.ToString();
-                else if (StartDate <= DateTime.Now && EndDate > DateTime.Now)
+            else
-                    return SurveyStatus.ACTIVE.ToString();
-                else
-                    return SurveyStatus.INACTIVE.ToString();
-            }
-            catch
-            {
                 return SurveyStatus.INACTIVE.ToString();
-            }
         }
         // Method to get surveys asynchronously with multi-language support
         public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language)
@@ -110,6 +103,7 @@ namespace DamageAssesment.Api.Surveys.Providers
                 logger?.LogInformation("Get all Surveys from DB");
                 //checking is enabled in survey response 
                 var surveys = await surveyDbContext.Surveys.ToListAsync();//Where(s => s.IsEnabled == true)
+
                 if (surveys != null)
                 {
                     surveysList = from s in surveys
@@ -142,8 +136,7 @@ namespace DamageAssesment.Api.Surveys.Providers
             try
             {
                 logger?.LogInformation("Query Survey");
-                // removed is enabled becuase we are using it in responses to get response
+                var survey = await surveyDbContext.Surveys.SingleOrDefaultAsync(s => s.Id == id && s.IsEnabled == true);
-                var survey = await surveyDbContext.Surveys.SingleOrDefaultAsync(s => s.Id == id);
 
                 if (survey != null)
                 {
@@ -224,10 +217,12 @@ namespace DamageAssesment.Api.Surveys.Providers
                         _survey = mapper.Map<Models.Survey, Db.Survey>(survey);
                         surveyDbContext.Surveys.Update(_survey);
                         await surveyDbContext.SaveChangesAsync();
+
                         List<Db.SurveyTranslation> listSurveyTranslation = new List<Db.SurveyTranslation>();
+                        Random random = new Random();
                         foreach (var title in survey.Titles)
                         {
-                            listSurveyTranslation.Add(new Db.SurveyTranslation { SurveyId = _survey.Id, Language = title.Language, Title = title.Title });
+                            listSurveyTranslation.Add(new Db.SurveyTranslation { Id = random.Next(), SurveyId = _survey.Id, Language = title.Language, Title = title.Title });
                         }
                         surveyDbContext.SurveysTranslation.AddRange(listSurveyTranslation);
                         await surveyDbContext.SaveChangesAsync();

DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.json

@@ -11,7 +11,7 @@
   "AllowedHosts": "*",
   "ConnectionStrings": {
     //"SurveyConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "SurveyConnection": "Server=tcp:da-dev.database.windows.net,1433;Initial Catalog=da-dev-db;Encrypt=True;User ID=admin-dev;Password=b3tgRABw8LGE75k;TrustServerCertificate=False;Connection Timeout=30;"
+    //"SurveyConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;",
-
+    "SurveyConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
   }
 }

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,32 +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.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <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,39 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-
-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; }
-        private IConfiguration _Configuration { get; set; }
-        public UsersAccessDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("UsersAccessConnection"));
-        }
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            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/Dockerfile

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

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();
-        Task<Employee> getEmployeeAsync(int employeeId);
-    }
-}

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< Models.User> Users, string ErrorMessage)> GetUsersAsync();
-        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> GetUsersAsync(int Id);
-        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PostUserAsync(Models.User User);
-        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PutUserAsync(int Id,Models.User User);
-        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> DeleteUserAsync(int Id);
-        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/Interfaces/Interface.cs

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

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