Group by issue in responses

Tests should be grouped so that they can create, update, then eventually delete the data.
All the Gets are grouped together, but then later on you may need them to preform the CRUD operations.

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,8 +16,8 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers
         /// </summary>
-        [Authorize(Roles = "admin")]
+        
-        [HttpGet("Answers")]
+        [HttpGet("answers")]
         public async Task<ActionResult> GetAnswersAsync() {
         
             var result = await answerProvider.GetAnswersAsync();
@@ -31,12 +32,12 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// Get an answer based on answerId.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
+
-        [HttpGet("Answers/{Id}")]
+        [HttpGet("answers/{id}")]
-        public async Task<ActionResult> GetAnswerByIdAsync(int Id)
+        public async Task<ActionResult> GetAnswerByIdAsync(int id)
         {
 
-            var result = await answerProvider.GetAnswerByIdAsync(Id);
+            var result = await answerProvider.GetAnswerByIdAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Answer);
@@ -47,8 +48,7 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers based on responseId.
         /// </summary>
-        [Authorize(Roles = "admin")]
+        [HttpGet("answers/byresponse/{responseid}")]
-        [HttpGet("Answers/ByResponse/{responseid}")]
         public async Task<IActionResult> GetAnswersByResponseId(int responseid)
         {
             var result = await this.answerProvider.GetAnswersAsync(responseid);
@@ -61,8 +61,8 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Get all answers based on questionId.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpGet("Answers/ByQuestion/{questionid}")]
+        [HttpGet("answers/byquestion/{questionid}")]
         public async Task<IActionResult> AnswersByQuestionId(int questionid)
         {
             var result = await this.answerProvider.GetAnswersByQuestionAsync(questionid);
@@ -75,8 +75,8 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Update an existing answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpPut("Answers")]
+        [HttpPut("answers")]
         public async Task<IActionResult> UpdateAnswer(Models.Answer answer)
         {
             if (answer != null)
@@ -96,8 +96,8 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         /// Save a new answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpPost("Answers")]
+        [HttpPost("answers")]
         public async Task<IActionResult> CreateAnswer(Models.Answer answer)
         {
             if (answer != null)
@@ -114,8 +114,8 @@ namespace DamageAssesment.Api.Answers.Controllers
         /// <summary>
         ///  Delete an existing answer.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpDelete("Answers/{id}")]
+        [HttpDelete("answers/{id}")]
         public async Task<IActionResult> DeleteAnswer(int id)
         {
             var result = await this.answerProvider.DeleteAnswerAsync(id);

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

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

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

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

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

@@ -8,19 +8,20 @@ namespace DamageAssesment.Api.Answers.Providers
 {
     public class AnswersProvider : IAnswersProvider
     {
-
         private AnswerDbContext answerDbContext;
         private ILogger<AnswersProvider> logger;
         private IMapper mapper;
 
+        // Constructor with dependency injection and data seeding
         public AnswersProvider(AnswerDbContext answerDbContext, ILogger<AnswersProvider> logger, IMapper mapper)
         {
             this.answerDbContext = answerDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            //SeedData();
+            SeedData(); // Seed initial data if the table is empty
         }
 
+        // Get all answers
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync()
         {
             try
@@ -40,9 +41,9 @@ namespace DamageAssesment.Api.Answers.Providers
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
-
         }
 
+        // Get an answer by its ID
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> GetAnswerByIdAsync(int Id)
         {
             try
@@ -63,6 +64,8 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
+
+        // Get answers by survey response ID
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync(int surveyResponseId)
         {
             try
@@ -74,17 +77,17 @@ namespace DamageAssesment.Api.Answers.Providers
                 {
                     var result = mapper.Map<IEnumerable<Db.Answer>, IEnumerable<Models.Answer>>(respAnswers);
                     return (true, result, null);
-
                 }
                 return (false, null, "Not Found");
             }
             catch (Exception ex)
             {
-
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
         }
+
+        // Get answers by question ID
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersByQuestionAsync(int questionId)
         {
             try
@@ -96,17 +99,17 @@ namespace DamageAssesment.Api.Answers.Providers
                 {
                     var result = mapper.Map<IEnumerable<Db.Answer>, IEnumerable<Models.Answer>>(respAnswers);
                     return (true, result, null);
-
                 }
                 return (false, null, "Not Found");
             }
             catch (Exception ex)
             {
-
                 logger?.LogError(ex.ToString());
                 return (false, null, ex.Message);
             }
         }
+
+        // Create a new answer
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer)
         {
             try
@@ -120,7 +123,7 @@ namespace DamageAssesment.Api.Answers.Providers
                     var result = mapper.Map<Db.Answer, Models.Answer>(answer);
                     return (true, result, null);
                 }
-                return (false, null, "Answer is already exits");
+                return (false, null, "Answer is already exists");
             }
             catch (Exception ex)
             {
@@ -128,6 +131,8 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
+
+        // Update an existing answer
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer)
         {
             try
@@ -156,14 +161,14 @@ namespace DamageAssesment.Api.Answers.Providers
             }
             catch (Exception ex)
             {
-
                 logger?.LogError(ex.ToString());
-                return (false,null, ex.Message);
+                return (false, null, ex.Message);
             }
         }
+
+        // Delete an answer by its ID
         public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> DeleteAnswerAsync(int Id)
         {
-
             try
             {
                 Db.Answer answer = answerDbContext.Answers.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
@@ -173,30 +178,33 @@ namespace DamageAssesment.Api.Answers.Providers
                 }
                 answerDbContext.Answers.Remove(answer);
                 answerDbContext.SaveChanges();
-                return (true, mapper.Map<Db.Answer, Models.Answer>(answer), $"AnswerId {Id} deleted Successfuly");
+                return (true, mapper.Map<Db.Answer, Models.Answer>(answer), $"AnswerId {Id} deleted successfully");
             }
             catch (Exception ex)
             {
-
                 logger?.LogError(ex.ToString());
-                return (false,null, ex.Message);
+                return (false, null, ex.Message);
             }
         }
+
+        // Check if an answer with a specific ID exists
         private bool AnswerExists(int id)
         {
             return answerDbContext.Answers.AsNoTracking().Count(e => e.Id == id) > 0;
         }
 
+        // Seed initial data if the table is empty
         public void SeedData()
         {
             if (!answerDbContext.Answers.Any())
             {
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
+                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 = "Yes", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
+                answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
+                // Uncomment the lines below to add more initial data if needed
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
-                answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
+                //answerDbContext.Answers.Add(new Db.Answer() { 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.Development.json

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

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

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

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

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

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

@@ -9,6 +9,7 @@ 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/IUploadService.cs

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

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

@@ -13,25 +13,33 @@ namespace DamageAssesment.Api.Attachments.Providers
         private AttachmentsDbContext AttachmentDbContext;
         private ILogger<AttachmentsProvider> logger;
         private IUploadService uploadservice;
-        private IMapper mapper;
+        private IMapper mapper; 
-
+        private readonly IHttpContextAccessor httpContextAccessor;
-        public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice)
+        private string baseUrl;
+        public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
         {
             this.AttachmentDbContext = AttachmentDbContext;
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-           // SeedData();
+            this.httpContextAccessor = httpContextAccessor;
+            baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
+            baseUrl = baseUrl + "/attachments/download";
+            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);
@@ -54,6 +62,7 @@ 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);
                 }
@@ -73,6 +82,10 @@ 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);
             }
@@ -91,6 +104,10 @@ 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);
             }
@@ -197,6 +214,24 @@ 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/UploadService.cs

@@ -24,6 +24,41 @@ 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);
@@ -89,7 +124,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                     {
                         counter++;
 
-                        var UserfileName = Path.GetFileName(file.FileName);
+                        var UserfileName = Path.GetFileName(file.FileName+ file.FileExtension);
                         var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
                         var dbPath = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
@@ -126,7 +161,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);
+                    var UserfileName = Path.GetFileName(file.FileName + file.FileExtension);
                     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

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

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

@@ -10,21 +10,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Include="Moq" Version="4.18.4" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DamageAssesment.Api.UsersAccess\DamageAssesment.Api.UsersAccess.csproj" />
+    <ProjectReference Include="..\DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DamageAssesment.Api.Documents\DamageAssesment.Api.DocuLinks.csproj" />
+    <ProjectReference Include="..\DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj" />
   </ItemGroup>
 
 </Project>

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

@@ -1,11 +1,11 @@
-using DamageAssesment.Api.Documents.Controllers;
+using DamageAssesment.Api.DocuLinks.Controllers;
-using DamageAssesment.Api.Documents.Interfaces;
+using DamageAssesment.Api.DocuLinks.Interfaces;
-using DamageAssesment.Api.Documents.Models;
+using DamageAssesment.Api.DocuLinks.Models;
 using Microsoft.AspNetCore.Mvc;
 using Moq;
 using Xunit;
 
-namespace DamageAssesment.Api.Documents.Test
+namespace DamageAssesment.Api.DocuLinks.Test
 {
 
     public class DocumentServiceTest
@@ -14,67 +14,92 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Get Documents - NoContent Case")]
         public async Task GetDocumentsLanguageAsync_ShouldReturnStatusCode204()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en",null)).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "");
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "", null);
 
             Assert.Equal(204, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get Documents - NoContent Case")]
+        [Fact(DisplayName = "Get active Documents - NoContent Case")]
         public async Task GetDocumentsLinkTypeAsync_ShouldReturnStatusCode204()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("", "");
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsByActiveAsync("", "");
 
             Assert.Equal(204, result.StatusCode);
         }
         [Fact(DisplayName = "Get Documents - Ok case")]
         public async Task GetDocumentsAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
-            var mockResponse = await MockData.getOkResponse();
+            var mockResponse = await MockData.getOkResponses();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en", null)).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms","en");
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms","en", null);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+        [Fact(DisplayName = "Get active Documents - Ok case")]
+        public async Task GetActiveDocumentsAsync_ShouldReturnStatusCode200()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponses();
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsByActiveAsync("forms", "en");
 
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get Documents - NoContent Case")]
+        [Fact(DisplayName = "Get active Documents by linktypeid - Ok case")]
-        public async Task GetDocumentsAsync_ShouldReturnStatusCode204()
+        public async Task GetActiveDocumentsLinkTypeIdAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
+            var mockUploadService = new Mock<IUploadService>();
+            var mockResponse = await MockData.getOkResponses();
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
+
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
+            var result = (OkObjectResult)await DocumentProvider.GetDocumentsByActiveLinkTypeIdAsync(null, "en");
+
+            Assert.Equal(200, result.StatusCode);
+        }
+        [Fact(DisplayName = "Get active Documents by linktypeid  - NoContent Case")]
+        public async Task GetDocumentsLinkTypeIdAsync_ShouldReturnStatusCode204()
+        {
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en")).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetDocumentsAsync("forms","en");
+            var result = (NoContentResult)await DocumentProvider.GetDocumentsByActiveLinkTypeIdAsync(null, "");
 
             Assert.Equal(204, result.StatusCode);
         }
-
         [Fact(DisplayName = "Get Document by Id - Ok case")]
         public async Task GetDocumentAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            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);
 
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1, "forms", "en");
 
             Assert.Equal(200, result.StatusCode);
@@ -83,24 +108,24 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Get Document by Id - NotFound case")]
         public async Task GetDocumentAsync_ShouldReturnStatusCode404()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.GetDocumentAsync(99, "forms", "en")).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (NotFoundResult)await DocumentProvider.GetDocumentAsync(99, "forms", "en");
             Assert.Equal(404, result.StatusCode);
         }
         [Fact(DisplayName = "Post Document - Ok case")]
         public async Task PostDocumentAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputDocument = await MockData.getInputDocumentData();
-            var DocumentResponse = await MockData.GetDocumentsInfo(0);
+            var DocumentResponse = await MockData.GetDocuLinksInfo(0);
             mockDocumentService.Setup(service => service.PostDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (NoContentResult)await DocumentProvider.CreateDocument(DocumentResponse);
 
             Assert.Equal(204, result.StatusCode);
@@ -109,13 +134,13 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Post Document - BadRequest case")]
         public async Task PostDocumentAsync_ShouldReturnStatusCode400()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockInputDocument = await MockData.getInputDocumentData();
             var mockResponse = await MockData.getBadRequestResponse();
-            DocumentInfo documentInfo = null;
+            ReqDoculink documentInfo = null;
             mockDocumentService.Setup(service => service.PostDocumentAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (BadRequestObjectResult)await DocumentProvider.CreateDocument(documentInfo);
 
             Assert.Equal(400, result.StatusCode);
@@ -124,13 +149,13 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Put Document - Ok case")]
         public async Task PutDocumentAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             var mockInputDocument = await MockData.getInputDocumentData();
-            var DocumentResponse = await MockData.GetDocumentsInfo(1);
+            var DocumentResponse = await MockData.GetDocuLinksInfo(1);
             mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1,DocumentResponse);
 
             Assert.Equal(404, result.StatusCode);
@@ -139,12 +164,12 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Put Document - BadRequest case")]
         public async Task PutDocumentAsync_ShouldReturnStatusCode400()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputDocument = await MockData.getInputDocumentData();
             mockDocumentService.Setup(service => service.UpdateDocumentAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99,null);
             Assert.Equal(400, result.StatusCode);
         }
@@ -152,11 +177,11 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Delete Document - Ok case")]
         public async Task DeleteDocumentAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getOkResponse(1);
             mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.DeleteDocument(1);
 
             Assert.Equal(200, result.StatusCode);
@@ -164,15 +189,37 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Delete Document - NotFound case")]
         public async Task DeleteDocumentAsync_ShouldReturnStatusCode404()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await MockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.DeleteDocumentAsync(1)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             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
 
@@ -180,12 +227,12 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Get Link types - Ok case")]
         public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse();
-            mockDocumentService.Setup(service => service.GetLinkTypesAsync()).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypesAsync("en")).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetLinkTypesAsync();
+            var result = (OkObjectResult)await DocumentProvider.GetLinkTypesAsync("en");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -193,13 +240,13 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Get Link types - NoContent Case")]
         public async Task GetDocumentCategoriesAsync_ShouldReturnStatusCode204()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNoContentResponse();
-            mockDocumentService.Setup(service => service.GetLinkTypesAsync()).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypesAsync("en")).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NoContentResult)await DocumentProvider.GetLinkTypesAsync();
+            var result = (NoContentResult)await DocumentProvider.GetLinkTypesAsync("en");
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -207,12 +254,12 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Get Link Type by Id - Ok case")]
         public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
-            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(1,"en")).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1);
+            var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1, "en");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -220,25 +267,25 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Get Link Type by Id - NotFound case")]
         public async Task GetDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
-            mockDocumentService.Setup(service => service.GetLinkTypeAsync(99)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.GetLinkTypeAsync(99, "en")).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundResult)await DocumentProvider.GetLinkTypeAsync(99);
+            var result = (NotFoundResult)await DocumentProvider.GetLinkTypeAsync(99, "en");
             Assert.Equal(404, result.StatusCode);
         }
 
         [Fact(DisplayName = "Post Link Type - Ok case")]
         public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(0);
             mockDocumentService.Setup(service => service.PostLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.CreateLinkType(mockInputDocument);
 
             Assert.Equal(200, result.StatusCode);
@@ -247,12 +294,12 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Post Link Type - BadRequest case")]
         public async Task PostDocumentcategoryAsync_ShouldReturnStatusCode400()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
             var mockResponse = await LinkTypeMockData.getBadRequestResponse();
             mockDocumentService.Setup(service => service.PostLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (BadRequestObjectResult)await DocumentProvider.CreateLinkType(mockInputDocument);
 
             Assert.Equal(400, result.StatusCode);
@@ -261,13 +308,13 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Put Document - Ok case")]
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(mockInputDocument);
+            var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1,mockInputDocument);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -275,13 +322,13 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Put Document - NotFound case")]
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99,mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(mockInputDocument);
+            var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99,mockInputDocument);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -289,13 +336,13 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Put Document - BadRequest case")]
         public async Task PutDocumentcategoryAsync_ShouldReturnStatusCode400()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getBadRequestResponse();
             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1);
-            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(mockInputDocument)).ReturnsAsync(mockResponse);
+            mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
-            var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(mockInputDocument);
+            var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -303,12 +350,12 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Delete Document - Ok case")]
         public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode200()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getOkResponse(1);
 
             mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (OkObjectResult)await DocumentProvider.DeleteLinkType(1);
 
             Assert.Equal(200, result.StatusCode);
@@ -316,12 +363,12 @@ namespace DamageAssesment.Api.Documents.Test
         [Fact(DisplayName = "Delete Document - NotFound case")]
         public async Task DeleteDocumentcategoryAsync_ShouldReturnStatusCode404()
         {
-            var mockDocumentService = new Mock<IDocumentsProvider>();
+            var mockDocumentService = new Mock<IDoculinkProvider>();
             var mockUploadService = new Mock<IUploadService>();
             var mockResponse = await LinkTypeMockData.getNotFoundResponse();
             mockDocumentService.Setup(service => service.DeleteLinkTypeAsync(1)).ReturnsAsync(mockResponse);
 
-            var DocumentProvider = new DocumentsController(mockDocumentService.Object, mockUploadService.Object);
+            var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
             var result = (NotFoundResult)await DocumentProvider.DeleteLinkType(99);
 
             Assert.Equal(404, result.StatusCode);

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

@@ -0,0 +1,71 @@
+using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.DocuLinks.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DamageAssesment.Api.DocuLinks.Test
+{
+    public class LinkTypeMockData
+    {
+
+        public static async Task<(bool, List<DocuLinks.Models.ResLinkType>, string)> getOkResponse()
+        {
+            List<DocuLinks.Models.ResLinkType> list = new List<DocuLinks.Models.ResLinkType>();
+            Dictionary<string, string> dictdesc = new Dictionary<string, string>();
+            dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester");
+            for (int i = 1; i < 4; i++)
+            {
+                list.Add(new DocuLinks.Models.ResLinkType()
+                {
+                    Id = i,
+                    titles= dictdesc,
+                    CustomOrder=i,
+                    IsActive = true
+                });
+            }
+            return (true, list, null);
+        }
+        public static async Task<(bool, DocuLinks.Models.ResLinkType, string)> getOkResponse(int Id)
+        {
+            var DocuLinks = await getOkResponse();
+            var Document = DocuLinks.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, Document, null);
+        }
+        public static async Task<(bool, DocuLinks.Models.ResLinkType, string)> getBadRequestResponse()
+        {
+            return (false, null, "Bad Request");
+        }
+
+        public static async Task<(bool, DocuLinks.Models.ResLinkType, string)> getNotFoundResponse()
+        {
+            return (false, null, "Not Found");
+        }
+        public static async Task<(bool, IEnumerable<DocuLinks.Models.ResLinkType>, string)> getNoContentResponse()
+        {
+            IEnumerable<DocuLinks.Models.ResLinkType> list = new List<DocuLinks.Models.ResLinkType>();
+            return (false, list, null);
+        }
+
+        public static async Task<DocuLinks.Models.LinkType> getInputLinkData(int id)
+        {
+            List<Models.LinksTranslation> DocuLinksTranslations = new List<Models.LinksTranslation>();
+            DocuLinksTranslations.Add(new Models.LinksTranslation()
+            {
+                Language = "en",
+                TypeText = "tel"
+            });
+            return new Models.LinkType
+            {
+                Id = id,
+                linksTranslations = DocuLinksTranslations,
+                CustomOrder=1,
+                IsActive = true
+            };
+        }
+
+    }
+}

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

@@ -0,0 +1,188 @@
+using DamageAssesment.Api.DocuLinks.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DamageAssesment.Api.DocuLinks.Test
+{
+    public class MockData
+    {
+
+        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>(); 
+                dicttitle.Add("en", "test"); dicttitle.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
+                });
+                List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
+                doclinksAttachments.Add(new DoculinkAttachments()
+                {
+                    docName = "",Path="www.google.com",
+                    Language = "en",
+                    IsAttachments =false,CustomOrder=1
+                });
+                list.Add(new DocuLinks.Models.ResDoculink()
+                {
+
+                    Id = i,
+                    linkTypeId = i,
+                    IsActive = true,
+                    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();
+            return (true, list, null);
+        }
+
+
+        public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponse()
+        {
+            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>();
+                dicttitle.Add("en", "test"); dicttitle.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
+                });
+                List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
+                doclinksAttachments.Add(new DoculinkAttachments()
+                {
+                    docName = "",
+                    Path = "www.google.com",
+                    IsAttachments = false,
+                    Language = "en",
+                    CustomOrder = 1
+                });
+                list.Add(new DocuLinks.Models.ResDoculink()
+                {
+
+                    Id = i,
+                    linkTypeId = i,
+                    IsActive = true,
+                    titles = dicttitle,
+                    description = dictdesc,
+                    CustomOrder = i,
+                    doclinksAttachments = doclinksAttachments
+                });
+            }
+            return (true, list, null);
+        }
+        public static async Task<(bool, DocuLinks.Models.ResDoculink, string)> getOkResponse(int Id)
+        {
+            var DocuLinks = await getOkResponse();
+            var Document = DocuLinks.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, Document, null);
+        }
+
+        public static async Task<(bool, DocuLinks.Models.ResDoculink, string)> getBadRequestResponse()
+        {
+            return (false, null, "Bad Request");
+        }
+
+        public static async Task<(bool, DocuLinks.Models.ResDoculink, string)> getNotFoundResponse()
+        {
+            return (false, null, "Not Found");
+        }
+        public static async Task<(bool, IEnumerable<DocuLinks.Models.ResDoculinks>, string)> getNoContentResponses()
+        {
+            IEnumerable<DocuLinks.Models.ResDoculinks> list = new List<DocuLinks.Models.ResDoculinks>();
+            return (false, list, null);
+        }
+        public static async Task<(bool, IEnumerable<DocuLinks.Models.ResDoculink>, string)> getNoContentResponse()
+        {
+            IEnumerable<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
+            return (false, list, null);
+        }
+        public static async Task<DocuLinks.Models.ReqDoculink> GetDocuLinksInfo(int id)
+        {
+
+            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 };
+        }
+        public static async Task<DocuLinks.Models.Doculink> getInputDocumentData()
+        {
+            List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
+            DocuLinksTranslations.Add(new DoculinkTranslation()
+            {
+                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
+            {
+                Id = 1,
+                linkTypeId = 1,
+                IsActive = true,
+                CustomOrder=1,
+                documentsTranslations = DocuLinksTranslations,
+                doclinksAttachments= doclinksAttachments
+            };
+        }
+        public static async Task<List<DocuLinks.Models.Doculink>> getInputDocuLinksData()
+        {
+            List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
+            DocuLinksTranslations.Add(new DoculinkTranslation()
+            {
+                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
+            });
+            List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();
+            DocuLinks.Add(new Models.Doculink
+            {
+                Id = 1,
+                linkTypeId = 1,
+                IsActive = true,
+                CustomOrder = 1,
+                documentsTranslations = DocuLinksTranslations,
+                doclinksAttachments = doclinksAttachments
+            });
+            return DocuLinks;
+        }
+
+    }
+}

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

@@ -0,0 +1,332 @@
+using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.DocuLinks.Models;
+using DamageAssesment.Api.DocuLinks.Providers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DamageAssesment.Api.DocuLinks.Controllers
+{
+    [ApiController]
+    public class DoculinkController : ControllerBase
+    {
+        private readonly IDoculinkProvider documentsProvider;
+        private readonly IUploadService uploadService;
+
+        public DoculinkController(IDoculinkProvider documentsProvider, IUploadService uploadService)
+        {
+
+            this.documentsProvider = documentsProvider;
+            this.uploadService = uploadService;
+
+        }
+        /// <summary>
+        /// Get all Doculink type.
+        /// </summary>
+        [HttpGet]
+        [Route("doculinks/types")]
+        [Route("doculinks/types/{language:alpha}")]
+        public async Task<IActionResult> GetLinkTypesAsync(string? language)
+        {
+            var result = await this.documentsProvider.GetLinkTypesAsync(language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkTypes);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get a Doculink type by id.
+        /// </summary>
+        [HttpGet]
+        [Route("doculinks/types/{id}")]
+        [Route("doculinks/types/{id}/{language:alpha}")]
+        public async Task<IActionResult> GetLinkTypeAsync(int id, string? language)
+        {
+            var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkType);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// Update a existing Doculink type.
+        /// </summary>
+        [HttpPut]
+        [Route("doculinks/types/{id}")]
+        public async Task<IActionResult> UpdateLinkType(int id, Models.LinkType linkType)
+        {
+            if (linkType != null)
+            {
+                var result = await this.documentsProvider.UpdateLinkTypeAsync(id, linkType);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.LinkType);
+                }
+                if (result.ErrorMessage == "Not Found")
+                    return NotFound(result.ErrorMessage);
+
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
+        }
+        /// <summary>
+        /// Create a new Doculink type.
+        /// </summary>
+        [HttpPost]
+        [Route("doculinks/types")]
+        public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
+        {
+            if (linkType != null)
+            {
+                var result = await this.documentsProvider.PostLinkTypeAsync(linkType);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.LinkType);
+                }
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
+        }
+        /// <summary>
+        /// Delete a  existing Doculink type by id.
+        /// </summary>
+        [HttpDelete]
+        [Route("doculinks/types/{id}")]
+        public async Task<IActionResult> DeleteLinkType(int id)
+        {
+            var result = await this.documentsProvider.DeleteLinkTypeAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.LinkType);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// download an existing attachment.
+        /// </summary>
+        [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>
+        /// 
+        [Route("doculinks")]
+        [Route("doculinks/{linktype:alpha}")]
+        [Route("doculinks/{linktype:alpha}/{language:alpha}")]
+        [HttpGet]
+        public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language, bool? isactive)
+        {
+            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive);
+            if (result.IsSuccess)
+            {
+                return Ok(result.documents);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get all active Doculink.
+        /// </summary>
+        [Route("doculinks/active")]
+        [Route("doculinks/active/{linktype:alpha}")]
+        [Route("doculinks/active/{linktype:alpha}/{language:alpha}")]
+        [HttpGet]
+        public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
+        {
+            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, true);
+            if (result.IsSuccess)
+            {
+                return Ok(result.documents);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get all active Doculink.
+        /// </summary>
+        [Route("doculinks/active/{linktypeid:int}")]
+        [Route("doculinks/active/{linktypeid:int}/{language:alpha}")]
+        [HttpGet]
+        public async Task<IActionResult> GetDocumentsByActiveLinkTypeIdAsync(int? linktypeid, string? language)
+        {
+            var result = await this.documentsProvider.GetdocumentsByLinkTypeIdAsync(linktypeid, language, true);
+            if (result.IsSuccess)
+            {
+                return Ok(result.documents);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Get a Doculink by id.
+        /// </summary>
+        [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)
+        {
+            var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.Document);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// update existing doclink.
+        /// </summary>
+        [HttpPut]
+        [Route("doculinks/{id}")]
+        public async Task<IActionResult> UpdateDocument(int id, ReqDoculink documentInfo)
+        {
+            if (documentInfo != null)
+            {
+                var dbdoc = await this.documentsProvider.GetDocumentByidAsync(id);
+                if (dbdoc.IsSuccess)
+                {
+                    var documents = await this.documentsProvider.GetDocumentCounter();
+                    Models.Doculink DocuLink = uploadService.UpdateDocuments(documents.counter, dbdoc.Document, documentInfo);
+                    var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
+                    if (result.IsSuccess)
+                    {
+                        return Ok(result.Document);
+                    }
+                    return NoContent();
+                }
+                return NotFound();
+            }
+            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>
+        [HttpPost]
+        [Route("doculinks")]
+        public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo)
+        {
+            try
+            {
+                if (documentInfo != null)
+                {
+                    var documents = await this.documentsProvider.GetDocumentCounter();
+                    Models.Doculink DocuLink = uploadService.UploadDocument(documents.counter, documentInfo);
+                    var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
+                    if (result.IsSuccess)
+                    {
+                        return Ok(result.Document);
+                    }
+                    return NoContent();
+                }
+                return BadRequest(documentInfo);
+            }
+            catch (Exception ex)
+            {
+                return BadRequest($"Internal server error: {ex}");
+            }
+        }
+        /// <summary>
+        /// Delete Doculink by id.
+        /// </summary>
+        [HttpDelete]
+        [Route("doculinks/{id}")]
+        public async Task<IActionResult> DeleteDocument(int id)
+        {
+            // database soft delete
+            var result = await this.documentsProvider.DeleteDocumentAsync(id);
+            if (result.IsSuccess)
+            {
+                // deleting file from folder
+                foreach (var item in result.Document.doclinksAttachments)
+                {
+                    uploadService.Movefile(item.Path);
+                }
+                return Ok(result.Document);
+            }
+            return NotFound();
+        }
+
+    }
+}

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

@@ -10,7 +10,6 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
     <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9">
@@ -26,8 +25,4 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="DASA_Documents\" />
-  </ItemGroup>
-
 </Project>

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

@@ -1,23 +1,22 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.Documents.Db
+namespace DamageAssesment.Api.DocuLinks.Db
 {
-    public class Document
+    [Table("Doculinks")]
+    public class Doculink
     {
         [Key]
         public int Id { get; set; }
         [ForeignKey("LinkType")]
         public int linkTypeId { get; set; }
-        public LinkType? LinkType { get; set; }
-        public string docName { get; set; }
-
-        public string url { get; set; }
-        public string Path { get; set; }
         public bool IsActive { get; set; }
+        public bool IsDeleted { get; set; }
+        public int CustomOrder { get; set; }
+        //public bool IsAttachments { get; set; }
+        //public bool IsUrl { get; set; }
         public DateTime dateCreated { get; set; }
         public DateTime dateUpdated { get; set; }
 
-
     }
 }

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

@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Db
+{
+    [Table("DoculinkAttachments")]
+    public class DoculinkAttachments
+    {
+
+        [Key]
+        public int Id { get; set; }
+        [ForeignKey("Document")]
+        public int DocumentId { get; set; }
+        public string docName { get; set; }
+        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

@@ -0,0 +1,38 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Configuration;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Db
+{
+    public class DoculinkDbContext : DbContext
+    {
+        public DoculinkDbContext(DbContextOptions options) : base(options)
+        {
+        }
+        public DbSet<Db.Doculink> Documents { get; set; }
+        public DbSet<Db.LinkType> LinkTypes { get; set; }
+        public DbSet<Db.DoculinkTranslation> DocumentsTranslations { get; set; }
+        public DbSet<Db.LinksTranslation> LinksTranslations { get; set; }
+        public DbSet<Db.DoculinkAttachments> DoclinksAttachments { get; set; }
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<Doculink>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<LinkType>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<DoculinkTranslation>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<LinksTranslation>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<DoculinkAttachments>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
+    }
+}

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

@@ -1,9 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.Documents.Db
+namespace DamageAssesment.Api.DocuLinks.Db
 {
-    public class DocumentsTranslation
+    [Table("DoculinkTrans")]
+    public class DoculinkTranslation
     {
         [Key]
         public int Id { get; set; }

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

@@ -1,13 +1,14 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.Documents.Db
+namespace DamageAssesment.Api.DocuLinks.Db
 {
+    [Table("DoculinkTypes")]
     public class LinkType
     {
         [Key]
         public int Id { get; set; }
-        public string TypeText { get; set; }
         public bool IsActive { get; set; }
-        public bool IsAttachment { get; set; }
+        public int CustomOrder { get; set; }
     }
 }

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

@@ -0,0 +1,16 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Db
+{
+    [Table("DoculinkTypeTrans")]
+    public class LinksTranslation
+    {
+        [Key]
+        public int Id { get; set; }
+        [ForeignKey("LinkType")]
+        public int LinkTypeId { get; set; }
+        public string TypeText { get; set; }
+        public string Language { get; set; }
+    }
+}

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

@@ -1,6 +1,6 @@
 using Azure.Storage.Blobs.Models;
 
-namespace DamageAssesment.Api.Documents.Interfaces
+namespace DamageAssesment.Api.DocuLinks.Interfaces
 {
     public interface IAzureBlobService
     {

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

@@ -0,0 +1,21 @@
+using DamageAssesment.Api.DocuLinks.Models;
+
+namespace DamageAssesment.Api.DocuLinks.Interfaces
+{
+    public interface IDoculinkProvider : ILinkTypesProvider
+    {
+        Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> GetDocumentAsync(int id, string? linktype, string? language);
+        Task<(bool IsSuccess, Models.Doculink Document, string ErrorMessage)> GetDocumentByidAsync(int id);
+        // Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language);
+        Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive);
+        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/ILinkTypeProvider.cs

@@ -0,0 +1,11 @@
+namespace DamageAssesment.Api.DocuLinks.Interfaces
+{
+    public interface ILinkTypesProvider
+    {
+        Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int id,string? language);
+        Task<(bool IsSuccess, IEnumerable<Models.ResLinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync(string? language);
+        Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> PostLinkTypeAsync(Models.LinkType LinkType);
+        Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(int id,Models.LinkType LinkType);
+        Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> DeleteLinkTypeAsync(int id);
+    }
+}

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

@@ -0,0 +1,14 @@
+using DamageAssesment.Api.DocuLinks.Models;
+
+namespace DamageAssesment.Api.DocuLinks.Interfaces
+{
+    public interface IUploadService
+    {
+        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/Doculink.cs

@@ -0,0 +1,30 @@
+using DamageAssesment.Api.DocuLinks.Models;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Models
+{
+    public class Doculink : BaseDoculink
+    {
+        public List<DoculinkTranslation> documentsTranslations { get; set; }
+    }
+    public class ResDoculinks
+    {
+        public int linkTypeId { get; set; }
+        public List<ResDoculink> doculinks { get; set; }   
+    }
+    public class ResDoculink:BaseDoculink
+    {
+        public object titles { get; set; }
+        public object description { get; set; }
+        public object linktypes { get; set; }
+    }
+    public class BaseDoculink
+    {
+        public int Id { get; set; }
+        public int linkTypeId { get; set; }
+        public bool IsActive { get; set; }
+        public bool IsDeleted { get; set; }
+        public List<DoculinkAttachments> doclinksAttachments { get; set; }
+        public int CustomOrder { get; set; }
+    }
+}

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

@@ -0,0 +1,14 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Models
+{
+    public class DoculinkAttachments
+    {
+        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/DoculinkTranslation.cs

@@ -1,9 +1,9 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.Documents.Models
+namespace DamageAssesment.Api.DocuLinks.Models
 {
-    public class DocumentsTranslation
+    public class DoculinkTranslation
     {
         public string title { get; set; }
         public string description { get; set; }

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

@@ -0,0 +1,20 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Models
+{
+    public class LinkType : BaseLinkType
+    {
+        public List<LinksTranslation> linksTranslations { get; set; }
+    }
+    public class BaseLinkType
+    {
+        public int Id { get; set; }
+        public bool IsActive { get; set; }
+        public int CustomOrder { get; set; }
+    }
+
+    public class ResLinkType : BaseLinkType
+    {
+        public object titles { get; set; }
+    }
+}

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

@@ -0,0 +1,11 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.DocuLinks.Models
+{
+    public class LinksTranslation
+    {
+        public string TypeText { get; set; }
+        public string Language { get; set; }
+    }
+}

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

@@ -0,0 +1,24 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.DocuLinks.Models
+{
+    public class ReqDoculink
+    {
+        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; }
+    }
+    public class FileModel
+    {
+        public string? FileName { get; set; }
+        public string? FileContent { get; set; }
+        public string? FileExtension { get; set; }
+        public int CustomOrder { get; set; }
+        public string url { get;set; }
+        public bool IsAttachments { get; set; }
+        public string Language { get; set; }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Profiles/DoculinkProfile.cs

@@ -0,0 +1,22 @@
+using AutoMapper;
+
+namespace DamageAssesment.Api.DocuLinks.Profiles
+{
+    public class DoculinkProfile : AutoMapper.Profile
+    {
+        public DoculinkProfile()
+        {
+            CreateMap<Db.Doculink, Models.ResDoculink>() ;
+            CreateMap<Db.Doculink, Models.Doculink>();
+            CreateMap<Models.Doculink, Db.Doculink>();
+            CreateMap<Db.LinkType, Models.ResLinkType>();
+            CreateMap<Models.LinkType, Db.LinkType>();
+            CreateMap<Db.DoculinkTranslation, Models.DoculinkTranslation>();
+            CreateMap<Models.DoculinkTranslation, Db.DoculinkTranslation>();
+            CreateMap<Db.LinksTranslation, Models.LinksTranslation>();
+            CreateMap<Models.LinksTranslation, Db.LinksTranslation>();
+            CreateMap<Db.DoculinkAttachments, Models.DoculinkAttachments>();
+            CreateMap<Models.DoculinkAttachments, Db.DoculinkAttachments>();
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Program.cs

@@ -0,0 +1,44 @@
+using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.DocuLinks.Providers;
+using Microsoft.EntityFrameworkCore;
+using System.Reflection;
+
+var builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+builder.Services.AddControllers();
+builder.Services.AddSwaggerGen(c =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    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.UseInMemoryDatabase("DocumentConnection");
+});
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (app.Environment.IsDevelopment())
+{
+    app.UseSwagger();
+    app.UseSwaggerUI();
+}
+
+app.UseAuthorization();
+
+app.MapControllers();
+
+app.Run();

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

@@ -14,7 +14,7 @@
       "dotnetRunMessages": true,
       "launchBrowser": true,
       "launchUrl": "swagger",
-      "applicationUrl": "http://localhost:5136",
+      "applicationUrl": "http://localhost:5133",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

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

@@ -2,9 +2,9 @@
 using Azure.Storage.Blobs;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Blobs.Specialized;
-using DamageAssesment.Api.Documents.Interfaces;
+using DamageAssesment.Api.DocuLinks.Interfaces;
 
-namespace DamageAssesment.Api.Documents.Providers
+namespace DamageAssesment.Api.DocuLinks.Providers
 {
     public class AzureBlobService: IAzureBlobService
     {

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

@@ -0,0 +1,674 @@
+using AutoMapper;
+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;
+
+namespace DamageAssesment.Api.DocuLinks.Providers
+{
+
+
+    public class DoculinkProvider : IDoculinkProvider
+    {
+        private DoculinkDbContext DocumentDbContext;
+        private ILogger<DoculinkProvider> logger;
+        private IUploadService uploadservice;
+        private IMapper mapper;
+        private readonly IHttpContextAccessor httpContextAccessor;
+        private string baseUrl;
+
+        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
+        {
+            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";
+            SeedData();
+        }
+
+
+
+        private void SeedData()
+        {
+            if (!DocumentDbContext.LinkTypes.Any())
+            {
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 1 });
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 2 });
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 3 });
+                DocumentDbContext.LinkTypes.Add(new Db.LinkType() { IsActive = true, CustomOrder = 4 });
+                DocumentDbContext.SaveChanges();
+            }
+            if (!DocumentDbContext.LinksTranslations.Any())
+            {
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Forms", Language = "en", LinkTypeId = 1 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Communiques", Language = "en", LinkTypeId = 2 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Memos", Language = "en", LinkTypeId = 3 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Trainings", Language = "en", LinkTypeId = 4 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Formularios", Language = "es", LinkTypeId = 1 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Comunicados", Language = "es", LinkTypeId = 2 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "notas", Language = "es", LinkTypeId = 3 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Entrenamientos", Language = "es", LinkTypeId = 4 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Formes", Language = "fr", LinkTypeId = 1 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Communiqués", Language = "fr", LinkTypeId = 2 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Mémos", Language = "fr", LinkTypeId = 3 });
+                DocumentDbContext.LinksTranslations.Add(new Db.LinksTranslation() { TypeText = "Formations", Language = "fr", LinkTypeId = 4 });
+                DocumentDbContext.SaveChanges();
+            }
+            if (!DocumentDbContext.Documents.Any())
+            {
+                int counter = 0;
+                for (int i = 1; i <= 4; i++)
+                {
+                    int linkTypeId = 2;
+                    FileModel fileModel = new FileModel();
+                    if (i < 3)
+                    {
+                        linkTypeId = 1;
+
+                        fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1, Language = "en"  };
+                    }
+                    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 } };
+                    Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
+                    DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
+                    DocumentDbContext.SaveChanges();
+                    var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(document.doclinksAttachments);
+                    dbattachments.ForEach(a => a.DocumentId = i);
+                    DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
+                    DocumentDbContext.SaveChanges();
+                    counter++;
+                }
+            }
+            if (!DocumentDbContext.DocumentsTranslations.Any())
+            {
+                string[] titles = {
+                         "Mobile App Damage Assessment Instructions",
+                         "PC Damage Assessment Instructions",
+                         "Emergency Evacuation centers",
+                         "Mobile App Damage Assessment Instructions" };
+                string[] esTranslations = {
+                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil",
+                         "Instrucciones de Evaluación de Daños del PC",
+                         "Centros de Evacuación de Emergencia",
+                         "Instrucciones de Evaluación de Daños de la Aplicación Móvil"  };
+                string[] frTranslations = {
+                      "Instructions d'Évaluation des Dommages de l'Application Mobile",
+                      "Instructions d'Évaluation des Dommages du PC",
+                       "Centres d'Évacuation d'Urgence",
+                       "Instructions d'Évaluation des Dommages de l'Application Mobile" };
+                List<Db.DoculinkTranslation> documents = new List<Db.DoculinkTranslation>();
+                for (int i = 0; i < 4; i++)
+                {
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = titles[i], description = titles[i], Language = "en" });
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = esTranslations[i], description = esTranslations[i], Language = "es" });
+                    documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = frTranslations[i], description = frTranslations[i], Language = "fr" });
+                }
+                DocumentDbContext.DocumentsTranslations.AddRange(documents);
+                DocumentDbContext.SaveChanges();
+            }
+
+        }
+        public List<Models.DoculinkTranslation> GetDocumentTranslations(int id, string? language)
+        {
+            List<Models.DoculinkTranslation> QuestionTranslations;
+            if (string.IsNullOrEmpty(language))
+            {
+                QuestionTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
+                    DocumentDbContext.DocumentsTranslations.AsNoTracking().Where(a => a.DocumentId == id).ToList());
+            }
+            else
+            {
+                QuestionTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
+                DocumentDbContext.DocumentsTranslations.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList());
+            }
+            return QuestionTranslations;
+        }
+        public ResDoculink CreateMultiLanguageObject(List<Models.DoculinkTranslation> questions)
+        {
+            ResDoculink MultiLanguage = new ResDoculink();
+            Dictionary<string, string> dicttitle = new Dictionary<string, string>();
+            Dictionary<string, string> dictdesc = new Dictionary<string, string>();
+            foreach (Models.DoculinkTranslation item in questions)
+            {
+                dicttitle.Add(item.Language, item.title);
+                dictdesc.Add(item.Language, item.description);
+            }
+            MultiLanguage.titles = dicttitle;
+            MultiLanguage.description = dictdesc;
+            return MultiLanguage;
+        }
+        public List<Models.LinksTranslation> GetLinkTypeTranslations(int id, string? language)
+        {
+            List<Models.LinksTranslation> linksTranslations;
+            if (string.IsNullOrEmpty(language))
+            {
+                linksTranslations = mapper.Map<List<Db.LinksTranslation>, List<Models.LinksTranslation>>(
+                    DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.LinkTypeId == id).ToList());
+            }
+            else
+            {
+                linksTranslations = mapper.Map<List<Db.LinksTranslation>, List<Models.LinksTranslation>>(
+                DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.LinkTypeId == id && a.Language == language).ToList());
+            }
+            return linksTranslations;
+        }
+        public object CreateMultiLanguageLinkTypeObject(List<Models.LinksTranslation> links)
+        {
+            object MultiLanguage = new object();
+            Dictionary<string, string> dicttitle = new Dictionary<string, string>();
+            foreach (Models.LinksTranslation item in links)
+            {
+                dicttitle.Add(item.Language, item.TypeText);
+            }
+            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)
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var documents = new List<Db.Doculink>();
+                if (linkTypeId==null)
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
+                else
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
+                     q.linkTypeId == linkTypeId.Value).ToListAsync();
+                if (documents != null)
+                {
+                    var result = mapper.Map<List<Db.Doculink>, List<Models.ResDoculink>>(documents);
+                    foreach (var item in result)
+                    {
+                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
+                        item.titles = multilan.titles;
+                        item.description = multilan.description;
+                        item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
+                        item.doclinksAttachments = GetDocumentAttachment(item.Id,language);
+                    }
+                   // List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var documents = new List<Db.Doculink>();
+                if (String.IsNullOrEmpty(linkType))
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
+                else
+                    documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
+                     q.linkTypeId == (DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.TypeText.ToLower() == linkType.ToLower()).Select(a => a.Id).FirstOrDefault())).ToListAsync();
+                if (documents != null)
+                {
+                    var result = mapper.Map<List<Db.Doculink>, List<Models.ResDoculink>>(documents);
+                    foreach (var item in result)
+                    {
+                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
+                        item.titles = multilan.titles;
+                        item.description = multilan.description;
+                        item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
+                        item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
+                    }
+                    //List<ResDoculinks> doculinks =  result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+
+        }
+        //public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language)
+        //{
+
+        //    try
+        //    {
+        //        logger?.LogInformation("Query Question");
+        //        var documents = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive).ToListAsync();
+        //        if (documents != null)
+        //        {
+        //            logger?.LogInformation($"{documents.Count} Document(s) found");
+        //            var result = mapper.Map<List<Db.Document>, List<Models.ResDoculink>>(documents);
+        //            foreach (var item in result)
+        //            {
+        //                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
+        //                item.titles = multilan.titles;
+        //                item.description = multilan.description;
+        //            }
+        //            return (true, result, null);
+        //        }
+        //        return (false, null, "Not found");
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        logger?.LogError(ex.ToString());
+        //        return (false, null, ex.Message);
+        //    }
+
+        //}
+        public async Task<(bool IsSuccess, Models.Doculink Document, string ErrorMessage)> GetDocumentByidAsync(int id)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                var Document = await DocumentDbContext.Documents.AsNoTracking().FirstOrDefaultAsync(q => q.Id == id && q.IsActive);
+                if (Document != null)
+                {
+                    logger?.LogInformation($"{Document} customer(s) found");
+                    var result = mapper.Map<Db.Doculink, Models.Doculink>(Document);
+                    result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
+                            DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
+
+                    result.doclinksAttachments = GetDocumentAttachment(id, "");
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        //added linktype filter 
+        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> GetDocumentAsync(int id, string? linkType, string? language)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                //var Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().FirstOrDefaultAsync(q => q.Id == id && q.IsActive);
+                var Document = new Db.Doculink();
+                if (String.IsNullOrEmpty(linkType))
+                    Document = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive && q.Id == id).FirstOrDefaultAsync();
+                else
+                    Document = await DocumentDbContext.Documents.AsNoTracking().Where(q => q.IsActive && q.Id == id &&
+                     q.linkTypeId == (DocumentDbContext.LinksTranslations.AsNoTracking().Where(a => a.TypeText.ToLower() == linkType.ToLower()).Select(a => a.Id).FirstOrDefault())).FirstOrDefaultAsync();
+                if (Document != null)
+                {
+                    logger?.LogInformation($"{Document} customer(s) found");
+                    var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document);
+                    var multilan = CreateMultiLanguageObject(GetDocumentTranslations(result.Id, language));
+                    result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
+                    result.titles = multilan.titles;
+                    result.description = multilan.description;
+                    result.doclinksAttachments = GetDocumentAttachment(id, language);
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document)
+        {
+            try
+            {
+                var document = mapper.Map<Models.Doculink, Db.Doculink>(Document);
+                document.dateCreated = DateTime.Now; document.dateUpdated = DateTime.Now;
+                DocumentDbContext.Documents.Add(document);
+                DocumentDbContext.SaveChanges();
+                var dbtranslation = mapper.Map<List<Models.DoculinkTranslation>, List<Db.DoculinkTranslation>>(Document.documentsTranslations);
+                dbtranslation.ForEach(i => i.DocumentId = document.Id);
+                DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
+                var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(Document.doclinksAttachments);
+                dbattachments.ForEach(i => i.DocumentId = document.Id);
+                DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
+                DocumentDbContext.SaveChanges();
+                var result = mapper.Map<Db.Doculink, Models.ResDoculink>(document);
+                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(document.Id, ""));
+                result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, ""));
+                result.titles = multilan.titles;
+                result.description = multilan.description;
+                result.doclinksAttachments = GetDocumentAttachment(document.Id,"");
+                return (true, result, null);
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+
+        public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document)
+        {
+            try
+            {
+                if (Document != null)
+                {
+                    var existing = DocumentDbContext.Documents.AsNoTracking().FirstOrDefault(x => x.Id == id);
+                    if (existing != null)
+                    {
+                        Document.Id = existing.Id;
+                        var document = mapper.Map<Models.Doculink, Db.Doculink>(Document);
+                        document.dateUpdated = DateTime.Now;
+                        DocumentDbContext.Documents.Update(document);
+                        DocumentDbContext.SaveChanges();
+                        var oldtranslations = DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == id).ToList();
+                        if (oldtranslations != null)
+                            DocumentDbContext.DocumentsTranslations.RemoveRange(oldtranslations);
+                        var oldattachments = DocumentDbContext.DoclinksAttachments.Where(a => a.DocumentId == id).ToList();
+                        if (oldattachments != null)
+                            DocumentDbContext.DoclinksAttachments.RemoveRange(oldattachments);
+                        var dbtranslation = mapper.Map<List<Models.DoculinkTranslation>, List<Db.DoculinkTranslation>>(Document.documentsTranslations);
+                        dbtranslation.ForEach(i => i.DocumentId = Document.Id);
+                        DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
+                        var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(Document.doclinksAttachments);
+                        dbattachments.ForEach(i => i.DocumentId = document.Id);
+                        DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
+                        DocumentDbContext.SaveChanges();
+                        var result = mapper.Map<Db.Doculink, Models.ResDoculink>(document);
+                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(document.Id, ""));
+                        result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, ""));
+                        result.titles = multilan.titles;
+                        result.description = multilan.description;
+                        result.doclinksAttachments = GetDocumentAttachment(document.Id, "");
+                        return (true, result, "Successful");
+                    }
+                    else
+                    {
+                        logger?.LogInformation($"{Document} Not found");
+                        return (false, null, "Not Found");
+                    }
+                }
+                else
+                {
+                    logger?.LogInformation($"{Document} Bad Request");
+                    return (false, null, "Bad request");
+                }
+
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.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)
+        {
+
+            try
+            {
+                Db.Doculink Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
+                if (Document == null)
+                {
+                    return (false, null, "Not Found");
+                }
+                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());
+                Document.IsActive = false;
+                DocumentDbContext.Documents.Update(Document);
+                DocumentDbContext.SaveChanges();
+                return (true, result, $"DocumentId {id} deleted Successfuly");
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+
+        public async Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter()
+        {
+            try
+            {
+                int AttachmentId = DocumentDbContext.DoclinksAttachments.Max(a => a.Id);
+                return (true, AttachmentId, "");
+            }
+            catch (Exception ex)
+            {
+                return (false, 0, ex.Message);
+            }
+        }
+
+        //Link Type methods
+        public async Task<(bool IsSuccess, IEnumerable<Models.ResLinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync(string? language)
+        {
+
+            try
+            {
+                logger?.LogInformation("Query Question");
+                var LinkType = await DocumentDbContext.LinkTypes.AsNoTracking().Where(q => q.IsActive).ToListAsync();
+                if (LinkType != null)
+                {
+                    logger?.LogInformation($"{LinkType.Count} LinkTypes(s) found");
+                    var result = mapper.Map<IEnumerable<Db.LinkType>, IEnumerable<Models.ResLinkType>>(LinkType);
+                    foreach (var item in result)
+                    {
+                        item.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.Id, language));
+                    }
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+
+        }
+        public async Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int Id, string? language)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                var LinkType = await DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id && q.IsActive);
+                if (LinkType != null)
+                {
+                    logger?.LogInformation($"{LinkType} customer(s) found");
+                    var result = mapper.Map<Db.LinkType, Models.ResLinkType>(LinkType);
+                    result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, language));
+                    return (true, result, null);
+                }
+                return (false, null, "Not found");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> PostLinkTypeAsync(Models.LinkType LinkType)
+        {
+            try
+            {
+                logger?.LogInformation("Query LinkType");
+                if (!LinkTypeExists(LinkType.Id))
+                {
+                    var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
+                    DocumentDbContext.LinkTypes.Add(dbLink);
+                    DocumentDbContext.SaveChanges();
+                    var dbtranslation = mapper.Map<List<Models.LinksTranslation>, List<Db.LinksTranslation>>(LinkType.linksTranslations);
+                    dbtranslation.ForEach(i => i.LinkTypeId = dbLink.Id);
+                    DocumentDbContext.LinksTranslations.AddRange(dbtranslation);
+                    DocumentDbContext.SaveChanges();
+                    var result = mapper.Map<Db.LinkType, Models.ResLinkType>(dbLink);
+                    result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, ""));
+                    return (true, result, null);
+                }
+                return (false, null, "LinkType is already exits");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(int id, Models.LinkType LinkType)
+        {
+            try
+            {
+                if (LinkType != null)
+                {
+                    var existing = DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefault(x => x.Id == id);
+                    if (existing != null)
+                    {
+                        var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
+                        DocumentDbContext.LinkTypes.Update(dbLink);
+                        DocumentDbContext.SaveChanges();
+                        var oldtranslations = DocumentDbContext.LinksTranslations.Where(a => a.LinkTypeId == id).ToList();
+                        if (oldtranslations != null)
+                            DocumentDbContext.LinksTranslations.RemoveRange(oldtranslations);
+                        var dbtranslation = mapper.Map<List<Models.LinksTranslation>, List<Db.LinksTranslation>>(LinkType.linksTranslations);
+                        dbtranslation.ForEach(i => i.LinkTypeId = dbLink.Id);
+                        DocumentDbContext.LinksTranslations.AddRange(dbtranslation);
+                        DocumentDbContext.SaveChanges();
+                        var result = mapper.Map<Db.LinkType, Models.ResLinkType>(dbLink);
+                        result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, ""));
+                        return (true, result, "Successful");
+                    }
+                    else
+                    {
+                        logger?.LogInformation($"{LinkType} Not found");
+                        return (false, null, "Not Found");
+                    }
+                }
+                else
+                {
+                    logger?.LogInformation($"{LinkType} Bad Request");
+                    return (false, null, "Bad request");
+                }
+
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.ResLinkType LinkType, string ErrorMessage)> DeleteLinkTypeAsync(int id)
+        {
+
+            try
+            {
+                Db.LinkType LinkType = DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
+                if (LinkType == null)
+                {
+                    return (false, null, "Not Found");
+                }
+                LinkType.IsActive = false;
+                var result = mapper.Map<Db.LinkType, Models.ResLinkType>(LinkType);
+                result.titles = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.Id, ""));
+                DocumentDbContext.LinkTypes.Update(LinkType);
+                DocumentDbContext.SaveChanges();
+                return (true, result, $"LinkTypeId {id} deleted Successfuly");
+            }
+            catch (Exception ex)
+            {
+
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+        private bool LinkTypeExists(int id)
+        {
+            return DocumentDbContext.LinkTypes.AsNoTracking().Count(e => e.Id == id) > 0;
+        }
+    }
+}

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

@@ -0,0 +1,178 @@
+using AutoMapper;
+using Azure;
+using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.DocuLinks.Models;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using System.Diagnostics.Metrics;
+using System.Net.Http;
+using System.Security.AccessControl;
+using System.Security.Principal;
+
+namespace DamageAssesment.Api.DocuLinks.Providers
+{
+    public class UploadService : IUploadService
+    {
+        private ILogger<UploadService> logger;
+        private IMapper mapper;
+        private string uploadpath = "";
+        private string Deletepath = "";
+        public UploadService(IConfiguration configuration, ILogger<UploadService> logger, IMapper mapper)
+        {
+            this.logger = logger;
+            this.mapper = mapper;
+            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)
+        {
+            Models.Doculink Documents = new Models.Doculink();
+            List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
+            try 
+            {
+                string path = "", UserfileName="";
+                var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
+                if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
+                    Directory.CreateDirectory(fullDirectoryPath);
+                if (documentInfo.Files != null)
+                {
+
+                    foreach (var item in documentInfo.Files)
+                    {
+                        counter++;
+                        if (item.IsAttachments)
+                        {
+                            UserfileName = Path.GetFileName(item.FileName + item.FileExtension);
+                            var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
+                            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 });
+                    }
+                }
+                Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
+                    documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
+                    IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =documentInfo.IsActive
+                };
+            
+                return Documents;
+            }
+            catch (Exception ex) {
+                return new Models.Doculink();
+            }
+
+           
+        }
+        public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo)
+        {
+            try
+            {
+                foreach (var item in document.doclinksAttachments)
+                {
+                    Movefile(item.Path);
+                }
+                var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
+                if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
+                    Directory.CreateDirectory(fullDirectoryPath);
+
+                string path = "", UserfileName = "";
+                List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>();
+                foreach (var item in documentInfo.Files)
+                {
+                    counter++;
+                    if (item.IsAttachments)
+                    {
+                        UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
+                        var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
+                        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 });
+                }
+                Models.Doculink Documents = new Models.Doculink()
+                {
+                    Id = documentInfo.Id,
+                    linkTypeId = documentInfo.linkTypeId,
+                    documentsTranslations=documentInfo.documentsTranslations,
+                    IsActive = documentInfo.IsActive,
+                    IsDeleted=false,
+                    CustomOrder = documentInfo.CustomOrder,
+                    doclinksAttachments = attachments
+                };
+
+                return Documents;
+            }
+
+             catch (Exception ex) {
+                return new Models.Doculink();
+            }
+        }
+        public void Deletefile(string path)
+        {
+            if (path != "")
+            {
+                FileInfo file = new FileInfo(path);
+                if (file?.Exists??false)//check file exsit or not  
+                {
+                    file.Delete();
+                }
+            }
+        }
+        public void Movefile(string path)
+        {
+            if (path != "")
+            {
+                var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), Deletepath);
+                if (!Directory.Exists(pathToSave)) //Create deirectory if does not exist
+                    Directory.CreateDirectory(pathToSave);
+                FileInfo file = new FileInfo(path);
+                if (file?.Exists ?? false)//check file exsit or not  
+                {
+                    string filename = file.Name.Replace(file.Extension, " ") + DateTime.Now.ToShortDateString().Replace("/","_") + file.Extension;
+                    file.MoveTo(pathToSave+"\\"+ filename);
+                }
+            }
+        }
+    }
+}

DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.json

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

DamageAssesmentApi/DamageAssesment.Api.Documents.Test/LinkTypeMockData.cs

@@ -1,61 +0,0 @@
-using DamageAssesment.Api.Documents.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DamageAssesment.Api.Documents.Test
-{
-    public class LinkTypeMockData
-    {
-
-        public static async Task<(bool, List<Documents.Models.LinkType>, string)> getOkResponse()
-        {
-            List<Documents.Models.LinkType> list = new List<Documents.Models.LinkType>();
-
-            for (int i = 1; i < 4; i++)
-            {
-                list.Add(new Documents.Models.LinkType()
-                {
-                    Id = i,
-                    TypeText = "sample"+i,
-                    IsActive = true
-                });
-            }
-            return (true, list, null);
-        }
-        public static async Task<(bool, Documents.Models.LinkType, string)> getOkResponse(int Id)
-        {
-            var Documents = await getOkResponse();
-            var Document = Documents.Item2.FirstOrDefault(s => s.Id == Id);
-            return (true, Document, null);
-        }
-        public static async Task<(bool, Documents.Models.LinkType, string)> getBadRequestResponse()
-        {
-            return (false, null, "Bad Request");
-        }
-
-        public static async Task<(bool, Documents.Models.LinkType, string)> getNotFoundResponse()
-        {
-            return (false, null, "Not Found");
-        }
-        public static async Task<(bool, IEnumerable<Documents.Models.LinkType>, string)> getNoContentResponse()
-        {
-            IEnumerable<Documents.Models.LinkType> list = new List<Documents.Models.LinkType>();
-            return (false, list, null);
-        }
-
-        public static async Task<Documents.Models.LinkType> getInputLinkData(int id)
-        {
-            return new Models.LinkType
-            {
-                Id = id,
-                TypeText = "sample",
-                IsActive = true
-            };
-        }
-
-    }
-}

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

@@ -1,122 +0,0 @@
-using DamageAssesment.Api.Documents.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DamageAssesment.Api.Documents.Test
-{
-    public class MockData
-    {
-
-        public static async Task<(bool, List<Documents.Models.MultiLanDocument>, string)> getOkResponse()
-        {
-            List<Documents.Models.MultiLanDocument> list = new List<Documents.Models.MultiLanDocument>();
-            
-            for (int i = 1; i < 4; i++)
-            {
-                Dictionary<string, string> dicttitle = 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");
-                List<Documents.Models.DocumentsTranslation> documentsTranslations = new List<DocumentsTranslation>();
-                documentsTranslations.Add(new DocumentsTranslation()
-                {
-                    Language = "en",
-                    title = "tel"+i,
-                    description = "Sample"+i
-                });
-                list.Add(new Documents.Models.MultiLanDocument()
-                {
-
-                    Id = i,
-                    linkTypeId = i,
-                    docName = "sample"+i,
-                    url = "testurl" + i,
-                    Path = "testpath" + i,
-                    IsActive = true,
-                    titles= dicttitle,
-                    description=dictdesc,
-                    dateCreated = DateTime.Now,
-                    dateUpdated = DateTime.Now
-                });
-            }
-            return (true, list, null);
-        }
-        public static async Task<(bool, Documents.Models.MultiLanDocument, string)> getOkResponse(int Id)
-        {
-            var Documents = await getOkResponse();
-            var Document = Documents.Item2.FirstOrDefault(s => s.Id == Id);
-            return (true, Document, null);
-        }
-
-        public static async Task<(bool, Documents.Models.MultiLanDocument, string)> getBadRequestResponse()
-        {
-            return (false, null, "Bad Request");
-        }
-
-        public static async Task<(bool, Documents.Models.MultiLanDocument, string)> getNotFoundResponse()
-        {
-            return (false, null, "Not Found");
-        }
-        public static async Task<(bool, IEnumerable<Documents.Models.MultiLanDocument>, string)> getNoContentResponse()
-        {
-            IEnumerable<Documents.Models.MultiLanDocument> list = new List<Documents.Models.MultiLanDocument>();
-            return (false, list, null);
-        }
-        public static async Task<Documents.Models.DocumentInfo> GetDocumentsInfo(int id)
-        {
-            FileModel fileModel = new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt" };
-            return new DocumentInfo() { Id=id, linkTypeId = 1, url = "Sample", File = fileModel };
-        }
-        public static async Task<Documents.Models.Document> getInputDocumentData()
-        {
-            List<Documents.Models.DocumentsTranslation> documentsTranslations = new List<DocumentsTranslation>();
-            documentsTranslations.Add(new DocumentsTranslation()
-            {
-                Language = "en",
-                title = "tel",
-                description = "Sample"
-            });
-            return new Models.Document
-            {
-                Id = 1,
-                linkTypeId = 1,
-                docName = "sample",
-                url = "testurl",
-                Path = "testpath",
-                IsActive = true,
-                documentsTranslations= documentsTranslations,
-                dateCreated = DateTime.Now,
-                dateUpdated = DateTime.Now
-            };
-        }
-        public static async Task<List<Documents.Models.Document>> getInputDocumentsData()
-        {
-            List<Documents.Models.DocumentsTranslation> documentsTranslations = new List<DocumentsTranslation>();
-            documentsTranslations.Add(new DocumentsTranslation()
-            {
-                Language = "en",
-                title = "tel",
-                description="Sample"
-            });
-            List<Documents.Models.Document> Documents = new List<Models.Document>();
-            Documents.Add(new Models.Document
-            {
-                Id = 1,
-                linkTypeId = 1,
-                docName = "sample",
-                url = "testurl",
-                Path = "testpath",
-                IsActive = true,
-                documentsTranslations= documentsTranslations,
-                dateCreated = DateTime.Now,
-                dateUpdated = DateTime.Now
-            });
-            return Documents;
-        }
-
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Controllers/DocumentsController.cs

@@ -1,235 +0,0 @@
-using DamageAssesment.Api.Documents.Db;
-using DamageAssesment.Api.Documents.Interfaces;
-using DamageAssesment.Api.Documents.Models;
-using DamageAssesment.Api.Documents.Providers;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-
-namespace DamageAssesment.Api.Documents.Controllers
-{
-    [ApiController]
-    public class DocumentsController : ControllerBase
-    {
-        private readonly IDocumentsProvider documentsProvider;
-        private readonly IUploadService uploadService;
-
-        public DocumentsController(IDocumentsProvider documentsProvider,IUploadService uploadService)
-        {
-
-            this.documentsProvider = documentsProvider;
-            this.uploadService = uploadService; 
-
-        }
-        /// <summary>
-        /// Get all document link type.
-        /// </summary>
-        [HttpGet]
-        [Authorize(Roles = "admin")]
-        [Route("doculinks/types")]
-        public async Task<IActionResult> GetLinkTypesAsync()
-        {
-            var result = await this.documentsProvider.GetLinkTypesAsync();
-            if (result.IsSuccess)
-            {
-                return Ok(result.LinkTypes);
-            }
-            return NoContent();
-        }
-        /// <summary>
-        /// Get a document link type by id.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpGet]
-        [Route("doculinks/types/{id}")]
-        public async Task<IActionResult> GetLinkTypeAsync(int id)
-        {
-            var result = await this.documentsProvider.GetLinkTypeAsync(id);
-            if (result.IsSuccess)
-            {
-                return Ok(result.LinkType);
-            }
-            return NotFound();
-        }
-        /// <summary>
-        /// Update a existing document link type.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPut]
-        [Route("doculinks/types")]
-        public async Task<IActionResult> UpdateLinkType(Models.LinkType linkType)
-        {
-            if (linkType != null)
-            {
-                var result = await this.documentsProvider.UpdateLinkTypeAsync(linkType);
-                if (result.IsSuccess)
-                {
-                    return Ok(result.LinkType);
-                }
-                if (result.ErrorMessage == "Not Found")
-                    return NotFound(result.ErrorMessage);
-
-                return BadRequest(result.ErrorMessage);
-            }
-            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
-        }
-        /// <summary>
-        /// Create a new document link type.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPost]
-        [Route("doculinks/types")]
-        public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
-        {
-            if (linkType != null)
-            {
-                var result = await this.documentsProvider.PostLinkTypeAsync(linkType);
-                if (result.IsSuccess)
-                {
-                    return Ok(result.LinkType);
-                }
-                return BadRequest(result.ErrorMessage);
-            }
-            return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
-        }
-        /// <summary>
-        /// Delete a  existing document link type by id.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpDelete]
-        [Route("doculinks/types/{id}")]
-        public async Task<IActionResult> DeleteLinkType(int id)
-        {
-            var result = await this.documentsProvider.DeleteLinkTypeAsync(id);
-            if (result.IsSuccess)
-            {
-                return Ok(result.LinkType);
-            }
-            return NotFound();
-        }
-        /// <summary>
-        /// Get all documents.
-        /// </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)
-        {
-            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.documents);
-            }
-            return NoContent();
-        }
-        /// <summary>
-        /// Get all documents.
-        /// </summary>
-        /// 
-        //[Route("doculinks/{language:alpha}")]
-        //[Route("doculinks")]
-        //[HttpGet]
-        //public async Task<IActionResult> GetDocumentsAsync(string? language)
-        //{
-        //    var result = await this.documentsProvider.GetdocumentsAsync(language);
-        //    if (result.IsSuccess)
-        //    {
-        //        return Ok(result.documents);
-        //    }
-        //    return NoContent();
-        //}
-
-        /// <summary>
-        /// Get a document 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)
-        {
-            var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
-            if (result.IsSuccess)
-            {
-                return Ok(result.Document);
-            }
-            return NotFound();
-        }
-        /// <summary>
-        /// Upload new document.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPut]
-        [Route("doculinks/{id}")]
-        public async Task<IActionResult> UpdateDocument(int id,DocumentInfo documentInfo)
-        {
-            if (documentInfo != null)
-            {
-                var dbdoc = await this.documentsProvider.GetDocumentByidAsync(id);
-                if (dbdoc.IsSuccess)
-                {
-                    Models.Document document = uploadService.UpdateDocuments(dbdoc.Document, documentInfo);
-                    var result = await this.documentsProvider.UpdateDocumentAsync(id,document);
-                    if (result.IsSuccess)
-                    {
-                        return Ok(result.Document);
-                    }
-                    return NoContent();
-                }
-                return NotFound();
-            }
-            return BadRequest(documentInfo);
-        }
-        /// <summary>
-        /// update existing document.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpPost]
-        [Route("doculinks")]
-        public async Task<IActionResult> CreateDocument(DocumentInfo documentInfo)
-        {
-            try
-            {
-                if (documentInfo != null)
-                {
-                    var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Document document = uploadService.UploadDocument(documents.counter, documentInfo);
-                    var result = await this.documentsProvider.PostDocumentAsync(document);
-                    if (result.IsSuccess)
-                    {
-                        return Ok(result.Document);
-                    }
-                    return NoContent();
-                }
-                return BadRequest(documentInfo);
-            }
-            catch (Exception ex)
-            {
-                return BadRequest($"Internal server error: {ex}");
-            }
-        }
-        /// <summary>
-        /// Delete document by id.
-        /// </summary>
-        [Authorize(Roles = "admin")]
-        [HttpDelete]
-        [Route("doculinks/{id}")]
-        public async Task<IActionResult> DeleteDocument(int id)
-        {
-            // database soft delete
-            var result = await this.documentsProvider.DeleteDocumentAsync(id);
-            if (result.IsSuccess)
-            {
-                // deleting file from folder
-                uploadService.Movefile(result.Document.Path);
-                return Ok(result.Document);
-            }
-            return NotFound();
-        }
-        
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Db/DocumentDbContext.cs

@@ -1,30 +0,0 @@
-using Microsoft.AspNetCore.Identity;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.Documents.Db
-{
-    public class DocumentDbContext : DbContext
-    {
-        public DocumentDbContext(DbContextOptions options) : base(options)
-        {
-        }
-        public DbSet<Db.Document> Documents { get; set; }
-        public DbSet<Db.LinkType> LinkTypes { get; set; }
-        public DbSet<Db.DocumentsTranslation> DocumentsTranslations { get; set; }
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            base.OnModelCreating(modelBuilder);
-            modelBuilder.Entity<Document>()
-                .Property(item => item.Id)
-                .ValueGeneratedOnAdd();
-            modelBuilder.Entity<LinkType>()
-                .Property(item => item.Id)
-                .ValueGeneratedOnAdd();
-            modelBuilder.Entity<DocumentsTranslation>()
-                .Property(item => item.Id)
-                .ValueGeneratedOnAdd();
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Interfaces/IDocumentTypeProvider.cs

@@ -1,11 +0,0 @@
-namespace DamageAssesment.Api.Documents.Interfaces
-{
-    public interface ILinkTypesProvider
-    {
-        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int Id);
-        Task<(bool IsSuccess, IEnumerable<Models.LinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync();
-        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> PostLinkTypeAsync(Models.LinkType LinkType);
-        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(Models.LinkType LinkType);
-        Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> DeleteLinkTypeAsync(int Id);
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Interfaces/IDocumentsProvider.cs

@@ -1,18 +0,0 @@
-using DamageAssesment.Api.Documents.Models;
-
-namespace DamageAssesment.Api.Documents.Interfaces
-{
-    public interface IDocumentsProvider : ILinkTypesProvider
-    {
-        Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> GetDocumentAsync(int id, string? linktype, string? language);
-        Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> GetDocumentByidAsync(int id);
-       // Task<(bool IsSuccess, IEnumerable<Models.MultiLanDocument> documents, string ErrorMessage)> GetDocumnetsAsync(string? language);
-        Task<(bool IsSuccess, IEnumerable<Models.MultiLanDocument> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language);
-        Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> PostDocumentAsync(Models.Document Document);
-        Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> UpdateDocumentAsync(int id,Models.Document Document);
-        Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> DeleteDocumentAsync(int id);
-        Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
-
-
-    }
-}

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

@@ -1,12 +0,0 @@
-using DamageAssesment.Api.Documents.Models;
-
-namespace DamageAssesment.Api.Documents.Interfaces
-{
-    public interface IUploadService
-    {
-        Models.Document UploadDocument( int counter, DocumentInfo documentInfo);
-        public Models.Document UpdateDocuments( Models.Document document, DocumentInfo documentInfo);
-        void Deletefile(string path);
-        void Movefile(string path);
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Migrations/20230828165655_InitialDocumentCreate.Designer.cs

@@ -1,95 +0,0 @@
-// <auto-generated />
-using System;
-using DamageAssesment.Api.Documents.Db;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace DamageAssesment.Api.Documents.Migrations
-{
-    [DbContext(typeof(DocumentDbContext))]
-    [Migration("20230828165655_InitialDocumentCreate")]
-    partial class InitialDocumentCreate
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Path")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("dateCreated")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime>("dateUpdated")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("description")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("docName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("linkTypeId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("title")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("url")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Documents");
-                });
-
-            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("TypeText")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("LinkTypes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Migrations/20230828165655_InitialDocumentCreate.cs

@@ -1,60 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace DamageAssesment.Api.Documents.Migrations
-{
-    /// <inheritdoc />
-    public partial class InitialDocumentCreate : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Documents",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    title = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    linkTypeId = table.Column<int>(type: "int", nullable: false),
-                    description = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    docName = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    url = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Path = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    IsActive = table.Column<bool>(type: "bit", nullable: false),
-                    dateCreated = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    dateUpdated = table.Column<DateTime>(type: "datetime2", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Documents", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "LinkTypes",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    TypeText = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    IsActive = table.Column<bool>(type: "bit", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_LinkTypes", x => x.Id);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Documents");
-
-            migrationBuilder.DropTable(
-                name: "LinkTypes");
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Migrations/20230830200432_DocumentTranslation.Designer.cs

@@ -1,118 +0,0 @@
-// <auto-generated />
-using System;
-using DamageAssesment.Api.Documents.Db;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace DamageAssesment.Api.Documents.Migrations
-{
-    [DbContext(typeof(DocumentDbContext))]
-    [Migration("20230830200432_DocumentTranslation")]
-    partial class DocumentTranslation
-    {
-        /// <inheritdoc />
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Path")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("dateCreated")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime>("dateUpdated")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("docName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("linkTypeId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("url")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Documents");
-                });
-
-            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.DocumentsTranslation", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("DocumentId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("description")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("title")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DocumentsTranslations");
-                });
-
-            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<bool>("IsAttachment")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("TypeText")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("LinkTypes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Migrations/20230830200432_DocumentTranslation.cs

@@ -1,70 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace DamageAssesment.Api.Documents.Migrations
-{
-    /// <inheritdoc />
-    public partial class DocumentTranslation : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "description",
-                table: "Documents");
-
-            migrationBuilder.DropColumn(
-                name: "title",
-                table: "Documents");
-
-            migrationBuilder.AddColumn<bool>(
-                name: "IsAttachment",
-                table: "LinkTypes",
-                type: "bit",
-                nullable: false,
-                defaultValue: false);
-
-            migrationBuilder.CreateTable(
-                name: "DocumentsTranslations",
-                columns: table => new
-                {
-                    Id = table.Column<int>(type: "int", nullable: false)
-                        .Annotation("SqlServer:Identity", "1, 1"),
-                    DocumentId = table.Column<int>(type: "int", nullable: false),
-                    title = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    description = table.Column<string>(type: "nvarchar(max)", nullable: false),
-                    Language = table.Column<string>(type: "nvarchar(max)", nullable: false)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_DocumentsTranslations", x => x.Id);
-                });
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "DocumentsTranslations");
-
-            migrationBuilder.DropColumn(
-                name: "IsAttachment",
-                table: "LinkTypes");
-
-            migrationBuilder.AddColumn<string>(
-                name: "description",
-                table: "Documents",
-                type: "nvarchar(max)",
-                nullable: false,
-                defaultValue: "");
-
-            migrationBuilder.AddColumn<string>(
-                name: "title",
-                table: "Documents",
-                type: "nvarchar(max)",
-                nullable: false,
-                defaultValue: "");
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Migrations/DocumentDbContextModelSnapshot.cs

@@ -1,115 +0,0 @@
-// <auto-generated />
-using System;
-using DamageAssesment.Api.Documents.Db;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-#nullable disable
-
-namespace DamageAssesment.Api.Documents.Migrations
-{
-    [DbContext(typeof(DocumentDbContext))]
-    partial class DocumentDbContextModelSnapshot : ModelSnapshot
-    {
-        protected override void BuildModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "7.0.9")
-                .HasAnnotation("Relational:MaxIdentifierLength", 128);
-
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
-
-            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("Path")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<DateTime>("dateCreated")
-                        .HasColumnType("datetime2");
-
-                    b.Property<DateTime>("dateUpdated")
-                        .HasColumnType("datetime2");
-
-                    b.Property<string>("docName")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<int>("linkTypeId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("url")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Documents");
-                });
-
-            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.DocumentsTranslation", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<int>("DocumentId")
-                        .HasColumnType("int");
-
-                    b.Property<string>("Language")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("description")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.Property<string>("title")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("DocumentsTranslations");
-                });
-
-            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("int");
-
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
-
-                    b.Property<bool>("IsActive")
-                        .HasColumnType("bit");
-
-                    b.Property<bool>("IsAttachment")
-                        .HasColumnType("bit");
-
-                    b.Property<string>("TypeText")
-                        .IsRequired()
-                        .HasColumnType("nvarchar(max)");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("LinkTypes");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/Document.cs

@@ -1,28 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.Documents.Models
-{
-    public class Document : BaseDocument
-    {
-        public List<DocumentsTranslation> documentsTranslations { get; set; }
-    }
-    public class MultiLanDocument:BaseDocument
-    {
-        public object titles { get; set; }
-        public object description { get; set; }
-        public string LinkType { get; set; }
-    }
-    public class BaseDocument
-    {
-        public int Id { get; set; }
-
-        public int linkTypeId { get; set; }
-        public string docName { get; set; }
-
-        public string url { get; set; }
-        public string Path { get; set; }
-        public bool IsActive { get; set; }
-        public DateTime dateCreated { get; set; }
-        public DateTime dateUpdated { get; set; }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/DocumentInfo.cs

@@ -1,19 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace DamageAssesment.Api.Documents.Models
-{
-    public class DocumentInfo
-    {
-        public int Id { get; set; }
-        public int linkTypeId { get; set; }
-        public string url { get; set; }
-        public List<DocumentsTranslation> documentsTranslations { get; set; }
-        public FileModel? File { get; set; }
-    }
-    public class FileModel
-    {
-        public string? FileName { get; set; }
-        public string? FileContent { get; set; }
-        public string? FileExtension { get; set; }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Models/LinkType.cs

@@ -1,12 +0,0 @@
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.Documents.Models
-{
-    public class LinkType
-    {
-        public int Id { get; set; }
-        public string TypeText { get; set; }
-        public bool IsActive { get; set; }
-        public bool IsAttachment { get; set; }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Profiles/DocumentProfile.cs

@@ -1,19 +0,0 @@
-using AutoMapper;
-
-namespace DamageAssesment.Api.Documents.Profiles
-{
-    public class DocumentProfile : AutoMapper.Profile
-    {
-        public DocumentProfile()
-        {
-            CreateMap<Db.Document, Models.MultiLanDocument>().ForMember(dest => dest.LinkType,
-                opt => opt.MapFrom(src => src.LinkType.TypeText)); ;
-            CreateMap<Db.Document, Models.Document>();
-            CreateMap<Models.Document, Db.Document>();
-            CreateMap<Db.LinkType, Models.LinkType>();
-            CreateMap<Models.LinkType, Db.LinkType>();
-            CreateMap<Db.DocumentsTranslation, Models.DocumentsTranslation>();
-            CreateMap<Models.DocumentsTranslation, Db.DocumentsTranslation>();
-        }
-    }
-}

DamageAssesmentApi/DamageAssesment.Api.Documents/Program.cs

@@ -1,94 +0,0 @@
-using DamageAssesment.Api.Documents.Db;
-using DamageAssesment.Api.Documents.Interfaces;
-using DamageAssesment.Api.Documents.Providers;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.IdentityModel.Tokens;
-using System.Reflection;
-using System.Text;
-using Microsoft.OpenApi.Models;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
-builder.Services.AddAuthentication(item =>
-{
-    item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-    item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme;
-}).AddJwtBearer(item =>
-{
-    item.RequireHttpsMetadata = true;
-    item.SaveToken = true;
-    item.TokenValidationParameters = new TokenValidationParameters()
-    {
-        ValidateIssuerSigningKey = true,
-        IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)),
-        ValidateIssuer = false,
-        ValidateAudience = false,
-        ClockSkew = TimeSpan.Zero
-    };
-});
-builder.Services.AddControllers();
-builder.Services.AddSwaggerGen(options =>
-{
-    // 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);
-});
-// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
-builder.Services.AddEndpointsApiExplorer();
-//builder.Services.AddSwaggerGen();
-builder.Services.AddScoped<IDocumentsProvider, documentsProvider>();
-builder.Services.AddScoped<IUploadService, UploadService>();
-builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
-builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
-builder.Services.AddDbContext<DocumentDbContext>(option =>
-{
-    option.UseInMemoryDatabase("DocumentConnection");
-});
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (app.Environment.IsDevelopment())
-{
-    app.UseSwagger();
-    app.UseSwaggerUI();
-}
-
-app.UseAuthentication();
-app.UseAuthorization();
-
-app.MapControllers();
-
-app.Run();

DamageAssesmentApi/DamageAssesment.Api.Documents/Providers/DocumentsProvider.cs

@@ -1,434 +0,0 @@
-using AutoMapper;
-using DamageAssesment.Api.Documents.Db;
-using DamageAssesment.Api.Documents.Interfaces;
-using DamageAssesment.Api.Documents.Models;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using System;
-using System.Diagnostics.Eventing.Reader;
-using System.Reflection.Metadata;
-
-namespace DamageAssesment.Api.Documents.Providers
-{
-
-
-    public class documentsProvider : IDocumentsProvider
-    {
-        private DocumentDbContext DocumentDbContext;
-        private ILogger<documentsProvider> logger;
-        private IUploadService uploadservice;
-        private IMapper mapper;
-
-        public documentsProvider(DocumentDbContext DocumentDbContext, ILogger<documentsProvider> logger, IMapper mapper, IUploadService uploadservice)
-        {
-            this.DocumentDbContext = DocumentDbContext;
-            this.logger = logger;
-            this.mapper = mapper;
-            this.uploadservice = uploadservice;
-            SeedData();
-        }
-
-
-
-        private void SeedData()
-        {
-            if (!DocumentDbContext.LinkTypes.Any())
-            {
-                DocumentDbContext.LinkTypes.Add(new Db.LinkType() {TypeText = "Forms",IsActive=true, IsAttachment=true });
-                DocumentDbContext.LinkTypes.Add(new Db.LinkType() {TypeText = "Communiques",IsActive = true,IsAttachment=false });
-                DocumentDbContext.LinkTypes.Add(new Db.LinkType() {TypeText = "Memos",IsActive = true,IsAttachment=true });
-                DocumentDbContext.SaveChanges();
-            }
-            if (!DocumentDbContext.Documents.Any())
-            {
-                FileModel fileModel = new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt" };
-                DocumentInfo documentInfo = new DocumentInfo() { linkTypeId = 1, url = "Sample",  File = fileModel };
-                Models.Document document = uploadservice.UploadDocument(0, documentInfo);
-                DocumentDbContext.Documents.Add(mapper.Map<Models.Document, Db.Document>(document));
-                DocumentDbContext.SaveChanges();
-            }
-            if (!DocumentDbContext.DocumentsTranslations.Any())
-            {
-                Db.DocumentsTranslation documents = new Db.DocumentsTranslation { DocumentId = 1, title = "Test", description = "ss", Language = "en" };
-                DocumentDbContext.DocumentsTranslations.Add(documents);
-                DocumentDbContext.SaveChanges();
-            }
-        }
-        public List<Models.DocumentsTranslation> GetDocumentTranslations(int id, string? language)
-        {
-            List<Models.DocumentsTranslation> QuestionTranslations;
-            if (string.IsNullOrEmpty(language))
-            {
-                QuestionTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
-                    DocumentDbContext.DocumentsTranslations.AsNoTracking().Where(a => a.DocumentId == id).ToList());
-            }
-            else
-            {
-                QuestionTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
-                DocumentDbContext.DocumentsTranslations.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList());
-            }
-            return QuestionTranslations;
-        }
-        public MultiLanDocument CreateMultiLanguageObject(List<Models.DocumentsTranslation> questions)
-        {
-            MultiLanDocument MultiLanguage = new MultiLanDocument();
-            Dictionary<string, string> dicttitle = new Dictionary<string, string>();
-            Dictionary<string, string> dictdesc = new Dictionary<string, string>();
-            foreach (Models.DocumentsTranslation item in questions)
-            {
-                dicttitle.Add(item.Language, item.title);
-                dictdesc.Add(item.Language, item.description);
-            }
-            MultiLanguage.titles = dicttitle;
-            MultiLanguage.description = dictdesc;
-            return MultiLanguage;
-        }
-        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanDocument> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language)
-        {
-
-            try
-            {
-                logger?.LogInformation("Query Question");
-                var documents=new List<Db.Document>();
-                if(String.IsNullOrEmpty(linkType))
-                    documents = await DocumentDbContext.Documents.Include(a=>a.LinkType).AsNoTracking().Where(q => q.IsActive).ToListAsync();
-                else
-                    documents = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive &&
-                     q.linkTypeId == (DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.TypeText.ToLower() == linkType.ToLower()).Select(a => a.Id).FirstOrDefault())).ToListAsync();
-                if (documents != null)
-                {
-                    var result = mapper.Map<List<Db.Document>, List<Models.MultiLanDocument>>(documents);
-                    foreach (var item in result)
-                    {
-                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
-                        item.titles = multilan.titles;
-                        item.description = multilan.description;
-                    }
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-
-        }
-        //public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanDocument> documents, string ErrorMessage)> GetDocumnetsAsync(string? language)
-        //{
-
-        //    try
-        //    {
-        //        logger?.LogInformation("Query Question");
-        //        var documents = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive).ToListAsync();
-        //        if (documents != null)
-        //        {
-        //            logger?.LogInformation($"{documents.Count} Document(s) found");
-        //            var result = mapper.Map<List<Db.Document>, List<Models.MultiLanDocument>>(documents);
-        //            foreach (var item in result)
-        //            {
-        //                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
-        //                item.titles = multilan.titles;
-        //                item.description = multilan.description;
-        //            }
-        //            return (true, result, null);
-        //        }
-        //        return (false, null, "Not found");
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        logger?.LogError(ex.ToString());
-        //        return (false, null, ex.Message);
-        //    }
-
-        //}
-        public async Task<(bool IsSuccess, Models.Document Document, string ErrorMessage)> GetDocumentByidAsync(int id)
-        {
-            try
-            {
-                logger?.LogInformation("Query LinkType");
-                var Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().FirstOrDefaultAsync(q => q.Id == id && q.IsActive);
-                if (Document != null)
-                {
-                    logger?.LogInformation($"{Document} customer(s) found");
-                    var result = mapper.Map<Db.Document, Models.Document>(Document); 
-                    result.documentsTranslations = mapper.Map<List<Db.DocumentsTranslation>, List<Models.DocumentsTranslation>>(
-                            DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        //added linktype filter 
-        public async Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> GetDocumentAsync(int id, string? linkType, string? language)
-        {
-            try
-            {
-                logger?.LogInformation("Query LinkType");
-                //var Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().FirstOrDefaultAsync(q => q.Id == id && q.IsActive);
-                var Document = new Db.Document();
-                if (String.IsNullOrEmpty(linkType))
-                    Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive&&q.Id==id).FirstOrDefaultAsync();
-                else
-                    Document = await DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(q => q.IsActive && q.Id == id &&
-                     q.linkTypeId == (DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.TypeText.ToLower() == linkType.ToLower()).Select(a => a.Id).FirstOrDefault())).FirstOrDefaultAsync();
-                if (Document != null)
-                {
-                    logger?.LogInformation($"{Document} customer(s) found");
-                    var result = mapper.Map<Db.Document, Models.MultiLanDocument>(Document);
-                    var multilan = CreateMultiLanguageObject(GetDocumentTranslations(result.Id, language));
-                    result.titles = multilan.titles;
-                    result.description = multilan.description;
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> PostDocumentAsync(Models.Document Document)
-        {
-            try
-            {
-                var document = mapper.Map<Models.Document, Db.Document>(Document);
-                DocumentDbContext.Documents.Add(document);
-                DocumentDbContext.SaveChanges();
-                var dbtranslation = mapper.Map<List<Models.DocumentsTranslation>, List<Db.DocumentsTranslation>>(Document.documentsTranslations);
-                dbtranslation.ForEach(i => i.DocumentId = document.Id);
-                DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
-                DocumentDbContext.SaveChanges();
-                var result = mapper.Map<Db.Document, Models.MultiLanDocument>(document);
-                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(document.Id, ""));
-                result.titles = multilan.titles;
-                result.description = multilan.description;
-                return (true, result, null);
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> UpdateDocumentAsync(int id,Models.Document Document)
-        {
-            try
-            {
-                if (Document != null)
-                {
-                    var existing = DocumentDbContext.Documents.AsNoTracking().FirstOrDefault(x => x.Id == id);
-                    if (existing != null)
-                    {
-                        Document.Id = existing.Id;
-                        var document = mapper.Map<Models.Document, Db.Document>(Document);
-                        DocumentDbContext.Documents.Update(document);
-                        DocumentDbContext.SaveChanges();
-                        var oldtranslations = DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == Document.Id).ToList();
-                        if (oldtranslations != null)
-                            DocumentDbContext.DocumentsTranslations.RemoveRange(oldtranslations);
-                        var dbtranslation = mapper.Map<List<Models.DocumentsTranslation>, List<Db.DocumentsTranslation>>(Document.documentsTranslations);
-                        dbtranslation.ForEach(i => i.DocumentId = Document.Id);
-                        DocumentDbContext.DocumentsTranslations.AddRange(dbtranslation);
-                        DocumentDbContext.SaveChanges();
-                        var result = mapper.Map<Db.Document, Models.MultiLanDocument>(document);
-                        var multilan = CreateMultiLanguageObject(GetDocumentTranslations(document.Id, ""));
-                        result.titles = multilan.titles;
-                        result.description = multilan.description;
-                        return (true, result, "Successful");
-                    }
-                    else
-                    {
-                        logger?.LogInformation($"{Document} Not found");
-                        return (false, null, "Not Found");
-                    }
-                }
-                else
-                {
-                    logger?.LogInformation($"{Document} Bad Request");
-                    return (false, null, "Bad request");
-                }
-
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, Models.MultiLanDocument Document, string ErrorMessage)> DeleteDocumentAsync(int id)
-        {
-
-            try
-            {
-                Db.Document Document = DocumentDbContext.Documents.Include(a => a.LinkType).AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
-                if (Document == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                var result = mapper.Map<Db.Document, Models.MultiLanDocument>(Document);
-                var multilan = CreateMultiLanguageObject(GetDocumentTranslations(Document.Id, ""));
-                result.titles = multilan.titles;
-                result.description = multilan.description;
-                Document.IsActive = false;
-                DocumentDbContext.Documents.Update(Document);
-                DocumentDbContext.SaveChanges();
-                return (true, result, $"DocumentId {id} deleted Successfuly");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-
-        public async Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter()
-        {
-            try
-            {
-                int AttachmentId = DocumentDbContext.Documents.Max(a => a.Id);
-                return (true, AttachmentId, "");
-            }
-            catch (Exception ex)
-            {
-                return (false, 0, ex.Message);
-            }
-        }
-
-        //Link Type methods
-        public async Task<(bool IsSuccess, IEnumerable<Models.LinkType> LinkTypes, string ErrorMessage)> GetLinkTypesAsync()
-        {
-
-            try
-            {
-                logger?.LogInformation("Query Question");
-                var LinkType = await DocumentDbContext.LinkTypes.AsNoTracking().Where(q=>q.IsActive).ToListAsync();
-                if (LinkType != null)
-                {
-                    logger?.LogInformation($"{LinkType.Count} LinkTypes(s) found");
-                    var result = mapper.Map<IEnumerable<Db.LinkType>, IEnumerable<Models.LinkType>>(LinkType);
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-
-        }
-        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> GetLinkTypeAsync(int Id)
-        {
-            try
-            {
-                logger?.LogInformation("Query LinkType");
-                var LinkType = await DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id&&q.IsActive);
-                if (LinkType != null)
-                {
-                    logger?.LogInformation($"{LinkType} customer(s) found");
-                    var result = mapper.Map<Db.LinkType, Models.LinkType>(LinkType);
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> PostLinkTypeAsync(Models.LinkType LinkType)
-        {
-            try
-            {
-                logger?.LogInformation("Query LinkType");
-                if (!LinkTypeExists(LinkType.Id))
-                {
-                    var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
-                    DocumentDbContext.LinkTypes.Add(dbLink);
-                    DocumentDbContext.SaveChanges();
-                    var result = mapper.Map<Db.LinkType, Models.LinkType>(dbLink);
-                    return (true, result, null);
-                }
-                return (false, null, "LinkType is already exits");
-            }
-            catch (Exception ex)
-            {
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> UpdateLinkTypeAsync(Models.LinkType LinkType)
-        {
-            try
-            {
-                if (LinkType != null)
-                {
-                    var existing = DocumentDbContext.LinkTypes.AsNoTracking().FirstOrDefault(x => x.Id == LinkType.Id);
-                    if (existing != null)
-                    {
-                        var dbLink = mapper.Map<Models.LinkType, Db.LinkType>(LinkType);
-                        DocumentDbContext.LinkTypes.Update(dbLink);
-                        DocumentDbContext.SaveChanges();
-                        return (true, mapper.Map<Db.LinkType, Models.LinkType>(dbLink), "Successful");
-                    }
-                    else
-                    {
-                        logger?.LogInformation($"{LinkType} Not found");
-                        return (false, null, "Not Found");
-                    }
-                }
-                else
-                {
-                    logger?.LogInformation($"{LinkType} Bad Request");
-                    return (false, null, "Bad request");
-                }
-
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, Models.LinkType LinkType, string ErrorMessage)> DeleteLinkTypeAsync(int Id)
-        {
-
-            try
-            {
-                Db.LinkType LinkType = DocumentDbContext.LinkTypes.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
-                if (LinkType == null)
-                {
-                    return (false, null, "Not Found");
-                }
-                LinkType.IsActive = false;
-                DocumentDbContext.LinkTypes.Update(LinkType);
-                DocumentDbContext.SaveChanges();
-                return (true, mapper.Map<Db.LinkType, Models.LinkType>(LinkType), $"LinkTypeId {Id} deleted Successfuly");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, null, ex.Message);
-            }
-        }
-        private bool LinkTypeExists(int id)
-        {
-            return DocumentDbContext.LinkTypes.AsNoTracking().Count(e => e.Id == id) > 0;
-        }
-    }
-}

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

@@ -1,123 +0,0 @@
-using AutoMapper;
-using Azure;
-using DamageAssesment.Api.Documents.Db;
-using DamageAssesment.Api.Documents.Interfaces;
-using DamageAssesment.Api.Documents.Models;
-using Microsoft.AspNetCore.Http;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using System.Diagnostics.Metrics;
-using System.Net.Http;
-using System.Security.AccessControl;
-using System.Security.Principal;
-
-namespace DamageAssesment.Api.Documents.Providers
-{
-    public class UploadService : IUploadService
-    {
-        private ILogger<UploadService> logger;
-        private IMapper mapper;
-        private string uploadpath = "";
-        private string Deletepath = "";
-        public UploadService(IConfiguration configuration, ILogger<UploadService> logger, IMapper mapper)
-        {
-            this.logger = logger;
-            this.mapper = mapper;
-            uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
-            Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
-        }
-
-        public Models.Document UploadDocument(int counter, DocumentInfo documentInfo)
-        {
-            Models.Document Documents = new Models.Document();
-            try 
-            {
-                string path = "", UserfileName="";
-                if (documentInfo.File != null)
-                {
-                    counter++;
-                    var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
-                    if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
-                        Directory.CreateDirectory(fullDirectoryPath);
-                    UserfileName = Path.GetFileName(documentInfo.File.FileName);
-                    var fileName = String.Format("Document_{0}{1}", counter, documentInfo.File.FileExtension);
-                    path = Path.Combine(fullDirectoryPath, fileName);
-                    File.WriteAllBytes(path, Convert.FromBase64String(documentInfo.File.FileContent));
-                }
-                Documents=new Models.Document (){ linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations = documentInfo.documentsTranslations,
-                    docName = UserfileName, 
-                    url = documentInfo.url, Path = path,IsActive =true,dateCreated=DateTime.Now,dateUpdated=DateTime.Now};
-            
-                return Documents;
-            }
-            catch (Exception ex) {
-                return new Models.Document();
-            }
-
-           
-        }
-        public Models.Document UpdateDocuments(Models.Document document, DocumentInfo documentInfo)
-        {
-            try
-            {
-                Deletefile(document.Path);
-                var fullDirectoryPath = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
-                if (!Directory.Exists(fullDirectoryPath)) //Create deirectory if does not exist
-                    Directory.CreateDirectory(fullDirectoryPath);
-
-                string path = "", UserfileName = "";
-                if (documentInfo.File != null)
-                {
-                    UserfileName = Path.GetFileName(documentInfo.File.FileName);
-                    var fileName = String.Format("Document_{0}{1}", documentInfo.Id, documentInfo.File.FileExtension);
-                    path = Path.Combine(fullDirectoryPath, fileName);
-                    File.WriteAllBytes(path, Convert.FromBase64String(documentInfo.File.FileContent));
-                }
-                Models.Document Documents = new Models.Document()
-                {
-                    Id = documentInfo.Id,
-                    linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations=documentInfo.documentsTranslations,
-                    docName = UserfileName,
-                    url = documentInfo.url,
-                    Path = path,
-                    IsActive = true,
-                    dateCreated = document.dateCreated,
-                    dateUpdated = DateTime.Now
-                };
-
-                return Documents;
-            }
-
-             catch (Exception ex) {
-                return new Models.Document();
-            }
-        }
-        public void Deletefile(string path)
-        {
-            if (path != "")
-            {
-                FileInfo file = new FileInfo(path);
-                if (file?.Exists??false)//check file exsit or not  
-                {
-                    file.Delete();
-                }
-            }
-        }
-        public void Movefile(string path)
-        {
-            if (path != "")
-            {
-                var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), Deletepath);
-                if (!Directory.Exists(pathToSave)) //Create deirectory if does not exist
-                    Directory.CreateDirectory(pathToSave);
-                FileInfo file = new FileInfo(path);
-                if (file?.Exists ?? false)//check file exsit or not  
-                {
-                    string filename = file.Name.Replace(file.Extension, " ") + DateTime.Now.ToShortDateString().Replace("/","_") + file.Extension;
-                    file.MoveTo(pathToSave+"\\"+ filename);
-                }
-            }
-        }
-    }
-}

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

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

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,8 +18,8 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// <summary>
         /// GET request for retrieving employees.
         /// </summary>
-        [Authorize(Roles = "admin")]
+
-        [HttpGet("Employees")]
+        [HttpGet("employees")]
         public async Task<ActionResult> GetEmployeesAsync()
         {
 
@@ -36,8 +35,8 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// <summary>
         /// GET request for retrieving an employee by ID.
         /// </summary>
-        [Authorize(Roles = "admin")]
+        
-        [HttpGet("Employees/{id}")]
+        [HttpGet("employees/{id}")]
         public async Task<ActionResult> GetEmployeeByIdAsync(int id)
         {
 
@@ -49,13 +48,12 @@ 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}")]
-        [HttpPut("Employees/{id}")]
         public async Task<IActionResult> UpdateEmployee(int id, Models.Employee Employee)
         {
             if (Employee != null)
@@ -77,8 +75,7 @@ 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")]
-        [HttpPost("Employees")]
         public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
         {
             if (Employee != null)
@@ -96,8 +93,7 @@ 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}")]
-        [HttpDelete("Employees/{id}")]
         public async Task<IActionResult> DeleteEmployee(int id)
         {
             var result = await this.EmployeeProvider.DeleteEmployeeAsync(id);

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

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

DamageAssesmentApi/DamageAssesment.Api.Employees/Providers/EmployeesProvider.cs

@@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Providers
             this.EmployeeDbContext = EmployeeDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            // SeedData();
+          //  SeedData();
         }
 
         public async Task<(bool IsSuccess, IEnumerable<Models.Employee> Employees, string ErrorMessage)> GetEmployeesAsync()
@@ -77,7 +77,8 @@ namespace DamageAssesment.Api.Employees.Providers
                     EmployeeDbContext.Employees.Add(_employee);
                     Employee.Id = _employee.Id;
                     EmployeeDbContext.SaveChanges();
-                    return (true, Employee, null);
+                    //return (true, Employee, null);
+                    return (true, mapper.Map<Db.Employee, Models.Employee>(_employee), null);
                 }
                 return (false, null, "Employee code is already exits");
             }
@@ -156,12 +157,12 @@ namespace DamageAssesment.Api.Employees.Providers
         {
             if (!EmployeeDbContext.Employees.Any())
             {
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 1, EmployeeCode = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "10101", Name = "David", Email = "david@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 2, EmployeeCode = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "20202", Name = "Smith", Email = "smith@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 3, EmployeeCode = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30), IsActive = true, PreferredLanguage = "fr" });
+                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 3, EmployeeCode = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30), IsActive = true, PreferredLanguage = "fr" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 4, EmployeeCode = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20), IsActive = true, PreferredLanguage = "en" });
+                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 4, EmployeeCode = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20), IsActive = true, PreferredLanguage = "en" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" });
+                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 6, EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), IsActive = true, PreferredLanguage = "es" });
+                //EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 6, EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), IsActive = true, PreferredLanguage = "es" });
                 EmployeeDbContext.SaveChanges();
             }
 

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

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

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

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

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

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

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

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

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

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

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

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

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

@@ -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,12 +148,13 @@ namespace DamageAssesment.Api.Locations.Providers
         {
             if (!locationDbContext.Locations.Any())
             {
-                locationDbContext.Locations.Add(new Db.Location() { Id = 1, LocationCode = "Loc1", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 1", MaintenanceCenter = "1", SchoolType = "US" });
+                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() { Id = 2, LocationCode = "Loc2", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 2", MaintenanceCenter = "1", SchoolType = "US" });
+                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() { Id = 3, LocationCode = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
+                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 = 4, LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
+                //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 = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", 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 = 6, LocationCode = "Loc6", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 6", 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" });
+                //locationDbContext.Locations.Add(new Db.Location() { Id = 6, LocationCode = "Loc6", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
                 locationDbContext.SaveChanges();
             }
 

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

@@ -16,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Providers
             this.locationDbContext = regionDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            //SeedData();
+          //  SeedData();
         }
 
         public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(int Id)
@@ -165,9 +165,11 @@ namespace DamageAssesment.Api.Locations.Providers
         {
             if (!locationDbContext.Regions.Any())
             {
-                locationDbContext.Regions.Add(new Db.Region() { Id = 1, Name = "North", Abbreviation = "N" });
+                locationDbContext.Regions.Add(new Db.Region() { Name = "North", Abbreviation = "N" });
-                locationDbContext.Regions.Add(new Db.Region() { Id = 2, Name = "South", Abbreviation = "S" });
+                locationDbContext.Regions.Add(new Db.Region() { Name = "Central", Abbreviation = "C" });
-                locationDbContext.Regions.Add(new Db.Region() { Id = 3, Name = "Central", Abbreviation = "C" });
+                locationDbContext.Regions.Add(new Db.Region() { Name = "South", Abbreviation = "S" });
+                locationDbContext.Regions.Add(new Db.Region() { Name = "Charter Schools", Abbreviation = "CS" });
+                locationDbContext.Regions.Add(new Db.Region() { Name = "Alternate and Special Centers", Abbreviation = "AC" });
                 locationDbContext.SaveChanges();
             }
         }

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

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

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

@@ -1,5 +1,5 @@
 using DamageAssesment.Api.Questions.Interfaces;
-using Microsoft.AspNetCore.Authorization;
+using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
@@ -11,16 +11,18 @@ namespace DamageAssesment.Api.Questions.Controllers
 
         public QuestionsController(IQuestionsProvider questionsProvider)
         {
+
             this.questionsProvider = questionsProvider;
+
         }
+
         /// <summary>
         /// GET request for retrieving questions.
         /// </summary>
 
-        //get all questions
+        // get all questions
-        [Authorize(Roles = "admin,survey,user,report")]
+        [Route("questions")]
-        [Route("Questions")]
+        [Route("questions/{language:alpha}")]
-        [Route("Questions/{language:alpha}")]
         [HttpGet]
         public async Task<IActionResult> GetQuestionsAsync(string? language)
         {
@@ -36,9 +38,8 @@ 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}/{language:alpha}")]
+        [Route("questions/{id:int}")]
-        [Route("Questions/{id:int}")]
         [HttpGet]
         public async Task<IActionResult> GetQuestionByIdAsync(int id, string? language)
         {
@@ -55,9 +56,8 @@ 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}")]
+        [Route("questions/bysurvey/{surveyId:int}/{language:alpha}")]
-        [Route("Questions/BySurvey/{surveyId:int}/{language:alpha}")]
         [HttpGet]
         public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? language)
         {
@@ -72,8 +72,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// PUT request for updating a question (multilingual).
         /// </summary>
 
-        [Authorize(Roles = "admin")]
+        [HttpPut("questions")]
-        [HttpPut("Questions")]
         public async Task<IActionResult> UpdateQuestion(Models.Question question)
         {
             if (question != null)
@@ -91,11 +90,50 @@ namespace DamageAssesment.Api.Questions.Controllers
             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
         }
         /// <summary>
+        /// POST request for creating a multiple question (multilingual).
+        /// </summary>
+        [HttpPost("questions/multiple")]
+        public async Task<IActionResult> CreateQuestions(List<Models.Question> questions)
+        {
+            if (questions != null)
+            {
+                var result = await this.questionsProvider.PostQuestionsAsync(questions);
+                if (result.IsSuccess)
+                {
+                    return Ok(result.Question);
+                }
+                if (result.ErrorMessage == "Not Found")
+                    return NotFound(result.ErrorMessage);
+
+                return BadRequest(result.ErrorMessage);
+            }
+            return CreatedAtRoute("DefaultApi",questions);
+        }
+        /// <summary>
+        /// 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);
+        }
+        /// <summary>
         /// POST request for creating a new question (multilingual).
         /// </summary>
 
-        [Authorize(Roles = "admin")]
+        [HttpPost("questions")]
-        [HttpPost("Questions")]
         public async Task<IActionResult> CreateQuestion(Models.Question question)
         {
             if (question != null)
@@ -113,8 +151,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question based on ID.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
+        [HttpDelete("questions/{id}")]
-        [HttpDelete("Questions/{id}")]
         public async Task<IActionResult> DeleteQuestion(int id)
         {
             var result = await this.questionsProvider.DeleteQuestionAsync(id);
@@ -129,9 +166,8 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving question categories.
         /// </summary>
 
-        [Authorize(Roles = "admin,user,report")]
+        [HttpGet("questions/categories")]
-        [HttpGet("Questions/Categories")]
+        [HttpGet("questions/categories/{language:alpha}")]
-        [HttpGet("Questions/Categories/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoriesAsync(string? language)
         {
             var result = await this.questionsProvider.GetQuestionCategoriesAsync(language);
@@ -144,9 +180,9 @@ 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}")]
-        [HttpGet("Questions/Categories/{id:int}/{language:alpha}")]
+        [HttpGet("questions/categories/{id:int}/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language)
         {
             var result = await this.questionsProvider.GetQuestionCategoryAsync(id, language);
@@ -161,8 +197,8 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// PUT request for updating a question category.
         /// </summary>
-        [Authorize(Roles = "admin,survey,report")]
+
-        [HttpPut("Questions/Categories")]
+        [HttpPut("questions/categories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -183,8 +219,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question category.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
+        [HttpPost("questions/categories")]
-        [HttpPost("Questions/Categories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -202,8 +237,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question category based on ID.
         /// </summary>
 
-        [Authorize(Roles = "admin")]
+        [HttpDelete("questions/categories/{id}")]
-        [HttpDelete("Questions/Categories/{id}")]
         public async Task<IActionResult> DeleteQuestionCategory(int id)
         {
             var result = await this.questionsProvider.DeleteQuestionCategoryAsync(id);

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

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

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

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

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

@@ -1,8 +1,10 @@
 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/QuestionType.cs

@@ -1,7 +1,9 @@
 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,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Questions.Db
 {
+    [Table("QuestionTrans")]
     public class QuestionsTranslation
     {
         [Key]

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

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

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

@@ -19,68 +19,172 @@ namespace DamageAssesment.Api.Questions.Providers
             this.questionDbContext = questionDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+           // SeedData();
         }
 
         public void SeedData()
         {
-
-            if (!questionDbContext.QuestionsTranslations.Any())
-            {
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 1, QuestionId = 1, QuestionText = "Can You Open ?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 2, QuestionId = 1, QuestionText = "Peux-tu ouvrir ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 3, QuestionId = 2, QuestionText = "Are the grounds flodded ?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 4, QuestionId = 2, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 5, QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 6, QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 7, QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 8, QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 9, QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
-                questionDbContext.SaveChanges();
-            }
-            if (!questionDbContext.Questions.Any())
-            {
-                questionDbContext.Questions.Add(new Db.Question() { Id = 1,  QuestionTypeId = 2, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1 });
-                questionDbContext.Questions.Add(new Db.Question() { Id = 2,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false,  CategoryId = 1 });
-                questionDbContext.Questions.Add(new Db.Question() { Id = 3,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true,  CategoryId = 2 });
-                questionDbContext.SaveChanges();
-            }
             if (!questionDbContext.QuestionTypes.Any())
             {
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 1, TypeText = "RadioButton" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "RadioButton" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 2, TypeText = "CheckBox" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "CheckBox" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 3, TypeText = "TextBox" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" });
                 questionDbContext.SaveChanges();
             }
 
             if (!questionDbContext.QuestionCategories.Any())
             {
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 1, IconName = "Flooding", IconLibrary= "https://example.com/images/img1.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 2, IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 3, IconName = "Structural", IconLibrary = "https://example.com/images/img3.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Structural", IconLibrary = "https://example.com/images/img3.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 4, IconName = "Utility", IconLibrary = "https://example.com/images/img4.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Utility", IconLibrary = "https://example.com/images/img4.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory()   { Id = 5, IconName = "Debris", IconLibrary = "https://example.com/images/img5.png" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Debris", IconLibrary = "https://example.com/images/img5.png" });
                 questionDbContext.SaveChanges();
             }
 
             if (!questionDbContext.CategoryTranslations.Any())
             {
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 1, Title = "Flooding", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 2, Title = "Electrical", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 3, Title = "Structural", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 4, Title = "Utility", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 5, Title = "Debris", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 1, Title = "Inondation", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 2, Title = "Électrique", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 3, Title = "De construction", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 4, Title = "Utilitaire", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 5, Title = "Débris", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 1, Title = "Inundación", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 2, Title = "Eléctrica", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 3, Title = "Estructural", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 4, Title = "Utilidad", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 5, Title = "Escombros", Language = "es" });
+                questionDbContext.SaveChanges();
+            }
+
+            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 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 };
+
+                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();
+            }
+
+            if (!questionDbContext.QuestionsTranslations.Any())
+            {
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Can You Open ?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Peux-tu ouvrir ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Are the grounds flooded ?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
+                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.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 1, CategoryId = 1, Title = "Flooding", Language = "en" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 2, CategoryId = 2, Title = "Electrical", Language = "en" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 3, CategoryId = 3, Title = "Structural", Language = "en" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 4, CategoryId = 4, Title = "Utility", Language = "en" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 5, CategoryId = 5, Title = "Debris", Language = "en" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 6, CategoryId = 1, Title = "Inondation", Language = "fr" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 7, CategoryId = 2, Title = "Électrique", Language = "fr" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 8, CategoryId = 3, Title = "De construction", Language = "fr" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 9, CategoryId = 4, Title = "Utilitaire", Language = "fr" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 10, CategoryId = 5, Title = "Débris", Language = "fr" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 11, CategoryId = 1, Title = "Inundación", Language = "es" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 12, CategoryId = 2, Title = "Eléctrica", Language = "es" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 13, CategoryId = 3, Title = "Estructural", Language = "es" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 14, CategoryId = 4, Title = "Utilidad", Language = "es" });
-                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 15, CategoryId = 5, Title = "Escombros", Language = "es" });
                 questionDbContext.SaveChanges();
             }
         }
@@ -210,6 +314,7 @@ 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)
                         });
                     }
@@ -230,16 +335,7 @@ namespace DamageAssesment.Api.Questions.Providers
             try
             {
                 logger?.LogInformation("Query Question");
-                var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
+                var result = InsertQuestion(Question);
-                var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
-                dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
-                questionDbContext.Questions.Add(dbquestion);
-                dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
-                questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
-                questionDbContext.SaveChanges();
-                Question.Id = dbquestion.Id;
-                var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
-                result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id,""));
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -248,6 +344,69 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
+        private Models.MultiLanguage InsertQuestion(Models.Question Question)
+        {
+            var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
+            var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
+            dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
+            questionDbContext.Questions.Add(dbquestion);
+            questionDbContext.SaveChanges();
+            dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
+            questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
+            questionDbContext.SaveChanges();
+            Question.Id = dbquestion.Id;
+            var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
+            result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
+            return result;
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions)
+        {
+            try
+            {
+                List<Models.MultiLanguage> results = new List<MultiLanguage>();
+               logger?.LogInformation("Query Question");
+                foreach (Models.Question Question in Questions)
+                {
+                    results.Add(InsertQuestion(Question));
+                }
+                return (true, results, null);
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
+            }
+        }
+      
+        public async Task<(bool IsSuccess, 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
@@ -281,8 +440,11 @@ 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

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

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

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

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

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

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

@@ -9,143 +9,143 @@ using Xunit;
 
 namespace DamageAssesment.SurveyResponses.Test
 {
-    public class ResponsesServiceTest
+    public class SurveyResponsesServiceTest
     {
-        private  Mock<ISurveysResponse> mockSurveyResponseService;
+        Mock<ISurveysResponse> mockSurveyResponseService;
-        private string token { get; set; }
+        Mock<IExcelExportService> mockExcelExportService;
-        public ResponsesServiceTest()
+        public SurveyResponsesServiceTest()
         {
             mockSurveyResponseService = new Mock<ISurveysResponse>();
-            token = Guid.NewGuid().ToString();
+            mockExcelExportService = new Mock<IExcelExportService>();
         }
 
-        [Fact(DisplayName = "Get SurveyResponses - Ok case")]
+        [Fact(DisplayName = "Get Responses - Ok case")]
         public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync()).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync();
-            Assert.Equal(200, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "Get SurveyResponses - BadRequest case")]
-        public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode204()
-        {
-            var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync()).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
-            var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync();
-            Assert.Equal(400, result.StatusCode);
-        }
-
-        [Fact(DisplayName = "Get SurveyResponses by surveyId - Ok case")]
-        public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode200()
-        {
-            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
-            var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId - NoContent case")]
+        [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 SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
+            Assert.Equal(400, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by surveyId - Ok case")]
+        public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode200()
+        {
+            SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
+            var mockResponse = await MockData.getOkResponse();
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1);
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Get Responses by surveyId - NoContent case")]
         public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
 
 
 
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId and locationId - Ok case")]
+        [Fact(DisplayName = "Get Responses by surveyId and locationId - Ok case")]
         public async Task GetSurveyResponsesBySurveyLocationAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1);
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId  and locationId - NoContent case")]
+        [Fact(DisplayName = "Get Responses by surveyId  and locationId - NoContent case")]
         public async Task GetSurveyResponsesBySurveyLocationAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1);
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
             Assert.Equal(204, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId and QuestionId and Answer - Ok case")]
+        [Fact(DisplayName = "Get Responses by surveyId and QuestionId and Answer - Ok case")]
         public async Task GetSurveyResponsesBySurveyQuestionAnswerAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes")).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes");
+            var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by surveyId and QuestionId and Answer - NoContent case")]
+        [Fact(DisplayName = "Get Responses by surveyId and QuestionId and Answer - NoContent case")]
         public async Task GetSurveyResponsesBySurveyQuestionAnswerAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes")).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes");
+            var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1);
             Assert.Equal(204, result.StatusCode);
         }
 
 
-        [Fact(DisplayName = "Get SurveyResponses by region and surveyId - Ok case")]
+        [Fact(DisplayName = "Get Responses by region and surveyId - Ok case")]
         public async Task GetSurveyResponsesByRegionSurveyAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1);
+            var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by region and surveyId - NoContent Case")]
+        [Fact(DisplayName = "Get Responses by region and surveyId - NoContent Case")]
         public async Task GetSurveyResponsesByRegionSurveyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1);
+            var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by maintenanceCenter and surveyId - Ok case")]
+        [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - Ok case")]
         public async Task GetSurveyResponsesMaintenanceCenterSurveyAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1);
+            var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by maintenanceCenter and surveyId - No Content  Case")]
+        [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - No Content  Case")]
         public async Task GetSurveyResponsesMaintenanceCenterSurveyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
-            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1)).ReturnsAsync(mockResponse);
+            mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
-            var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1);
+            var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
             Assert.Equal(204, result.StatusCode);
         }
 
@@ -155,83 +155,83 @@ 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);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Get SurveyResponses by maintenanceCenter and surveyId - NoContent Case")]
+        [Fact(DisplayName = "Get Responses by maintenanceCenter and surveyId - NoContent Case")]
         public async Task GetSurveyResponsesByResponseIdyAsync_ShouldReturnStatusCode204()
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
             Assert.Equal(204, result.StatusCode);
         }
 
 
-        [Fact(DisplayName = "Post SurveyResponses - Ok case")]
+        [Fact(DisplayName = "Post Responses - Ok case")]
         public async Task PostSurveyAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Post SurveyResponses - BadRequest case")]
+        [Fact(DisplayName = "Post Responses - BadRequest case")]
         public async Task PostSurveyAsync_ShouldReturnStatusCode400()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (BadRequestObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
             Assert.Equal(400, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Put SurveyResponses - Ok case")]
+        [Fact(DisplayName = "Put Responses - Ok case")]
         public async Task PutSurveyAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Put SurveyResponses - BadRequest case")]
+        [Fact(DisplayName = "Put Responses - BadRequest case")]
         public async Task PutSurveyAsync_ShouldReturnStatusCode404()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse); ;
-            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (BadRequestObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
             Assert.Equal(400, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Delete SurveyResponses - Ok case")]
+        [Fact(DisplayName = "Delete Responses - Ok case")]
         public async Task DeleteSurveyAsync_ShouldReturnStatusCode200()
         {
             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
             var mockResponse = await MockData.getOkResponse(mockRequestObject);
             mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse);
-            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
             var result = (OkObjectResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
             Assert.Equal(200, result.StatusCode);
         }
 
-        [Fact(DisplayName = "Delete SurveyResponses - NotFound case")]
+        [Fact(DisplayName = "Delete Responses - NotFound case")]
         public async Task DeleteSurveyAsync_ShouldReturnStatusCode404()
         {
             var mockResponse = await MockData.getResponse();
             mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse); ;
-            var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object);
+            var 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,26 +1,30 @@
 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;
-        public ResponsesController(ISurveysResponse surveyResponseProvider)
+        private readonly IExcelExportService excelExportService;
+
+        public SurveyResponsesController(ISurveysResponse surveyResponseProvider, IExcelExportService excelExportService)
         {
             this.surveyResponseProvider = surveyResponseProvider;
+            this.excelExportService = excelExportService;
         }
         /// <summary>
         /// GET request for retrieving survey responses.
         /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
+
-        [HttpGet("Responses")]
+        [Route("responses/{employeeid:int}")]
-        public async Task<ActionResult> GetSurveyResponsesAsync()
+        [Route("responses")]
+        [HttpGet]
+        public async Task<ActionResult> GetSurveyResponsesAsync(int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesAsync();
+            var result = await this.surveyResponseProvider.GetSurveyResponsesAsync(employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.surveyResponses);
@@ -34,11 +38,12 @@ 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}")]
-        [HttpGet("Responses/BySurvey/{surveyid}")]
+        [Route("responses/bysurvey/{surveyid:int}")]
-        public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid)
+        [HttpGet]
+        public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid, int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyid);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyid, employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -50,16 +55,17 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// </summary>
         /// <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")]
+
-        [HttpGet("Responses/{surveyid}/{locationid}")]
+        [Route("responses/{surveyid:int}/{locationid:int}/{employeeid:int}")]
-        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid)
+        [Route("responses/{surveyid:int}/{locationid:int}")]
+        [HttpGet]
+        public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid, int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid, employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
             }
-
             return NoContent();
         }
         /// <summary>
@@ -68,11 +74,13 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param>
         /// <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")]
+
-        [HttpGet("Responses/ByAnswer/{surveyid}/{questionid}/{answer}")]
+        [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}/{employeeid:int}")]
-        public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer)
+        [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}")]
+        [HttpGet]
+        public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer, int? employeeid)
         {
-            var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyid, questionid, answer);
+            var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyid, questionid, answer, employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -84,11 +92,13 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// GET request for retrieving answers from survey responses by survey ID and region.
         /// </summary>
         /// <param name="surveyId">The ID of the survey for which answers are to be retrieved.</param>
-        [Authorize(Roles = "admin,survey,user,report")]
+
-        [HttpGet("Responses/ByRegion/{surveyid}")]
+        [Route("responses/byregion/{surveyid:int}")]
-        public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid)
+        [Route("responses/byregion/{surveyid:int}/{employeeid}")]
+        [HttpGet]
+        public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid, int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyid);
+            var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyid, employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.Answers);
@@ -99,11 +109,12 @@ 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}")]
-        [HttpGet("Responses/ByMaintenanceCenter/{surveyid}")]
+        [Route("responses/bymaintenancecenter/{surveyid:int}")]
-        public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid)
+        [HttpGet]
+        public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid, int? employeeid)
         {
-            var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyid);
+            var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyid, employeeid ?? 0);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyResponses);
@@ -114,8 +125,8 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// GET request for retrieving a survey response by response ID.
         /// </summary>
         /// <param name="responseId">The ID of the survey response to be retrieved.</param>
-        [Authorize(Roles = "admin,survey,user,report")]
+
-        [HttpGet("Responses/{id}")]
+        [HttpGet("responses/{id}")]
         public async Task<ActionResult> GetSurveyResponseByIdAsync(int id)
         {
             var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(id);
@@ -130,8 +141,8 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// POST request for creating a new survey response.
         /// </summary>
         /// <param name="surveyResponse">The survey response object to be created.</param>
-        [Authorize(Roles = "admin,survey,user,report")]
+
-        [HttpPost("Responses")]
+        [HttpPost("responses")]
         public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse)
         {
             var result = await this.surveyResponseProvider.PostSurveyResponseAsync(surveyResponse);
@@ -146,8 +157,8 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// </summary>
         /// <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}")]
+        [HttpPut("responses/{id}")]
         public async Task<ActionResult> PutSurveyResponseAsync(int id, Models.SurveyResponse surveyResponse)
         {
             var result = await this.surveyResponseProvider.PutSurveyResponseAsync(id, surveyResponse);
@@ -163,8 +174,8 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// <summary>
         /// DELETE request for deleting an existing survey response.
         /// </summary>
-        [Authorize(Roles = "admin,survey,user,report")]
+
-        [HttpDelete("Responses/{id}")]
+        [HttpDelete("responses/{id}")]
         public async Task<ActionResult> DeleteSurveyResponseAsync(int id)
         {
             var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(id);
@@ -178,8 +189,8 @@ namespace DamageAssesment.Api.Responses.Controllers
         /// POST request for submitting survey with multiple answers.
         /// </summary>
         /// <param name="request">The answers to be submitted for the survey.</param>
-        [Authorize(Roles = "admin,survey,user,report")]
+
-        [HttpPost("Responses/Answers")]
+        [HttpPost("responses/answers")]
         public async Task<ActionResult> PostSurveyAnswersAsync(Request request)
         {
             var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(request);
@@ -189,5 +200,69 @@ namespace DamageAssesment.Api.Responses.Controllers
             else
                 return BadRequest(result.ErrorMessage);
         }
+        /// <summary>
+        /// Get All active surveys .
+        /// </summary>
+        [Route("responses/surveys/active")]
+        [Route("responses/surveys/active/{language:alpha}")]
+        [Route("responses/surveys/active/{employeeid:int}")]
+        [Route("responses/surveys/active/{employeeid:int}/{language:alpha}")]
+        [HttpGet]
+        public async Task<ActionResult> GetActiveSurveysAsync(int? employeeid, string? language)
+        {
+            var result = await this.surveyResponseProvider.GetActiveSurveysAsync(employeeid, language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.Surveys);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// Export all survey response data based on survey id.
+        /// </summary>
+        [HttpGet]
+        [Route("responses/surveys/export/{surveyid}")]
+        public async Task<ActionResult> GetExcelSurveysAsync(int surveyid, string language, bool IsAdmin = false)
+        {
+            var result = await this.surveyResponseProvider.ExportSurveyResponsesAsync(surveyid, language, IsAdmin);
+            if (result.IsSuccess && result.surveyResponses.Count > 0)
+            {
+
+                byte[] fileContents = excelExportService.ExportToExcel<object>(result.surveyResponses);
+                return File(fileContents, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "data.xlsx");
+                //return Ok(result.Surveys);
+            }
+            return NoContent();
+        }
+        //[Route("responses/surveys/active")]
+        //[Route("responses/surveys/active/{language:alpha}")]
+        //[HttpGet]
+        //public async Task<ActionResult> GetActiveSurveysAsync( string? language)
+        //{
+        //    var result = await this.surveyResponseProvider.GetActiveSurveysAsync(null, language);
+        //    if (result.IsSuccess)
+        //    {
+        //        return Ok(result.Surveys);
+        //    }
+        //    return NoContent();
+        //}
+
+        /// <summary>
+        /// Get all historical surveys .
+        /// </summary>
+        [Route("responses/surveys/historic")]
+        [Route("responses/surveys/historic/{language:alpha}")]
+        [Route("responses/surveys/historic/{employeeid:int}")]
+        [Route("responses/surveys/historic/{employeeid:int}/{language:alpha}")]
+        [HttpGet]
+        public async Task<ActionResult> GetHistoricSurveysAsync(int? employeeid, string? language)
+        {
+            var result = await this.surveyResponseProvider.GetHistoricSurveysAsync(employeeid, language);
+            if (result.IsSuccess)
+            {
+                return Ok(result.Surveys);
+            }
+            return NoContent();
+        }
     }
 }

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

@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <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,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DamageAssesment.Api.Responses.Db
 {
+    [Table("SurveyResponses")]
     public class SurveyResponse
     {
         [Key]

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

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

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

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