Merged PR 62: Added new endpoint for creating multiple questions

Added new endpoint for creating multiple questions

.vs/VSWorkspaceState.json

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

DamageAssesmentApi/.gitignore

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

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/DamageAssesment.Api.Answers.csproj

@@ -13,12 +13,7 @@
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Answers.Db
 {
-    [Table("Answers")]
     public class Answer
     {
         [Key]

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

@@ -1,19 +1,13 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.Answers.Db
 {
     public class AnswerDbContext:DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public AnswerDbContext(DbContextOptions options,IConfiguration configuration):base(options) 
+
+        public AnswerDbContext(DbContextOptions options):base(options) 
         {
-            _Configuration= configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("AnswerConnection"));
+            
         }
         public DbSet<Db.Answer> Answers { get; set; }
         protected override void OnModelCreating(ModelBuilder modelBuilder)

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -1,83 +1,29 @@
 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);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
 
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    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);
-
-    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);
+    c.IncludeXmlComments(xmlPath);
 });
 builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AnswerDbContext>(option =>
 {
-    option.UseSqlServer("AnswerConnection");
+    option.UseInMemoryDatabase("Answers");
 });
 
 var app = builder.Build();
@@ -89,8 +35,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
-app.UseAuthentication();
+
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -198,12 +198,13 @@ namespace DamageAssesment.Api.Answers.Providers
         {
             if (!answerDbContext.Answers.Any())
             {
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
-                //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 });
+                // Uncomment the lines below to add more initial data if needed
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
                 answerDbContext.SaveChanges();
             }
         }

DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.json

@@ -8,10 +8,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "AnswerConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }

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

@@ -79,8 +79,8 @@ namespace DamageAssesment.Api.Attachments.Test
             var mockInputAttachment = await MockData.getInputAttachmentData();
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
 
-            var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await AttachmentProvider.UploadAttachmentAsync(AttachmentResponse);
+            var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);            
+            var result = (NoContentResult) await AttachmentProvider.UploadAttachmentAsync(AttachmentResponse);
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -95,8 +95,8 @@ namespace DamageAssesment.Api.Attachments.Test
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
-            AttachmentInfo attachmentInfo = new AttachmentInfo();
-            var result = (BadRequestObjectResult)await AttachmentProvider.UploadAttachmentAsync(attachmentInfo);
+            AttachmentInfo attachmentInfo=new AttachmentInfo();
+            var result = (BadRequestObjectResult) await AttachmentProvider.UploadAttachmentAsync(attachmentInfo);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -112,7 +112,7 @@ namespace DamageAssesment.Api.Attachments.Test
             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse);
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await AttachmentProvider.UpdateAttachmentAsync(AttachmentResponse);
+            var result = (NoContentResult) await AttachmentProvider.UpdateAttachmentAsync(AttachmentResponse);
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -128,7 +128,7 @@ namespace DamageAssesment.Api.Attachments.Test
 
             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object);
             AttachmentInfo attachmentInfo = new AttachmentInfo();
-            var result = (BadRequestObjectResult)await AttachmentProvider.UpdateAttachmentAsync(attachmentInfo);
+            var result = (BadRequestObjectResult) await AttachmentProvider.UpdateAttachmentAsync(attachmentInfo);
 
             Assert.Equal(400, result.StatusCode);
         }

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

@@ -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, IUploadService UploadService)
+        public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService uploadService)
         {
             this.AttachmentProvider = AttachmentsProvider;
-            this.UploadService = UploadService;
+            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 =  UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
+                    List<Models.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
                     var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments);
                     if (result.IsSuccess)
                     {
@@ -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 =  UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
+                        List<Models.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
                         var result = await this.AttachmentProvider.PutAttachmentAsync(attachments);
                         if (result.IsSuccess)
                         {
@@ -139,84 +136,8 @@ namespace DamageAssesment.Api.Attachments.Controllers
             }
         }
         /// <summary>
-        /// download an existing attachment.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpGet("attachments/download/{id}")]
-        public async Task<IActionResult> downloadfile(int id)
-        {
-            try
-            {
-                var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id);
-                if (!result.IsSuccess)
-                    return NotFound();
-                string path = await UploadService.GetFile(result.Attachment.URI);
-                if (path == null)
-                    return NotFound();
-                var contentType = GetContentType(result.Attachment.FileName);
-                if (contentType == "application/octet-stream")
-                    return PhysicalFile(path, contentType, result.Attachment.FileName);
-                return PhysicalFile(path, contentType, enableRangeProcessing: true);// result.Attachment.FileName);
-            }
-            catch (Exception ex)
-            {
-                // Handle the exception here or log it
-                return StatusCode(500, "An error occurred: " + ex.Message);
-            }
-            //try
-            //{
-            //    var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id);
-            //    if(!result.IsSuccess) 
-            //        return NotFound();
-            //    byte[] fileContent = await UploadService.DownloadFile(result.Attachment.URI);
-            //    if (fileContent == null || fileContent.Length == 0)
-            //        return NotFound();
-            //    var contentType = "application/octet-stream";
-            //    return File(fileContent, contentType, result.Attachment.FileName);
-            //}
-            //catch (Exception ex)
-            //{
-            //    // Handle the exception here or log it
-            //    return StatusCode(500, "An error occurred: " + ex.Message);
-            //}
-        }
-        private string GetContentType(string fileName)
-        {
-            // You can add more content types based on the file extensions
-            switch (Path.GetExtension(fileName).ToLower())
-            {
-                //case ".txt":
-                //    return "text/plain";
-                case ".jpg":
-                case ".jpeg":
-                    return "image/jpeg";
-                case ".png":
-                    return "image/png";
-                case ".gif":
-                    return "image/gif";
-                case ".bmp":
-                    return "image/bmp";
-                case ".webp":
-                    return "image/webp";
-                case ".csv":
-                    return "text/csv";
-                case ".pdf":
-                    return "application/pdf";
-                case ".docx":
-                case ".doc":
-                    return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-                case ".xlsx":
-                case ".xls":
-                    return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-                // Add more cases as needed
-                default:
-                    return "application/octet-stream";
-            }
-        }
-        /// <summary>
         /// Delete an existing attachment.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpDelete("attachments/{id}")]
         public async Task<IActionResult> DeleteAttachment(int id)
         {

DamageAssesmentApi/DamageAssesment.Api.Attachments/DMS_Attachments/Active/Response-1/Answer-1/Attachment_1.txt

@@ -0,0 +1 @@
+sample

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

@@ -14,19 +14,8 @@
     <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Attachments.Db
 {
-    [Table("AnswerAttachments")]
     public class Attachment
     {
         [Key]

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

@@ -1,19 +1,11 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
 
 namespace DamageAssesment.Api.Attachments.Db
 {
     public class AttachmentsDbContext:DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public AttachmentsDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
+        public AttachmentsDbContext(DbContextOptions options) : base(options)
         {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("AttachmentConnection"));
         }
         public DbSet<Db.Attachment> Attachments { get; set; }
         protected override void OnModelCreating(ModelBuilder modelBuilder)

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

@@ -9,7 +9,6 @@ namespace DamageAssesment.Api.Attachments.Interfaces
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments);
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments);
         Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> DeleteAttachmentAsync(int Id);
-        Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id);
         Task<(bool IsSuccess, int counter, string Path)> DeleteAttachmentsAsync(int responseId, int answerId);
         Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds);
         Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter();

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

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

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

@@ -7,8 +7,6 @@ namespace DamageAssesment.Api.Attachments.Interfaces
         List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
         List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
         public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
-        Task<byte[]> DownloadFile(string path);
-        Task<string> GetFile(string path);
         void Deletefile(string path);
         void Movefile(string path);
     }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -1,88 +1,33 @@
 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);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    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);
-
-    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);
+    c.IncludeXmlComments(xmlPath);
 });
-builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<AttachmentsDbContext>(option =>
 {
-    option.UseSqlServer("AttachmentConnection");
+    option.UseInMemoryDatabase("Attachments");
 });
 builder.Services.Configure<FormOptions>(o =>
 {
@@ -99,8 +44,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
-app.UseAuthentication();
+
 app.UseAuthorization();
 app.UseHttpsRedirection();
 

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

@@ -13,33 +13,25 @@ namespace DamageAssesment.Api.Attachments.Providers
         private AttachmentsDbContext AttachmentDbContext;
         private ILogger<AttachmentsProvider> logger;
         private IUploadService uploadservice;
-        private IMapper mapper; 
-        private readonly IHttpContextAccessor httpContextAccessor;
-        private string baseUrl;
-        public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
+        private IMapper mapper;
+
+        public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice)
         {
             this.AttachmentDbContext = AttachmentDbContext;
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-            this.httpContextAccessor = httpContextAccessor;
-            baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
-            baseUrl = baseUrl + "/attachments/download";
-           // SeedData();
+            SeedData();
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
         {
-            
+
             try
             {
                 logger?.LogInformation("Query Question");
                 var Attachment = await AttachmentDbContext.Attachments.AsNoTracking().Where(a => !a.IsDeleted).ToListAsync();
                 if (Attachment != null)
                 {
-                    foreach (var attachment in Attachment)
-                    {
-                        attachment.URI = $"{baseUrl}/{attachment.Id}";
-                    }
                     logger?.LogInformation($"{Attachment.Count} Attachments(s) found");
                     var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachment);
                     return (true, result, null);
@@ -62,7 +54,6 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachment != null)
                 {
                     logger?.LogInformation($"{Attachment} customer(s) found");
-                    Attachment.URI = $"{baseUrl}/{Attachment.Id}";
                     var result = mapper.Map<Db.Attachment, Models.Attachment>(Attachment);
                     return (true, result, null);
                 }
@@ -82,10 +73,6 @@ namespace DamageAssesment.Api.Attachments.Providers
                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
                 AttachmentDbContext.Attachments.AddRange(attachments);
                 await AttachmentDbContext.SaveChangesAsync();
-                foreach (var attachment in attachments)
-                {
-                    attachment.URI = $"{baseUrl}/{attachment.Id}";
-                }
                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
@@ -104,10 +91,6 @@ namespace DamageAssesment.Api.Attachments.Providers
                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
                 AttachmentDbContext.Attachments.UpdateRange(attachments);
                 await AttachmentDbContext.SaveChangesAsync();
-                foreach (var attachment in attachments)
-                {
-                    attachment.URI = $"{baseUrl}/{attachment.Id}";
-                }
                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
@@ -214,24 +197,6 @@ namespace DamageAssesment.Api.Attachments.Providers
         {
             return AttachmentDbContext.Attachments.AsNoTracking().Count(e => e.Id == id && !e.IsDeleted) > 0;
         }
-        public async Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id)
-        {
-            try
-            {
-                Db.Attachment Attachment = AttachmentDbContext.Attachments.Where(a => a.Id == Id).AsNoTracking().FirstOrDefault();
-                if (Attachment == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id}");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
 
         private void SeedData()
         {

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

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

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

@@ -24,41 +24,6 @@ namespace DamageAssesment.Api.Attachments.Providers
             uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
         }
-        public async Task<string> GetFile(string path)
-        {
-            try
-            {
-                if (System.IO.File.Exists(path))
-                {
-                    return path;
-                }
-
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-
-        }
-        public async Task<byte[]> DownloadFile(string path)
-        {
-            try
-            {
-                if (System.IO.File.Exists(path))
-                {
-                    return await System.IO.File.ReadAllBytesAsync(path);
-                }
-
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-        }
         public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
         {
             var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
@@ -124,7 +89,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                     {
                         counter++;
 
-                        var UserfileName = Path.GetFileName(file.FileName+ file.FileExtension);
+                        var UserfileName = Path.GetFileName(file.FileName);
                         var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
                         var dbPath = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
@@ -161,7 +126,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 foreach (var file in item.postedFiles)
                 {
                     Models.Attachment attachment= attachments.Where(a=>a.Id == file.AttachmentId).FirstOrDefault();
-                    var UserfileName = Path.GetFileName(file.FileName + file.FileExtension);
+                    var UserfileName = Path.GetFileName(file.FileName);
                     var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
                     var dbPath = Path.Combine(fullDirectoryPath, fileName);
                     File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));

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

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

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json

@@ -11,14 +11,6 @@
   "AllowedHosts": "*",
   "Fileupload": {
     "folderpath": "DMS_Attachments/Active",
-    "Deletepath": "DMS_Attachments/Deleted",
-    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
-    "BlobContainerName": "doculinks"
-  },
-  "ConnectionStrings": {
-    //"AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "AttachmentConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
+    "Deletepath": "DMS_Attachments/Deleted"
   }
 }
-  

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

@@ -44,10 +44,10 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponses();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", null)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en", null)).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms", "en", null);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms","en", null);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -97,7 +97,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.GetDocumentAsync(1, "forms", "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetDocumentAsync(1,"forms","en")).ReturnsAsync(mockResponse);
 
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1, "forms", "en");
@@ -154,9 +154,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputDocument = await MockData.getInputDocumentData();
             var DocumentResponse = await MockData.GetDocuLinksInfo(1);
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1, DocumentResponse);
+            var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1,DocumentResponse);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -168,9 +168,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputDocument = await MockData.getInputDocumentData();
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(99, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateDocumentAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99, null);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99,null);
             Assert.Equal(400, result.StatusCode);
         }
 
@@ -197,29 +197,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1);
             Assert.Equal(404, result.StatusCode);
         }
-        [Fact(DisplayName = "Update Document IsActive- Ok case")]
-        public async Task UpdateDocumentAsync_ShouldReturnStatusCode200()
-        {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
 
-            Assert.Equal(200, result.StatusCode);
-        }
-        [Fact(DisplayName = "Update Document IsActive - NotFound case")]
-        public async Task UpdateDocumentAsync_ShouldReturnStatusCode404()
-        {
-            var mockDocumentService = new Mock<IDoculinkProvider>();
-            var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getNotFoundResponse();
-            mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
-            Assert.Equal(404, result.StatusCode);
-        }
 
         // Link Type Test cases
 
@@ -257,7 +235,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1, "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1,"en")).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1, "en");
 
@@ -312,9 +290,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument);
+            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1,mockInputDocument);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -326,9 +304,9 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99, mockInputDocument);
+            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99,mockInputDocument);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -340,7 +318,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getBadRequestResponse();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument);
 

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

@@ -14,26 +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,
-                    description = "Sample" + i
+                    title = "tel"+i,
+                    description = "Sample"+i
                 });
                 List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
                 doclinksAttachments.Add(new DoculinkAttachments()
                 {
                     docName = "",Path="www.google.com",
-                    Language = "en",
-                    IsAttachments =false,CustomOrder=1
+                    IsAttachments=false,CustomOrder=1
                 });
                 list.Add(new DocuLinks.Models.ResDoculink()
                 {
@@ -41,10 +40,10 @@ namespace DamageAssesment.Api.DocuLinks.Test
                     Id = i,
                     linkTypeId = i,
                     IsActive = true,
-                    titles = dicttitle,
-                    description = dictdesc,
-                    CustomOrder = i,
-                    doclinksAttachments = doclinksAttachments
+                    titles= dicttitle,
+                    description=dictdesc,
+                    CustomOrder=i,
+                    doclinksAttachments= doclinksAttachments
                 });
             }
            // List<ResDoculinks> doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
@@ -75,7 +74,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
                     docName = "",
                     Path = "www.google.com",
                     IsAttachments = false,
-                    Language = "en",
                     CustomOrder = 1
                 });
                 list.Add(new DocuLinks.Models.ResDoculink()
@@ -122,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 });
-            return new ReqDoculink() { Id = id, linkTypeId = 1, CustomOrder = 1, Files = fileModels };
+            fileModels.Add( new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt",IsAttachments=true,CustomOrder=1 });
+            return new ReqDoculink() { Id=id, linkTypeId = 1, CustomOrder = 1, Files = fileModels };
         }
         public static async Task<DocuLinks.Models.Doculink> getInputDocumentData()
         {
@@ -133,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
@@ -148,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()
@@ -168,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, IUploadService uploadService)
+        public DoculinkController(IDoculinkProvider documentsProvider,IUploadService uploadService)
         {
 
             this.documentsProvider = documentsProvider;
-            this.uploadService = uploadService;
+            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,11 +38,10 @@ 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}")]
-        public async Task<IActionResult> GetLinkTypeAsync(int id, string? language)
+        public async Task<IActionResult> GetLinkTypeAsync(int id,string? language)
         {
             var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
             if (result.IsSuccess)
@@ -57,14 +53,13 @@ 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)
+        public async Task<IActionResult> UpdateLinkType(int id,Models.LinkType linkType)
         {
             if (linkType != null)
             {
-                var result = await this.documentsProvider.UpdateLinkTypeAsync(id, linkType);
+                var result = await this.documentsProvider.UpdateLinkTypeAsync(id,linkType);
                 if (result.IsSuccess)
                 {
                     return Ok(result.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,90 +104,14 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// download an existing attachment.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpGet("doculinks/download/{id}")]
-        public async Task<IActionResult> downloadfile(int id)
-        {
-            try
-            {
-                var result = await this.documentsProvider.GetDownloadAttachmentAsync(id);
-                if (!result.IsSuccess)
-                    return NotFound();
-                string path = await uploadService.GetFile(result.DoculinkAttachments.Path);
-                if (path == null)
-                    return NotFound();
-                var contentType = GetContentType(result.DoculinkAttachments.docName);
-                if (contentType == "application/octet-stream")
-                    return PhysicalFile(path, contentType, result.DoculinkAttachments.docName);
-                return PhysicalFile(path, contentType, enableRangeProcessing: true);
-            }
-            catch (Exception ex)
-            {
-                // Handle the exception here or log it
-                return StatusCode(500, "An error occurred: " + ex.Message);
-            }
-            //try
-            //{
-            //    var result = await this.documentsProvider.GetDownloadAttachmentAsync(id);
-            //    if (!result.IsSuccess)
-            //        return NotFound();
-            //    byte[] fileContent = await uploadService.DownloadFile(result.DoculinkAttachments.Path);
-            //    if (fileContent == null || fileContent.Length == 0)
-            //        return NotFound();
-            //    var contentType = "application/octet-stream";
-            //    return File(fileContent, contentType, result.DoculinkAttachments.docName);
-            //}
-            //catch (Exception ex)
-            //{
-            //    // Handle the exception here or log it
-            //    return StatusCode(500, "An error occurred: " + ex.Message);
-            //}
-        }
-        private string GetContentType(string fileName)
-        {
-            // You can add more content types based on the file extensions
-            switch (Path.GetExtension(fileName).ToLower())
-            {
-                //case ".txt":
-                //    return "text/plain";
-                case ".jpg":
-                case ".jpeg":
-                    return "image/jpeg";
-                case ".png":
-                    return "image/png";
-                case ".gif":
-                    return "image/gif";
-                case ".bmp":
-                    return "image/bmp";
-                case ".webp":
-                    return "image/webp";
-                case ".csv":
-                    return "text/csv";
-                case ".pdf":
-                    return "application/pdf";
-                case ".docx":
-                case ".doc":
-                    return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
-                case ".xlsx":
-                case ".xls":
-                    return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-                // Add more cases as needed
-                default:
-                    return "application/octet-stream";
-            }
-        }
-        /// <summary>
         /// Get all Doculink.
         /// </summary>
-        
-        [Authorize(Roles = "admin")]
+        /// 
         [Route("doculinks")]
         [Route("doculinks/{linktype:alpha}")]
         [Route("doculinks/{linktype:alpha}/{language:alpha}")]
         [HttpGet]
-        public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language, bool? isactive)
+        public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language,bool? isactive)
         {
             var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive);
             if (result.IsSuccess)
@@ -212,7 +129,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         [HttpGet]
         public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
         {
-            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, true);
+            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language,true);
             if (result.IsSuccess)
             {
                 return Ok(result.documents);
@@ -237,12 +154,11 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
         /// <summary>
         /// Get a Doculink by id.
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpGet]
         [Route("doculinks/{id}")]
         [Route("doculinks/{id}/{linktype:alpha}")]
         [Route("doculinks/{id}/{linktype:alpha}/{language:alpha}")]
-        public async Task<IActionResult> GetDocumentAsync(int id, string? linktype, string? language)
+        public async Task<IActionResult> GetDocumentAsync(int id,string? linktype, string? language)
         {
             var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
             if (result.IsSuccess)
@@ -254,10 +170,9 @@ 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)
+        public async Task<IActionResult> UpdateDocument(int id,ReqDoculink documentInfo)
         {
             if (documentInfo != null)
             {
@@ -265,7 +180,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 if (dbdoc.IsSuccess)
                 {
                     var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink = uploadService.UpdateDocuments(documents.counter, dbdoc.Document, documentInfo);
+                    Models.Doculink DocuLink= uploadService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
                     var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
                     if (result.IsSuccess)
                     {
@@ -278,23 +193,8 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return BadRequest(documentInfo);
         }
         /// <summary>
-        /// update existing doclink isactive field.
-        /// </summary>
-        [HttpPut]
-        [Route("doculinks/{id}/{isactive}")]
-        public async Task<IActionResult> UpdateIsActiveDocument(int id, bool isactive)
-        {
-            var result = await this.documentsProvider.UpdateDocumentAsync(id, isactive);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Document);
-            }
-            return NotFound();
-        }
-        /// <summary>
         /// Create new doclink.
         /// </summary>
-       // [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks")]
         public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo)
@@ -304,7 +204,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
                 if (documentInfo != null)
                 {
                     var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink = uploadService.UploadDocument(documents.counter, documentInfo);
+                    Models.Doculink DocuLink= uploadService.UploadDocument(documents.counter, documentInfo);
                     var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
                     if (result.IsSuccess)
                     {
@@ -322,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)
@@ -340,6 +239,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             }
             return NotFound();
         }
-
+        
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_1.txt

@@ -0,0 +1 @@
+sample

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_2.txt

@@ -0,0 +1 @@
+sample

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="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
     <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/Doculink.cs

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("Doculinks")]
     public class Doculink
     {
         [Key]

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("DoculinkAttachments")]
     public class DoculinkAttachments
     {
 
@@ -15,6 +14,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

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

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("DoculinkTrans")]
     public class DoculinkTranslation
     {
         [Key]

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

@@ -1,9 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("DoculinkTypes")]
     public class LinkType
     {
         [Key]

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DamageAssesment.Api.DocuLinks.Db
 {
-    [Table("DoculinkTypeTrans")]
     public class LinksTranslation
     {
         [Key]

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

@@ -11,9 +11,7 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
         Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document);
-        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, bool isactive);
         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
-        Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id);
         Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
 
 

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

@@ -7,8 +7,6 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
         Models.Doculink UploadDocument( int counter, ReqDoculink documentInfo);
         public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
         void Deletefile(string path);
-        Task<byte[]> DownloadFile(string path);
-        Task<string> GetFile(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

@@ -7,7 +7,6 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public int Id { get; set; }
         public int linkTypeId { get; set; }
         public List<DoculinkTranslation> documentsTranslations { get; set; }
-        public bool IsActive { get; set; }
         public int CustomOrder { get; set; }
         public List<FileModel>? Files { get; set; }
     }
@@ -19,6 +18,5 @@ namespace DamageAssesment.Api.DocuLinks.Models
         public int CustomOrder { get; set; }
         public string url { get;set; }
         public bool IsAttachments { get; set; }
-        public string Language { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -2,84 +2,30 @@ 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);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-// Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    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();
-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);
-
-    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);
+    c.IncludeXmlComments(xmlPath);
 });
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
 builder.Services.AddSwaggerGen();
-builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<DoculinkDbContext>(option =>
 {
-    option.UseSqlServer("DoculinkConnection");
+    option.UseInMemoryDatabase("DocumentConnection");
 });
 var app = builder.Build();
 
@@ -89,8 +35,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-app.UseCors("DamageAppCorsPolicy");
-app.UseAuthentication();
+
 app.UseAuthorization();
 
 app.MapControllers();

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

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

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

@@ -2,16 +2,13 @@
 using DamageAssesment.Api.DocuLinks.Db;
 using DamageAssesment.Api.DocuLinks.Interfaces;
 using DamageAssesment.Api.DocuLinks.Models;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.Eventing.Reader;
 using System.Reflection.Metadata;
-using System.Runtime.CompilerServices;
 using System.Xml;
 using System.Xml.Linq;
 
@@ -24,27 +21,20 @@ namespace DamageAssesment.Api.DocuLinks.Providers
         private DoculinkDbContext DocumentDbContext;
         private ILogger<DoculinkProvider> logger;
         private IUploadService uploadservice;
-        private IAzureBlobService azureBlobService;
         private IMapper mapper;
-        private readonly IHttpContextAccessor httpContextAccessor;
-        private string baseUrl;
 
-        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IAzureBlobService azureBlobService, IHttpContextAccessor httpContextAccessor)
+        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice)
         {
             this.DocumentDbContext = DocumentDbContext;
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-            this.httpContextAccessor = httpContextAccessor;
-            baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
-            baseUrl = baseUrl + "/doculinks/download";
-            this.azureBlobService = azureBlobService;
-            //SeedData();
+            SeedData();
         }
 
 
 
-        private async Task SeedDataAsync()
+        private void SeedData()
         {
             if (!DocumentDbContext.LinkTypes.Any())
             {
@@ -81,11 +71,11 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                     {
                         linkTypeId = 1;
 
-                        fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1, Language = "en"  };
+                        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,Language="en" };
-                    ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
+                        fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
+                    ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = linkTypeId, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
                     Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
                     DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
                     DocumentDbContext.SaveChanges();
@@ -180,42 +170,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             MultiLanguage = dicttitle;
             return MultiLanguage;
         }
-        private List<Models.DoculinkAttachments> GetDocumentAttachment(int id,string? language)
-        {
-            List<Db.DoculinkAttachments> doculinkAttachments = null;
-            if (string.IsNullOrEmpty(language))
-            {
-                doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList();
-            }
-            else
-            {
-                doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList();
-            }
-            foreach (var attachment in doculinkAttachments)
-            {
-                if (attachment.IsAttachments)
-                    attachment.Path = $"{baseUrl}/{attachment.Id}";
-            }
-            return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(doculinkAttachments);
-        }
-        public async Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id)
-        {
-            try
-            {
-                Db.DoculinkAttachments Attachment = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.Id == id).AsNoTracking().FirstOrDefault();
-                if (Attachment == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                return (true, mapper.Map<Db.DoculinkAttachments, Models.DoculinkAttachments>(Attachment), $"Attachment {id}");
-            }
-            catch (Exception ex)
-            {
 
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
         public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
         {
 
@@ -237,7 +192,8 @@ 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);
@@ -272,7 +228,8 @@ 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);
@@ -327,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");
@@ -359,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");
@@ -390,7 +349,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, ""));
                 result.titles = multilan.titles;
                 result.description = multilan.description;
-                result.doclinksAttachments = GetDocumentAttachment(document.Id,"");
+                result.doclinksAttachments = Document.doclinksAttachments;
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -432,7 +391,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, ""));
                         result.titles = multilan.titles;
                         result.description = multilan.description;
-                        result.doclinksAttachments = GetDocumentAttachment(document.Id, "");
+                        result.doclinksAttachments = Document.doclinksAttachments;
                         return (true, result, "Successful");
                     }
                     else
@@ -455,35 +414,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id,bool isactive)
-        {
-
-            try
-            {
-                Db.Doculink Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
-                if (Document == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                Document.IsActive = isactive;
-                DocumentDbContext.Documents.Update(Document);
-                DocumentDbContext.SaveChanges();
-                var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document);
-                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(Document.Id, ""));
-                result.titles = multilan.titles;
-                result.description = multilan.description;
-                result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, ""));
-                result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                    DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
-                return (true, result, $"DocumentId {id} deleted Successfuly");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
         public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id)
         {
 

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

@@ -25,41 +25,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
             uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
         }
-        public async Task<string> GetFile(string path)
-        {
-            try
-            {
-                if (System.IO.File.Exists(path))
-                {
-                    return path;
-                }
-
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-
-        }
-        public async Task<byte[]> DownloadFile(string path)
-        {
-            try
-            {
-                if (System.IO.File.Exists(path))
-                {
-                    return await System.IO.File.ReadAllBytesAsync(path);
-                }
-
-                return null; // File not found
-            }
-            catch (Exception ex)
-            {
-                // Handle or log the exception as needed
-                throw;
-            }
-        }
 
         public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
         {
@@ -79,20 +44,19 @@ namespace DamageAssesment.Api.DocuLinks.Providers
                         counter++;
                         if (item.IsAttachments)
                         {
-                            UserfileName = Path.GetFileName(item.FileName + item.FileExtension);
+                            UserfileName = Path.GetFileName(item.FileName);
                             var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
                             path = Path.Combine(fullDirectoryPath, fileName);
                             File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
                         }
                         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 (){ linkTypeId = documentInfo.linkTypeId,
                     documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
-                    IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =documentInfo.IsActive
-                };
+                    IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true};
             
                 return Documents;
             }
@@ -116,27 +80,26 @@ namespace DamageAssesment.Api.DocuLinks.Providers
 
                 string path = "", UserfileName = "";
                 List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
-                int counter1 = 1;
                 foreach (var item in documentInfo.Files)
                 {
+                    counter++;
                     if (item.IsAttachments)
                     {
-                        UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
-                        var fileName = String.Format("Document_{0}{1}", counter1, item.FileExtension);
+                        UserfileName = Path.GetFileName(item.FileName);
+                        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,
-                    IsActive = documentInfo.IsActive,
+                    IsActive = true,
                     IsDeleted=false,
                     CustomOrder = documentInfo.CustomOrder,
                     doclinksAttachments = attachments

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

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

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json

@@ -1,7 +1,4 @@
 {
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
-  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
@@ -9,15 +6,8 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"DoculinkConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "DoculinkConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  },
   "Fileupload": {
     "folderpath": "DASA_Documents/Active",
-    "Deletepath": "DASA_Documents/Deleted",
-    "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net",
-    "BlobContainerName": "doculinks"
+    "Deletepath": "DASA_Documents/Deleted"
   }
 }

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/DamageAssesment.Api.Employees.csproj

@@ -12,18 +12,8 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>

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

@@ -1,9 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Employees.Db
 {
-    [Table("Employees")]
     public class Employee
     {
         [Key]

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

@@ -4,23 +4,18 @@ namespace DamageAssesment.Api.Employees.Db
 {
     public class EmployeeDbContext: DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public EmployeeDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
+        public DbSet<Db.Employee> Employees { get; set; }
+        public EmployeeDbContext(DbContextOptions options) : base(options)
         {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("EmployeeConnection"));
         }
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             base.OnModelCreating(modelBuilder);
+
             modelBuilder.Entity<Employee>()
                 .Property(item => item.Id)
                 .ValueGeneratedOnAdd();
         }
-        public DbSet<Db.Employee> Employees { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -1,84 +1,30 @@
 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);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-// Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    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);
-
-    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);
+    c.IncludeXmlComments(xmlPath);
 });
 
 builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<EmployeeDbContext>(option =>
 {
-    option.UseSqlServer("EmployeeConnection");
+    option.UseInMemoryDatabase("Employees");
 });
 
 var app = builder.Build();
@@ -96,8 +42,7 @@ if (app.Environment.IsDevelopment())
         employeesProvider.SeedData();
     }
 }
-app.UseCors("DamageAppCorsPolicy");
-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, mapper.Map<Db.Employee, Models.Employee>(_employee), null);
+                    return (true, Employee, null);
                 }
                 return (false, null, "Employee code is already exits");
             }

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

@@ -9,9 +9,9 @@
     }
   },
   "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "EmployeeConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
+  "settings": {
+    "endpoint1": "xxx",
+    "endpoint2": "xxx",
+    "endpoint3": "xxx"
   }
 }

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

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

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

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

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

@@ -11,17 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Locations.Db
 {
-    [Table("Locations")]
     public class Location
     {
         [Key]
@@ -21,6 +20,10 @@ namespace DamageAssesment.Api.Locations.Db
 
         [StringLength(2)]
         public string SchoolType { get; set; }
+        public int? DataValue { get; set; }
+        public int? Enrollment { get; set; }
+        public double? Longitute { get; set; }
+        public double? Latitude { get; set; }
 
     }
 }

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

@@ -4,16 +4,6 @@ namespace DamageAssesment.Api.Locations.Db
 {
     public class LocationDbContext : DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public LocationDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("LocationConnection"));
-        }
         public DbSet<Db.Location> Locations { get; set; }
         public DbSet<Db.Region> Regions { get; set; }
         public LocationDbContext(DbContextOptions options) : base(options)

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

@@ -1,9 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Locations.Db
 {
-    [Table("Regions")]
     public class Region
     {
         [Key]

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

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

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -1,88 +1,32 @@
 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);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-// Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
 
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    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);
-
-    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);
+    c.IncludeXmlComments(xmlPath);
 });
 builder.Services.AddScoped<ILocationsProvider, LocationsProvider>();
 builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
 builder.Services.AddDbContext<LocationDbContext>(option =>
 {
-    option.UseSqlServer("LocationConnection");
+    option.UseInMemoryDatabase("Locations");
 });
-
-
 var app = builder.Build();
-// Add services to the container.
 
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
@@ -99,8 +43,7 @@ if (app.Environment.IsDevelopment())
         regionProvider.SeedData();
     }
 }
-app.UseCors("DamageAppCorsPolicy");
-app.UseAuthentication();
+
 app.UseAuthorization();
 
 app.MapControllers();

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

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

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

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

DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.json

@@ -8,10 +8,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "LocationConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }

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

@@ -1,6 +1,4 @@
 using DamageAssesment.Api.Questions.Interfaces;
-using DamageAssesment.Api.Questions.Models;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
@@ -12,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]
@@ -36,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]
@@ -55,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]
@@ -72,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)
         {
@@ -93,7 +91,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// POST request for creating a multiple question (multilingual).
         /// </summary>
-        [Authorize(Roles = "admin")]
         [HttpPost("questions/multiple")]
         public async Task<IActionResult> CreateQuestions(List<Models.Question> questions)
         {
@@ -109,33 +106,12 @@ namespace DamageAssesment.Api.Questions.Controllers
 
                 return BadRequest(result.ErrorMessage);
             }
-            return CreatedAtRoute("DefaultApi", questions);
-        }
-        /// <summary>
-        /// PUT request for update a multiple question (multilingual) for survey.
-        /// </summary>
-        [HttpPut("questions/multiple/{surveyid}")]
-        public async Task<IActionResult> CreateQuestions(int surveyid, List<Models.Question> questions)
-        {
-            if (questions != null)
-            {
-                var result = await this.questionsProvider.PutQuestionsAsync(surveyid,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);
+            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)
         {
@@ -154,7 +130,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question based on ID.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpDelete("questions/{id}")]
         public async Task<IActionResult> DeleteQuestion(int id)
         {
@@ -170,7 +145,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving question categories.
         /// </summary>
 
-        [Authorize(Roles = "admin,user,report")]
         [HttpGet("questions/categories")]
         [HttpGet("questions/categories/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoriesAsync(string? language)
@@ -185,7 +159,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// GET request for retrieving a question category by ID.
         /// </summary>
-        [Authorize(Roles = "admin,report")]
+
         [HttpGet("questions/categories/{id:int}")]
         [HttpGet("questions/categories/{id:int}/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language)
@@ -202,7 +176,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// PUT request for updating a question category.
         /// </summary>
-        [Authorize(Roles = "admin,survey,report")]
+
         [HttpPut("questions/categories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
@@ -224,7 +198,6 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question category.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
         [HttpPost("questions/categories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
@@ -243,7 +216,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/DamageAssesment.Api.Questions.csproj

@@ -11,17 +11,6 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("QuestionCategoryTrans")]
     public class CategoryTranslation
     {
         [Key]

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("Questions")]
     public class Question
     {
         [Key]

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

@@ -1,10 +1,8 @@
 using System.Buffers.Text;
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("QuestionCategories")]
     public class QuestionCategory
     {
         [Key]

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

@@ -6,16 +6,6 @@ namespace DamageAssesment.Api.Questions.Db
 {
     public class QuestionDbContext : DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public QuestionDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("QuestionConnection"));
-        }
         public DbSet<Db.Question> Questions { get; set; }
         public DbSet<Db.QuestionType> QuestionTypes { get; set; }
         public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; }

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

@@ -1,9 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("QuestionTypes")]
     public class QuestionType
     {
         [Key]

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
-    [Table("QuestionTrans")]
     public class QuestionsTranslation
     {
         [Key]

DamageAssesmentApi/DamageAssesment.Api.Questions/Interfaces/IQuestionsProvider.cs

@@ -9,7 +9,6 @@ namespace DamageAssesment.Api.Questions.Interfaces
         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, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId,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/Models/SurveyQuestion.cs

@@ -5,7 +5,6 @@
         public int CategoryId { get; set; }
         public string IconName { get; set; }
         public string IconLibrary { get; set; }
-        public object CategoryNames { get; set; }
         public List<MultiLanguage> QuestionsText { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

@@ -1,36 +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);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
-    build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
-}));
-// Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    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();
@@ -42,44 +17,16 @@ 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);
-
-    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);
+    c.IncludeXmlComments(xmlPath);
 });
-
 builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
-    option.UseSqlServer("QuestionConnection");
+    option.UseInMemoryDatabase("Questions");
 });
 var app = builder.Build();
 
@@ -96,8 +43,7 @@ if (app.Environment.IsDevelopment())
         questionProvider.SeedData();
     }
 }
-app.UseCors("DamageAppCorsPolicy");
-app.UseAuthentication();
+
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -31,7 +31,8 @@ namespace DamageAssesment.Api.Questions.Providers
                 questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" });
                 questionDbContext.SaveChanges();
             }
-            if (!questionDbContext.QuestionsTranslations.Any())
+
+            if (!questionDbContext.QuestionCategories.Any())
             {
                 questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" });
                 questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
@@ -64,51 +65,14 @@ namespace DamageAssesment.Api.Questions.Providers
             if (!questionDbContext.Questions.Any())
             {
                 var question1 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
-                var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
+                var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
                 var question3 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
-                var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
-                var question5 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
-                var question6 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
-                var question7 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 3};
-                var question8 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 };
-                var question9 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = true, Key = true, CategoryId = 5 };
-                var question10 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = false, Key = true, CategoryId = 1 };
-                var question11 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 2 };
-                var question12 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 };
-                var question13 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 4 };
-                var question14 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 5 };
-                var question15 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 };
-                var question16 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 2 };
-                var question17 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 3 };
-                var question18 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 };
-                var question19 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 5 };
-                var question20 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
-                var question21 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 2 };
-                var question22 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 };
+                var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
 
                 questionDbContext.Questions.Add(question1);
                 questionDbContext.Questions.Add(question2);
                 questionDbContext.Questions.Add(question3);
                 questionDbContext.Questions.Add(question4);
-                questionDbContext.Questions.Add(question5);
-                questionDbContext.Questions.Add(question6);
-                questionDbContext.Questions.Add(question7);
-                questionDbContext.Questions.Add(question8);
-                questionDbContext.Questions.Add(question9);
-                questionDbContext.Questions.Add(question10);
-                questionDbContext.Questions.Add(question11);
-                questionDbContext.Questions.Add(question12);
-                questionDbContext.Questions.Add(question13);
-                questionDbContext.Questions.Add(question14);
-                questionDbContext.Questions.Add(question15);
-                questionDbContext.Questions.Add(question16);
-                questionDbContext.Questions.Add(question17);
-                questionDbContext.Questions.Add(question18);
-                questionDbContext.Questions.Add(question19);
-                questionDbContext.Questions.Add(question20);
-                questionDbContext.Questions.Add(question21);
-                questionDbContext.Questions.Add(question22);
-
                 questionDbContext.SaveChanges();
             }
 
@@ -126,64 +90,6 @@ namespace DamageAssesment.Api.Questions.Providers
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Are the grounds flooded ?", Language = "en" });
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
-
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Can you open?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Is debris blocking access?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Are the grounds flooded?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "Is the access blocked by flooding?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Are any utility wires down?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Do you have damage to windows, doors, or walls?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Do you have roof damage?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Do you have major water intrusion?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Are any portable classrooms damaged and unusable?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Does your facility need to be secured/boarded?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Are you without commercial power?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Are you without water pressure?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Are you without telephones?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Are traffic signals damaged/missing?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "Are you without an operable fire alarm?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "Are you without an operable public address?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Do you have major debris?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Are there any problems or issues not addressed above that would impede you from opening? If yes, please explain below?", Language = "en" });
-
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Pouvez-vous ouvrir ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Est-ce que des débris bloquent l'accès ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "L'accès est-il bloqué par des inondations ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Des câbles d'utilité sont-ils tombés ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Avez-vous des dommages aux fenêtres, portes ou murs ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Avez-vous des dommages au toit ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Avez-vous une intrusion d'eau majeure ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Les salles de classe portables sont-elles endommagées et inutilisables ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Votre établissement a-t-il besoin d'être sécurisé/protégé ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Êtes-vous sans alimentation électrique commerciale ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Êtes-vous sans pression d'eau ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Êtes-vous sans téléphones ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Les feux de circulation sont-ils endommagés/absents ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "N'avez-vous pas d'alarme incendie fonctionnelle ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "N'avez-vous pas de système de sonorisation opérationnel ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Avez-vous une grande quantité de débris ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Y a-t-il des problèmes ou des problèmes non abordés ci-dessus qui vous empêcheraient d'ouvrir ? Si oui, veuillez expliquer ci-dessous.", Language = "fr" });
-
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "¿Puedes abrir ?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "¿Los escombros bloquean el acceso?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "¿Hay cables de utilidad caídos?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "¿Tienes daños en ventanas, puertas o paredes?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "¿Tienes daños en el techo?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "¿Tienes una gran intrusión de agua?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "¿Hay aulas portátiles dañadas e inutilizables?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "¿Tu instalación necesita ser asegurada/tabicada?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "¿No tienes energía comercial?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "¿No tienes presión de agua?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "¿No tienes teléfonos?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "¿Los semáforos están dañados/faltan?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "¿No tienes una alarma de incendios operativa?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "¿No tienes un sistema de megafonía operativo?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "¿Tienes una gran cantidad de escombros?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "¿Hay algún problema o asunto no abordado anteriormente que le impida abrir? Si es así, por favor explíquelo a continuación.", Language = "es" });
-
                 questionDbContext.SaveChanges();
             }
         }
@@ -313,7 +219,6 @@ namespace DamageAssesment.Api.Questions.Providers
                             CategoryId = item.Id,
                             IconLibrary = item.IconLibrary,
                             IconName = item.IconName,
-                            CategoryNames= CreateCategoryMultiLanguageObject(GetCategoryTranslations(item.Id, language)),
                             QuestionsText = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanguage>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language)
                         });
                     }
@@ -349,7 +254,6 @@ namespace DamageAssesment.Api.Questions.Providers
             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();
@@ -363,7 +267,7 @@ namespace DamageAssesment.Api.Questions.Providers
             try
             {
                 List<Models.MultiLanguage> results = new List<MultiLanguage>();
-                logger?.LogInformation("Query Question");
+               logger?.LogInformation("Query Question");
                 foreach (Models.Question Question in Questions)
                 {
                     results.Add(InsertQuestion(Question));
@@ -376,36 +280,6 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-      
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId, List<Models.Question> Questions)
-        {
-            try
-            {
-                var questions=await questionDbContext.Questions.AsNoTracking().Where(a=>a.SurveyId == surveyId).ToListAsync();
-                if (questions != null)
-                {
-                    List<int> questionids=questions.Select(a=>a.Id).ToList();
-                    var questiontrans = await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x => questionids.Contains(x.QuestionId)).ToListAsync();
-                    if (questiontrans != null)
-                        questionDbContext.QuestionsTranslations.RemoveRange(questiontrans);
-                    questionDbContext.Questions.RemoveRange(questions);
-                    questionDbContext.SaveChanges();
-                }
-                List<Models.MultiLanguage> results = new List<MultiLanguage>();
-                logger?.LogInformation("Query Question");
-                foreach (Models.Question Question in Questions)
-                {
-                    Question.SurveyId = surveyId;
-                    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
@@ -439,11 +313,8 @@ namespace DamageAssesment.Api.Questions.Providers
 
                 if (question != null)
                 {
-                    var questiontrans=await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x=>x.QuestionId== id).ToListAsync();
                     var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);
                     result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
-                    if(questiontrans!=null)
-                        questionDbContext.QuestionsTranslations.RemoveRange(questiontrans);
                     questionDbContext.Questions.Remove(question);
                     questionDbContext.SaveChanges();
                     return (true, result, $"QuestionID {id} deleted Successfuly");

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

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

DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json

@@ -8,10 +8,5 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
-  "ConnectionStrings": {
-    //"QuestionConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
-    "QuestionConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
-
-  }
+  "AllowedHosts": "*"
 }

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

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

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

@@ -86,9 +86,8 @@ namespace DamageAssesment.Api.Questions.Test
             List<Models.Question> Questions = new List<Models.Question>();
             QuestionsTranslations.Add(QuestionsTranslation);
             Questions.Models.Question question = new Questions.Models.Question() { Id = 1, Questions = QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
-            Questions.Add(question);
+              Questions.Add(question);
             return Questions;
         }
-
     }
 }

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

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

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

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

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

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

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

@@ -11,21 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="ClosedXML" Version="0.102.1" />
-    <PackageReference Include="EPPlus" Version="6.2.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.9" />
+    <PackageReference Include="EPPlus" Version="7.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />

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

@@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Responses.Db
 {
-    [Table("SurveyResponses")]
     public class SurveyResponse
     {
         [Key]

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

@@ -4,18 +4,13 @@ namespace DamageAssesment.Api.Responses.Db
 {
     public class SurveyResponseDbContext:DbContext
     {
-        private IConfiguration _Configuration { get; set; }
-        public SurveyResponseDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
-        {
-            _Configuration = configuration;
-        }
-        protected override void OnConfiguring(DbContextOptionsBuilder options)
-        {
-            // connect to sql server with connection string from app settings
-            options.UseSqlServer(_Configuration.GetConnectionString("ResponsesConnection"));
-        }
         public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }
 
+        public SurveyResponseDbContext(DbContextOptions options) : base(options)
+        {
+
+        }
+
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             base.OnModelCreating(modelBuilder);

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<Models.Answer>> GetAnswersByResponseIdAsync(int responseId, string token);
+        Task<List<Answer>> getAnswersAsync();
+        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<IEnumerable<Attachment>> PostAttachmentsAsync(Models.AttachmentInfo attachmentInfo, string token);
+        Task<List<Attachment>> getAttachmentsAsync();
+        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<Employee> getEmployeeAsync(int employeeId, string token);
+        Task<List<Employee>> getEmployeesAsync();
+        Task<Employee> getEmployeeAsync(int employeeId);
     }
-}
+}

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

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

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

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

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

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

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

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

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

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

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

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