Project Folder Name changed from SurveyResponses to Responses

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

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

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

@@ -1,23 +1,73 @@
 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(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    options.IncludeXmlComments(xmlPath);
+
+    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
+    {
+        Name = "Bearer",
+        BearerFormat = "JWT",
+        Scheme = "bearer",
+        Description = "Specify the authorization token.",
+        In = ParameterLocation.Header,
+        Type = SecuritySchemeType.Http,
+    };
+
+    options.AddSecurityDefinition("jwt_auth", securityDefinition);
+
+    // Make sure swagger UI requires a Bearer token specified
+    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
+    {
+        Reference = new OpenApiReference()
+        {
+            Id = "jwt_auth",
+            Type = ReferenceType.SecurityScheme
+        }
+    };
+
+    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
+    {
+        {securityScheme, new string[] { }},
+    };
+
+    options.AddSecurityRequirement(securityRequirements);
 });
 builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
@@ -35,7 +85,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwagger();
     app.UseSwaggerUI();
 }
-
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,6 +1,7 @@
 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;
@@ -21,7 +22,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Get all attachments.
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpGet("Attachments")]
         public async Task<ActionResult> GetAttachmentsAsync()
         {
@@ -37,6 +38,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Get all attachments by attachmentId.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet("Attachments/{id}")]
         public async Task<ActionResult> GetAttachmentbyIdAsync(int id)
         {
@@ -80,7 +82,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Save new Attachment(s)
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpPost("Attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo)
         {
@@ -107,7 +109,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Modify an new attachment.
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpPut("Attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
         {
@@ -138,6 +140,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
         /// <summary>
         /// Delete an existing attachment.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpDelete("Attachments/{id}")]
         public async Task<IActionResult> DeleteAttachment(int id)
         {

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

@@ -1,25 +1,75 @@
 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(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    options.IncludeXmlComments(xmlPath);
+
+    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
+    {
+        Name = "Bearer",
+        BearerFormat = "JWT",
+        Scheme = "bearer",
+        Description = "Specify the authorization token.",
+        In = ParameterLocation.Header,
+        Type = SecuritySchemeType.Http,
+    };
+
+    options.AddSecurityDefinition("jwt_auth", securityDefinition);
+
+    // Make sure swagger UI requires a Bearer token specified
+    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
+    {
+        Reference = new OpenApiReference()
+        {
+            Id = "jwt_auth",
+            Type = ReferenceType.SecurityScheme
+        }
+    };
+
+    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
+    {
+        {securityScheme, new string[] { }},
+    };
+
+    options.AddSecurityRequirement(securityRequirements);
 });
 builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
@@ -45,6 +95,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
+app.UseAuthentication();
 app.UseAuthorization();
 app.UseHttpsRedirection();
 

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

@@ -1,71 +0,0 @@
-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

@@ -1,137 +0,0 @@
-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)> 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,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.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,
-                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,
-                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/Db/DoculinkAttachments.cs

@@ -1,18 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.DocuLinks.Db
-{
-    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; }
-    }
-}

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

@@ -1,38 +0,0 @@
-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/LinksTranslation.cs

@@ -1,15 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using System.ComponentModel.DataAnnotations;
-
-namespace DamageAssesment.Api.DocuLinks.Db
-{
-    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/IDoculinkProvider.cs

@@ -1,18 +0,0 @@
-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, 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)> DeleteDocumentAsync(int id);
-        Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
-
-
-    }
-}

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

@@ -1,11 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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);
-        void Movefile(string path);
-    }
-}

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

@@ -1,25 +0,0 @@
-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 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

@@ -1,13 +0,0 @@
-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 int CustomOrder { get; set; }
-    }
-}

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

@@ -1,20 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

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

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

@@ -1,22 +0,0 @@
-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

@@ -1,43 +0,0 @@
-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.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/Providers/DoculinkProvider.cs

@@ -1,531 +0,0 @@
-using AutoMapper;
-using DamageAssesment.Api.DocuLinks.Db;
-using DamageAssesment.Api.DocuLinks.Interfaces;
-using DamageAssesment.Api.DocuLinks.Models;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using System;
-using System.Diagnostics.Eventing.Reader;
-using System.Reflection.Metadata;
-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;
-
-        public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> 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() { 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++)
-                {
-                    FileModel fileModel = new FileModel() { url = "www.google"+i+".com", IsAttachments = false, CustomOrder = 1 };
-                    ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i,CustomOrder=i, Files = new List<FileModel>() { fileModel } };
-                    Db.DoculinkTranslation documents = new Db.DoculinkTranslation { DocumentId = i, title = "Test"+i, description = "ss"+i, Language = "en" };
-                    Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
-                    DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
-                    DocumentDbContext.SaveChanges();
-                    DocumentDbContext.DocumentsTranslations.AddRange(documents);
-                    var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(document.doclinksAttachments);
-                    dbattachments.ForEach(a => a.DocumentId = i);
-                    DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
-                    DocumentDbContext.SaveChanges();
-                    counter++;
-                }
-            }
-        }
-        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;
-        }
-        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 = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                            DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).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 = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            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 = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
-                        DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
-                    return (true, result, null);
-                }
-                return (false, null, "Not found");
-            }
-            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 = Document.doclinksAttachments;
-                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 = Document.doclinksAttachments;
-                        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)> 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

@@ -1,142 +0,0 @@
-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 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);
-                            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 });
-                    }
-                }
-                Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
-                    IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true};
-            
-                return Documents;
-            }
-            catch (Exception ex) {
-                return new Models.Doculink();
-            }
-
-           
-        }
-        public 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);
-                        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 });
-                }
-                Models.Doculink Documents = new Models.Doculink()
-                {
-                    Id = documentInfo.Id,
-                    linkTypeId = documentInfo.linkTypeId,
-                    documentsTranslations=documentInfo.documentsTranslations,
-                    IsActive = true,
-                    IsDeleted=false,
-                    CustomOrder = documentInfo.CustomOrder,
-                    doclinksAttachments = attachments
-                };
-
-                return Documents;
-            }
-
-             catch (Exception ex) {
-                return new Models.Doculink();
-            }
-        }
-        public 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.Test/DamageAssesment.Api.DocuLinks.Test.csproj

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

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

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

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

@@ -0,0 +1,61 @@
+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

@@ -0,0 +1,122 @@
+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,19 +1,20 @@
-using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.Documents.Db;
-using DamageAssesment.Api.DocuLinks.Interfaces;
+using DamageAssesment.Api.Documents.Interfaces;
-using DamageAssesment.Api.DocuLinks.Models;
+using DamageAssesment.Api.Documents.Models;
-using DamageAssesment.Api.DocuLinks.Providers;
+using DamageAssesment.Api.Documents.Providers;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DamageAssesment.Api.DocuLinks.Controllers
+namespace DamageAssesment.Api.Documents.Controllers
 {
     [ApiController]
-    public class DoculinkController : ControllerBase
+    public class DocumentsController : ControllerBase
     {
-        private readonly IDoculinkProvider documentsProvider;
+        private readonly IDocumentsProvider documentsProvider;
         private readonly IUploadService uploadService;
 
-        public DoculinkController(IDoculinkProvider documentsProvider,IUploadService uploadService)
+        public DocumentsController(IDocumentsProvider documentsProvider,IUploadService uploadService)
         {
 
             this.documentsProvider = documentsProvider;
@@ -21,14 +22,14 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
 
         }
         /// <summary>
-        /// Get all Doculink type.
+        /// Get all document link type.
         /// </summary>
         [HttpGet]
+        [Authorize(Roles = "admin")]
         [Route("doculinks/types")]
-        [Route("doculinks/types/{language:alpha}")]
+        public async Task<IActionResult> GetLinkTypesAsync()
-        public async Task<IActionResult> GetLinkTypesAsync(string? language)
         {
-            var result = await this.documentsProvider.GetLinkTypesAsync(language);
+            var result = await this.documentsProvider.GetLinkTypesAsync();
             if (result.IsSuccess)
             {
                 return Ok(result.LinkTypes);
@@ -36,14 +37,14 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NoContent();
         }
         /// <summary>
-        /// Get a Doculink type by id.
+        /// Get a document link type by id.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet]
         [Route("doculinks/types/{id}")]
-        [Route("doculinks/types/{id}/{language:alpha}")]
+        public async Task<IActionResult> GetLinkTypeAsync(int id)
-        public async Task<IActionResult> GetLinkTypeAsync(int id,string? language)
         {
-            var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
+            var result = await this.documentsProvider.GetLinkTypeAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.LinkType);
@@ -51,15 +52,16 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// Update a existing Doculink type.
+        /// Update a existing document link type.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPut]
-        [Route("doculinks/types/{id}")]
+        [Route("doculinks/types")]
-        public async Task<IActionResult> UpdateLinkType(int id,Models.LinkType linkType)
+        public async Task<IActionResult> UpdateLinkType(Models.LinkType linkType)
         {
             if (linkType != null)
             {
-                var result = await this.documentsProvider.UpdateLinkTypeAsync(id,linkType);
+                var result = await this.documentsProvider.UpdateLinkTypeAsync(linkType);
                 if (result.IsSuccess)
                 {
                     return Ok(result.LinkType);
@@ -72,8 +74,9 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
         }
         /// <summary>
-        /// Create a new Doculink type.
+        /// Create a new document link type.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks/types")]
         public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
@@ -90,8 +93,9 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return CreatedAtRoute("DefaultApi", new { id = linkType.Id }, linkType);
         }
         /// <summary>
-        /// Delete a  existing Doculink type by id.
+        /// Delete a  existing document link type by id.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpDelete]
         [Route("doculinks/types/{id}")]
         public async Task<IActionResult> DeleteLinkType(int id)
@@ -104,16 +108,17 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// Get all Doculink.
+        /// 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,bool? isactive)
+        public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language)
         {
-            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive);
+            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language);
             if (result.IsSuccess)
             {
                 return Ok(result.documents);
@@ -121,25 +126,26 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NoContent();
         }
         /// <summary>
-        /// Get all active Doculink.
+        /// Get all documents.
         /// </summary>
-        [Route("doculinks/active")]
+        /// 
-        [Route("doculinks/active/{linktype:alpha}")]
+        //[Route("doculinks/{language:alpha}")]
-        [Route("doculinks/active/{linktype:alpha}/{language:alpha}")]
+        //[Route("doculinks")]
-        [HttpGet]
+        //[HttpGet]
-        public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
+        //public async Task<IActionResult> GetDocumentsAsync(string? language)
-        {
+        //{
-            var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language,true);
+        //    var result = await this.documentsProvider.GetdocumentsAsync(language);
-            if (result.IsSuccess)
+        //    if (result.IsSuccess)
-            {
+        //    {
-                return Ok(result.documents);
+        //        return Ok(result.documents);
-            }
+        //    }
-            return NoContent();
+        //    return NoContent();
-        }
+        //}
 
         /// <summary>
-        /// Get a Doculink by id.
+        /// Get a document by id.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet]
         [Route("doculinks/{id}")]
         [Route("doculinks/{id}/{linktype:alpha}")]
@@ -154,20 +160,20 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return NotFound();
         }
         /// <summary>
-        /// update existing doclink.
+        /// Upload new document.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPut]
         [Route("doculinks/{id}")]
-        public async Task<IActionResult> UpdateDocument(int id,ReqDoculink documentInfo)
+        public async Task<IActionResult> UpdateDocument(int id,DocumentInfo documentInfo)
         {
             if (documentInfo != null)
             {
                 var dbdoc = await this.documentsProvider.GetDocumentByidAsync(id);
                 if (dbdoc.IsSuccess)
                 {
-                    var documents = await this.documentsProvider.GetDocumentCounter();
+                    Models.Document document = uploadService.UpdateDocuments(dbdoc.Document, documentInfo);
-                    Models.Doculink DocuLink= uploadService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
+                    var result = await this.documentsProvider.UpdateDocumentAsync(id,document);
-                    var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
                     if (result.IsSuccess)
                     {
                         return Ok(result.Document);
@@ -179,19 +185,20 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             return BadRequest(documentInfo);
         }
         /// <summary>
-        /// Create new doclink.
+        /// update existing document.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks")]
-        public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo)
+        public async Task<IActionResult> CreateDocument(DocumentInfo documentInfo)
         {
             try
             {
                 if (documentInfo != null)
                 {
                     var documents = await this.documentsProvider.GetDocumentCounter();
-                    Models.Doculink DocuLink= uploadService.UploadDocument(documents.counter, documentInfo);
+                    Models.Document document = uploadService.UploadDocument(documents.counter, documentInfo);
-                    var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
+                    var result = await this.documentsProvider.PostDocumentAsync(document);
                     if (result.IsSuccess)
                     {
                         return Ok(result.Document);
@@ -206,8 +213,9 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             }
         }
         /// <summary>
-        /// Delete Doculink by id.
+        /// Delete document by id.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpDelete]
         [Route("doculinks/{id}")]
         public async Task<IActionResult> DeleteDocument(int id)
@@ -217,10 +225,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
             if (result.IsSuccess)
             {
                 // deleting file from folder
-                foreach (var item in result.Document.doclinksAttachments)
+                uploadService.Movefile(result.Document.Path);
-                {
-                    uploadService.Movefile(item.Path);
-                }
                 return Ok(result.Document);
             }
             return NotFound();

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

@@ -10,6 +10,7 @@
   <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">
@@ -25,4 +26,8 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="DASA_Documents\" />
+  </ItemGroup>
+
 </Project>

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

@@ -1,21 +1,23 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.DocuLinks.Db
+namespace DamageAssesment.Api.Documents.Db
 {
-    public class Doculink
+    public class Document
     {
         [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.Documents/Db/DocumentDbContext.cs

@@ -0,0 +1,30 @@
+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/Db/DocumentsTranslation.cs

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

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

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

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

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

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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,12 @@
+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,6 +1,6 @@
 // <auto-generated />
 using System;
-using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.Documents.Db;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -9,9 +9,9 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 #nullable disable
 
-namespace DamageAssesment.Api.DocuLinks.Migrations
+namespace DamageAssesment.Api.Documents.Migrations
 {
-    [DbContext(typeof(DoculinkDbContext))]
+    [DbContext(typeof(DocumentDbContext))]
     [Migration("20230828165655_InitialDocumentCreate")]
     partial class InitialDocumentCreate
     {
@@ -25,7 +25,7 @@ namespace DamageAssesment.Api.DocuLinks.Migrations
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
-            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.Document", b =>
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -70,7 +70,7 @@ namespace DamageAssesment.Api.DocuLinks.Migrations
                     b.ToTable("Documents");
                 });
 
-            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinkType", b =>
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()

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

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
-namespace DamageAssesment.Api.DocuLinks.Migrations
+namespace DamageAssesment.Api.Documents.Migrations
 {
     /// <inheritdoc />
     public partial class InitialDocumentCreate : Migration

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

@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.Documents.Db;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -9,9 +9,9 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 #nullable disable
 
-namespace DamageAssesment.Api.DocuLinks.Migrations
+namespace DamageAssesment.Api.Documents.Migrations
 {
-    [DbContext(typeof(DoculinkDbContext))]
+    [DbContext(typeof(DocumentDbContext))]
     [Migration("20230830200432_DocumentTranslation")]
     partial class DocumentTranslation
     {
@@ -25,7 +25,7 @@ namespace DamageAssesment.Api.DocuLinks.Migrations
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
-            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.Document", b =>
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -62,7 +62,7 @@ namespace DamageAssesment.Api.DocuLinks.Migrations
                     b.ToTable("Documents");
                 });
 
-            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.DocumentsTranslation", b =>
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.DocumentsTranslation", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -90,7 +90,7 @@ namespace DamageAssesment.Api.DocuLinks.Migrations
                     b.ToTable("DocumentsTranslations");
                 });
 
-            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinkType", b =>
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()

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

@@ -2,7 +2,7 @@
 
 #nullable disable
 
-namespace DamageAssesment.Api.DocuLinks.Migrations
+namespace DamageAssesment.Api.Documents.Migrations
 {
     /// <inheritdoc />
     public partial class DocumentTranslation : Migration

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

@@ -1,6 +1,6 @@
 // <auto-generated />
 using System;
-using DamageAssesment.Api.DocuLinks.Db;
+using DamageAssesment.Api.Documents.Db;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
@@ -8,9 +8,9 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
 #nullable disable
 
-namespace DamageAssesment.Api.DocuLinks.Migrations
+namespace DamageAssesment.Api.Documents.Migrations
 {
-    [DbContext(typeof(DoculinkDbContext))]
+    [DbContext(typeof(DocumentDbContext))]
     partial class DocumentDbContextModelSnapshot : ModelSnapshot
     {
         protected override void BuildModel(ModelBuilder modelBuilder)
@@ -22,7 +22,7 @@ namespace DamageAssesment.Api.DocuLinks.Migrations
 
             SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
 
-            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.Document", b =>
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.Document", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -59,7 +59,7 @@ namespace DamageAssesment.Api.DocuLinks.Migrations
                     b.ToTable("Documents");
                 });
 
-            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.DocumentsTranslation", b =>
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.DocumentsTranslation", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
@@ -87,7 +87,7 @@ namespace DamageAssesment.Api.DocuLinks.Migrations
                     b.ToTable("DocumentsTranslations");
                 });
 
-            modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinkType", b =>
+            modelBuilder.Entity("DamageAssesment.Api.Documents.Db.LinkType", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()

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

@@ -0,0 +1,28 @@
+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

@@ -0,0 +1,19 @@
+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/DocumentsTranslation.cs

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

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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,94 @@
+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/Properties/launchSettings.json

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

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

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

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

@@ -0,0 +1,434 @@
+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

@@ -0,0 +1,123 @@
+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.json

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

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

@@ -1,4 +1,5 @@
 using DamageAssesment.Api.Employees.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -18,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// <summary>
         /// GET request for retrieving employees.
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpGet("Employees")]
         public async Task<ActionResult> GetEmployeesAsync()
         {
@@ -35,7 +36,7 @@ namespace DamageAssesment.Api.Employees.Controllers
         /// <summary>
         /// GET request for retrieving an employee by ID.
         /// </summary>
-        
+        [Authorize(Roles = "admin")]
         [HttpGet("Employees/{id}")]
         public async Task<ActionResult> GetEmployeeByIdAsync(int id)
         {
@@ -48,11 +49,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}")]
         public async Task<IActionResult> UpdateEmployee(int id, Models.Employee Employee)
         {
@@ -75,6 +77,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")]
         public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
         {
@@ -93,6 +96,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}")]
         public async Task<IActionResult> DeleteEmployee(int id)
         {

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

@@ -1,23 +1,74 @@
 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(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    options.IncludeXmlComments(xmlPath);
+
+    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
+    {
+        Name = "Bearer",
+        BearerFormat = "JWT",
+        Scheme = "bearer",
+        Description = "Specify the authorization token.",
+        In = ParameterLocation.Header,
+        Type = SecuritySchemeType.Http,
+    };
+
+    options.AddSecurityDefinition("jwt_auth", securityDefinition);
+
+    // Make sure swagger UI requires a Bearer token specified
+    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
+    {
+        Reference = new OpenApiReference()
+        {
+            Id = "jwt_auth",
+            Type = ReferenceType.SecurityScheme
+        }
+    };
+
+    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
+    {
+        {securityScheme, new string[] { }},
+    };
+
+    options.AddSecurityRequirement(securityRequirements);
 });
 
 builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
@@ -43,6 +94,7 @@ if (app.Environment.IsDevelopment())
     }
 }
 
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

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

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

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

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

@@ -1,4 +1,5 @@
 using DamageAssesment.Api.Locations.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Locations.Controllers
@@ -15,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// <summary>
         /// Get all regions.2
         /// </summary>
-
+        [Authorize(Roles = "admin")]
         [HttpGet("regions")]
         public async Task<ActionResult> GetRegionsAsync()
         {
@@ -29,7 +30,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)
         {
@@ -43,7 +44,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)
         {
@@ -57,7 +58,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)
         {
@@ -75,7 +76,7 @@ namespace DamageAssesment.Api.Locations.Controllers
         /// DELETE request for deleting a region based on ID.
         /// </summary>
 
-
+        [Authorize(Roles = "admin")]
         [HttpDelete("regions/{id}")]
         public async Task<ActionResult> DeleteRegionAsync(int id)
         {

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -1,23 +1,73 @@
 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(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    options.IncludeXmlComments(xmlPath);
+
+    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
+    {
+        Name = "Bearer",
+        BearerFormat = "JWT",
+        Scheme = "bearer",
+        Description = "Specify the authorization token.",
+        In = ParameterLocation.Header,
+        Type = SecuritySchemeType.Http,
+    };
+
+    options.AddSecurityDefinition("jwt_auth", securityDefinition);
+
+    // Make sure swagger UI requires a Bearer token specified
+    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
+    {
+        Reference = new OpenApiReference()
+        {
+            Id = "jwt_auth",
+            Type = ReferenceType.SecurityScheme
+        }
+    };
+
+    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
+    {
+        {securityScheme, new string[] { }},
+    };
+
+    options.AddSecurityRequirement(securityRequirements);
 });
 builder.Services.AddScoped<ILocationsProvider, LocationsProvider>();
 builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
@@ -26,7 +76,10 @@ 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())
@@ -44,6 +97,7 @@ if (app.Environment.IsDevelopment())
     }
 }
 
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,4 +1,5 @@
 using DamageAssesment.Api.Questions.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
@@ -10,16 +11,14 @@ 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/{language:alpha}")]
         [HttpGet]
@@ -37,6 +36,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// GET request for retrieving a question by ID.
         /// </summary>
+        [Authorize(Roles = "admin,survey,user,report")]
         [Route("Questions/{id}/{language:alpha}")]
         [Route("Questions/{id:int}")]
         [HttpGet]
@@ -55,6 +55,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving survey questions based on a survey ID.
         /// Uri: {Optional language}/GetSurveyQuestions/{surveyId} :Default returns question in all languages 
         /// </summary>
+        [Authorize(Roles = "admin,survey,user,report")]
         [Route("Questions/BySurvey/{surveyId:int}")]
         [Route("Questions/BySurvey/{surveyId:int}/{language:alpha}")]
         [HttpGet]
@@ -71,6 +72,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// PUT request for updating a question (multilingual).
         /// </summary>
 
+        [Authorize(Roles = "admin")]
         [HttpPut("Questions")]
         public async Task<IActionResult> UpdateQuestion(Models.Question question)
         {
@@ -92,6 +94,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question (multilingual).
         /// </summary>
 
+        [Authorize(Roles = "admin")]
         [HttpPost("Questions")]
         public async Task<IActionResult> CreateQuestion(Models.Question question)
         {
@@ -110,6 +113,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question based on ID.
         /// </summary>
 
+        [Authorize(Roles = "admin")]
         [HttpDelete("Questions/{id}")]
         public async Task<IActionResult> DeleteQuestion(int id)
         {
@@ -125,6 +129,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// GET request for retrieving question categories.
         /// </summary>
 
+        [Authorize(Roles = "admin,user,report")]
         [HttpGet("Questions/Categories")]
         [HttpGet("Questions/Categories/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoriesAsync(string? language)
@@ -139,7 +144,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// GET request for retrieving a question category by ID.
         /// </summary>
-
+        [Authorize(Roles = "admin,report")]
         [HttpGet("Questions/Categories/{id:int}")]
         [HttpGet("Questions/Categories/{id:int}/{language:alpha}")]
         public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language)
@@ -156,7 +161,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// <summary>
         /// PUT request for updating a question category.
         /// </summary>
-
+        [Authorize(Roles = "admin,survey,report")]
         [HttpPut("Questions/Categories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
@@ -178,6 +183,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// POST request for creating a new question category.
         /// </summary>
 
+        [Authorize(Roles = "admin")]
         [HttpPost("Questions/Categories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
@@ -196,6 +202,7 @@ namespace DamageAssesment.Api.Questions.Controllers
         /// DELETE request for deleting a question category based on ID.
         /// </summary>
 
+        [Authorize(Roles = "admin")]
         [HttpDelete("Questions/Categories/{id}")]
         public async Task<IActionResult> DeleteQuestionCategory(int id)
         {

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

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

DamageAssesmentApi/DamageAssesment.Api.Questions/Program.cs

@@ -1,11 +1,33 @@
 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();
@@ -17,13 +39,41 @@ builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 
 builder.Services.AddEndpointsApiExplorer();
 //builder.Services.AddSwaggerGen();
-builder.Services.AddSwaggerGen(c =>
+builder.Services.AddSwaggerGen(options =>
 {
     // Include XML comments from your assembly
     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
-    c.IncludeXmlComments(xmlPath);
+    options.IncludeXmlComments(xmlPath);
+
+    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
+    {
+        Name = "Bearer",
+        BearerFormat = "JWT",
+        Scheme = "bearer",
+        Description = "Specify the authorization token.",
+        In = ParameterLocation.Header,
+        Type = SecuritySchemeType.Http,
+    };
+
+    options.AddSecurityDefinition("jwt_auth", securityDefinition);
+
+    // Make sure swagger UI requires a Bearer token specified
+    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
+    {
+        Reference = new OpenApiReference()
+        {
+            Id = "jwt_auth",
+            Type = ReferenceType.SecurityScheme
+        }
+    };
+    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
+    {
+        {securityScheme, new string[] { }},
+    };
+    options.AddSecurityRequirement(securityRequirements);
 });
+
 builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
     option.UseInMemoryDatabase("Questions");
@@ -43,7 +93,7 @@ if (app.Environment.IsDevelopment())
         questionProvider.SeedData();
     }
 }
-
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -1,24 +1,22 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Configuration;
 
-namespace DamageAssesment.Api.SurveyResponses.Controllers
+namespace DamageAssesment.Api.Responses.Controllers
 {
     [ApiController]
-    public class SurveyResponsesController : ControllerBase
+    public class ResponsesController : ControllerBase
     {
         private readonly ISurveysResponse surveyResponseProvider;
-
+        public ResponsesController(ISurveysResponse surveyResponseProvider)
-        public SurveyResponsesController(ISurveysResponse surveyResponseProvider)
         {
             this.surveyResponseProvider = surveyResponseProvider;
         }
         /// <summary>
         /// GET request for retrieving survey responses.
         /// </summary>
-
+        [Authorize(Roles = "admin,survey,user,report")]
         [HttpGet("Responses")]
         public async Task<ActionResult> GetSurveyResponsesAsync()
         {
@@ -36,7 +34,7 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// <summary>
         /// GET request for retrieving survey responses by survey ID.
         /// </summary>
-       
+        [Authorize(Roles = "admin,survey,user,report")]
         [HttpGet("Responses/BySurvey/{surveyid}")]
         public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid)
         {
@@ -52,7 +50,7 @@ namespace DamageAssesment.Api.SurveyResponses.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}")]
         public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid)
         {
@@ -70,10 +68,10 @@ namespace DamageAssesment.Api.SurveyResponses.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}")]
         public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer)
-        {       
+        {
             var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyid, questionid, answer);
             if (result.IsSuccess)
             {
@@ -86,7 +84,7 @@ namespace DamageAssesment.Api.SurveyResponses.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}")]
         public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid)
         {
@@ -101,7 +99,7 @@ namespace DamageAssesment.Api.SurveyResponses.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")]
         [HttpGet("Responses/ByMaintenanceCenter/{surveyid}")]
         public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid)
         {
@@ -116,7 +114,7 @@ namespace DamageAssesment.Api.SurveyResponses.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}")]
         public async Task<ActionResult> GetSurveyResponseByIdAsync(int id)
         {
@@ -132,7 +130,7 @@ namespace DamageAssesment.Api.SurveyResponses.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")]
         public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse)
         {
@@ -148,7 +146,7 @@ namespace DamageAssesment.Api.SurveyResponses.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}")]
         public async Task<ActionResult> PutSurveyResponseAsync(int id, Models.SurveyResponse surveyResponse)
         {
@@ -165,7 +163,7 @@ namespace DamageAssesment.Api.SurveyResponses.Controllers
         /// <summary>
         /// DELETE request for deleting an existing survey response.
         /// </summary>
-       
+        [Authorize(Roles = "admin,survey,user,report")]
         [HttpDelete("Responses/{id}")]
         public async Task<ActionResult> DeleteSurveyResponseAsync(int id)
         {
@@ -180,7 +178,7 @@ namespace DamageAssesment.Api.SurveyResponses.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")]
         public async Task<ActionResult> PostSurveyAnswersAsync(Request request)
         {

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

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.SurveyResponses.Db
+namespace DamageAssesment.Api.Responses.Db
 {
     public class SurveyResponse
     {

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

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace DamageAssesment.Api.SurveyResponses.Db
+namespace DamageAssesment.Api.Responses.Db
 {
     public class SurveyResponseDbContext:DbContext
     {

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,9 @@
+using DamageAssesment.Api.Responses.Models;
+
+namespace DamageAssesment.Api.Responses.Interfaces
+{
+    public interface ILocationServiceProvider
+    {
+        Task<List<Location>> getLocationsAsync(string token);
+    }
+}

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

@@ -0,0 +1,11 @@
+using DamageAssesment.Api.Responses.Models;
+
+namespace DamageAssesment.Api.Responses.Interfaces
+{
+    public interface IQuestionServiceProvider
+    {
+        Task<List<Question>> getQuestionsAsync(string token);
+        Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId, string token);
+        Task<Question> getQuestionsAsync(int questionId, string token);
+    }
+}

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

@@ -0,0 +1,9 @@
+using DamageAssesment.Api.Responses.Models;
+
+namespace DamageAssesment.Api.Responses.Interfaces
+{
+    public interface IRegionServiceProvider
+    {
+        Task<List<Region>> getRegionsAsync(string token);
+    }
+}

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

@@ -0,0 +1,10 @@
+using DamageAssesment.Api.Responses.Models;
+
+namespace DamageAssesment.Api.Responses.Interfaces
+{
+    public interface ISurveyServiceProvider
+    {
+        Task<List<Survey>> getSurveysAsync(string token);
+        Task<Survey> getSurveyAsync(int surveyId,string token);
+    }
+}

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

@@ -1,7 +1,6 @@
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
-using Microsoft.AspNetCore.Mvc;
 
-namespace DamageAssesment.Api.SurveyResponses.Interfaces
+namespace DamageAssesment.Api.Responses.Interfaces
 {
     public interface ISurveysResponse
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Answer
     {

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class AnswerRequest
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Attachment
     {

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class AttachmentInfo
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Employee
     {
@@ -11,6 +11,6 @@ namespace DamageAssesment.Api.SurveyResponses.Models
         public string OfficePhoneNumber { get; set; }
         public string Email { get; set; }
         public bool IsActive { get; set; }
-        public string? PreferredLanguage { get; set; }
+        public string PreferredLanguage { get; set; }
     }
 }

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Location
     {

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

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
      public class Question
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Region
     {

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Request
     {

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

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Survey
     {

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class SurveyQuestions
     {

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

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class SurveyResponse
     {

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class SurveyTranslation
     {        

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

@@ -1,4 +1,4 @@
-namespace DamageAssesment.Api.SurveyResponses.Profiles
+namespace DamageAssesment.Api.Responses.Profiles
 {
     public class SurveyResponsesProvider : AutoMapper.Profile
     {

DamageAssesmentApi/DamageAssesment.Api.Responses/Program.cs

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

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

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

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

@@ -1,10 +1,10 @@
 using AutoMapper;
-using DamageAssesment.Api.SurveyResponses.Db;
+using DamageAssesment.Api.Responses.Db;
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Microsoft.EntityFrameworkCore;
 
-namespace DamageAssesment.Api.SurveyResponses.Providers
+namespace DamageAssesment.Api.Responses.Providers
 {
     public class SurveyResponsesProvider : ISurveysResponse
     {
@@ -18,8 +18,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         private readonly IQuestionServiceProvider questionServiceProvider;
         private readonly ISurveyServiceProvider surveyServiceProvider;
         private readonly IMapper mapper;
+        private readonly IHttpContextAccessor httpContextAccessor;
+        private string token;
 
-        public SurveyResponsesProvider(SurveyResponseDbContext surveyResponseDbContext, ILogger<SurveyResponsesProvider> logger, IAnswerServiceProvider answerServiceProvider, IRegionServiceProvider regionServiceProvider, ILocationServiceProvider locationServiceProvider, IEmployeeServiceProvider employeeServiceProvider, IAttachmentServiceProvider attachmentServiceProvider, IQuestionServiceProvider questionServiceProvider, ISurveyServiceProvider surveyServiceProvider, IMapper mapper)
+        public SurveyResponsesProvider(SurveyResponseDbContext surveyResponseDbContext, ILogger<SurveyResponsesProvider> logger, IAnswerServiceProvider answerServiceProvider, IRegionServiceProvider regionServiceProvider, ILocationServiceProvider locationServiceProvider, IEmployeeServiceProvider employeeServiceProvider, IAttachmentServiceProvider attachmentServiceProvider, IQuestionServiceProvider questionServiceProvider, ISurveyServiceProvider surveyServiceProvider, IMapper mapper, IHttpContextAccessor httpContextAccessor)
         {
             this.surveyResponseDbContext = surveyResponseDbContext;
             this.logger = logger;
@@ -30,8 +32,19 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             this.attachmentServiceProvider = attachmentServiceProvider;
             this.questionServiceProvider = questionServiceProvider;
             this.surveyServiceProvider = surveyServiceProvider;
+            this.httpContextAccessor = httpContextAccessor;
             this.mapper = mapper;
-           // seedData();
+
+            token = httpContextAccessor.HttpContext.Request.Headers.Authorization;
+            if (token != null)
+            {
+                token = token.Replace("Bearer ", string.Empty);
+            }
+            else
+            {
+                token = "";
+            }
+            // seedData();
         }
 
         private void seedData()
@@ -42,8 +55,8 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                 surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 2, SurveyId = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
                 surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = 4, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
                 surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = 1, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = 4, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 5, SurveyId = 1, EmployeeId = 4, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
-                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 7, SurveyId = 1, EmployeeId = 4, LocationId = 3, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now });
+                surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = 4, LocationId = 3, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now });
                 surveyResponseDbContext.SaveChanges();
             }
         }
@@ -110,7 +123,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId,token);
 
                 if (survey != null)
                 {
@@ -141,7 +154,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
 
                 if (survey != null)
                 {
@@ -172,7 +185,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
 
                 if (survey != null)
                 {
@@ -203,8 +216,8 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             try
             {
                 logger?.LogInformation("Querying to get Survey object from microservice");
-                var survey = await surveyServiceProvider.getSurveyAsync(surveyId);
+                var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token);
-                var question = await questionServiceProvider.getQuestionsAsync(questionId);
+                var question = await questionServiceProvider.getQuestionsAsync(questionId,token);
                 bool IsCorrectAnswer = answer.ToLower().Equals("yes") || answer.ToLower().Equals("no") ? true : false;
 
 
@@ -345,7 +358,7 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                var answersList = await answerServiceProvider.getAnswersAsync();
+                var answersList = await answerServiceProvider.getAnswersAsync(token);
                 if (answersList == null || !answersList.Any())
                     return null;
 
@@ -368,8 +381,8 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
                 if (surveyAnswers == null || !surveyAnswers.Any())
                     return null;
 
-                var regions = await regionServiceProvider.getRegionsAsync();
+                var regions = await regionServiceProvider.getRegionsAsync(token);
-                var locations = await locationServiceProvider.getLocationsAsync();
+                var locations = await locationServiceProvider.getLocationsAsync(token);
 
                 if (regions == null || !regions.Any() || locations == null || !locations.Any())
                     return null;
@@ -431,11 +444,11 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             try
             {
-                var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId);
+                var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId, token);
-                var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id);
+                var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id, token);
-                var allQuestions = await questionServiceProvider.getQuestionsAsync();
+                var allQuestions = await questionServiceProvider.getQuestionsAsync(token);
                 var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
 
                 var result = new
                 {
@@ -475,15 +488,14 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             try
             {
                 var surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
-
+                var employees = await employeeServiceProvider.getEmployeesAsync(token);
-                var employees = await employeeServiceProvider.getEmployeesAsync();
+                var answers = await answerServiceProvider.getAnswersAsync(token);
-                var answers = await answerServiceProvider.getAnswersAsync();
+                var questions = await questionServiceProvider.getQuestionsAsync(token);
-                var questions = await questionServiceProvider.getQuestionsAsync();
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
 
                 //var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId);
 
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
                 var result = from r in surveyResonses
                              select new
                              {
@@ -525,11 +537,10 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             try
             {
                 var surveyResonses = await surveyResponseDbContext.SurveyResponses.ToListAsync();
-
+                var employees = await employeeServiceProvider.getEmployeesAsync(token);
-                var employees = await employeeServiceProvider.getEmployeesAsync();
+                var answers = await answerServiceProvider.getAnswersAsync(token);
-                var answers = await answerServiceProvider.getAnswersAsync();
+                var questions = await questionServiceProvider.getQuestionsAsync(token);
-                var questions = await questionServiceProvider.getQuestionsAsync();
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
 
                 var result = from r in surveyResonses
                              select new
@@ -571,8 +582,8 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             try
             {
                 var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
-                var answers = await answerServiceProvider.getAnswersAsync();
+                var answers = await answerServiceProvider.getAnswersAsync(token);
-                var locations = await locationServiceProvider.getLocationsAsync();
+                var locations = await locationServiceProvider.getLocationsAsync(token);
                 var maintenanceCenters = locations.DistinctBy(m => m.MaintenanceCenter);
 
                 //get all the answers for the particular survey
@@ -631,12 +642,11 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             try
             {
                 var surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.LocationId.Equals(locationId)).ToListAsync();
-
+                var employees = await employeeServiceProvider.getEmployeesAsync(token);
-                var employees = await employeeServiceProvider.getEmployeesAsync();
+                var answers = await answerServiceProvider.getAnswersAsync(token);
-                var answers = await answerServiceProvider.getAnswersAsync();
+                var questions = await questionServiceProvider.getQuestionsAsync(token);
-                var questions = await questionServiceProvider.getQuestionsAsync();
                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
 
                 var result = from r in surveyResonses
                              select new
@@ -679,9 +689,9 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             try
             {
                 var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync();
-                var answers = await answerServiceProvider.getAnswersAsync();
+                var answers = await answerServiceProvider.getAnswersAsync(token);
-                var employees = await employeeServiceProvider.getEmployeesAsync();
+                var employees = await employeeServiceProvider.getEmployeesAsync(token);
-                var attachments = await attachmentServiceProvider.getAttachmentsAsync();
+                var attachments = await attachmentServiceProvider.getAttachmentsAsync(token);
 
                 var result = from r in surveyResponses
                              select new
@@ -724,12 +734,12 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
         {
             if (answerRequest != null)
             {
-                var answer = await answerServiceProvider.PostAnswersAsync(new Models.Answer { QuestionId = answerRequest.QuestionId, AnswerText = answerRequest.AnswerText, Comment = answerRequest.Comment, SurveyResponseId = surveyResponseId });
+                var answer = await answerServiceProvider.PostAnswersAsync(new Models.Answer { QuestionId = answerRequest.QuestionId, AnswerText = answerRequest.AnswerText, Comment = answerRequest.Comment, SurveyResponseId = surveyResponseId }, token);
                 if (answer != null)
                 {
                     List<AnswerInfo> listAnswerInfo = new List<AnswerInfo>();
                     listAnswerInfo.Add(new AnswerInfo { AnswerId = answer.Id, postedFiles = answerRequest.PostedFiles });
-                    var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo });
+                    var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo }, token);
 
                     string message = $"Answer for question {answerRequest.QuestionId} saved to the database";
                     logger?.LogInformation(message);
@@ -750,7 +760,6 @@ namespace DamageAssesment.Api.SurveyResponses.Providers
             }
         }
 
-
         public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.Request request)
         {
             try

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class LocationServiceProvider :ServiceProviderBase, ILocationServiceProvider
     {
@@ -10,11 +10,11 @@ namespace DamageAssesment.Api.SurveyResponses.Services
         {
         }
 
-        public async Task<List<Location>> getLocationsAsync()
+        public async Task<List<Location>> getLocationsAsync(string token)
         {
             try
             {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                 var locations = JsonConvert.DeserializeObject<List<Location>>(responseJsonString);
 
                 if (locations == null || !locations.Any())

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

@@ -1,8 +1,8 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class QuestionServiceProvider : ServiceProviderBase, IQuestionServiceProvider
     {
@@ -10,11 +10,11 @@ namespace DamageAssesment.Api.SurveyResponses.Services
         {
         }
 
-        public async Task<List<Question>> getQuestionsAsync()
+        public async Task<List<Question>> getQuestionsAsync(string token)
         {
             try
             {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
                 var questions = JsonConvert.DeserializeObject<List<Question>>(responseJsonString);
 
                 if (questions == null || !questions.Any())
@@ -28,12 +28,12 @@ namespace DamageAssesment.Api.SurveyResponses.Services
             }
         }
 
-        public async Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId)
+        public async Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId, string token)
         {
             try
             {
                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:SurveyQuestion"), surveyId);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                 var questions = JsonConvert.DeserializeObject<List<SurveyQuestions>>(responseJsonString);
 
                 if (questions == null || !questions.Any())
@@ -48,12 +48,12 @@ namespace DamageAssesment.Api.SurveyResponses.Services
         }
 
 
-        public async Task<Question> getQuestionsAsync(int questionId)
+        public async Task<Question> getQuestionsAsync(int questionId, string token)
         {
             try
             {
                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:QuestionById"), questionId);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                 var question = JsonConvert.DeserializeObject<Question>(responseJsonString);
 
                 if (question == null)

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

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

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

@@ -1,6 +1,6 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class ServiceProviderBase
     {

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

@@ -1,8 +1,8 @@
-using DamageAssesment.Api.SurveyResponses.Interfaces;
+using DamageAssesment.Api.Responses.Interfaces;
-using DamageAssesment.Api.SurveyResponses.Models;
+using DamageAssesment.Api.Responses.Models;
 using Newtonsoft.Json;
 
-namespace DamageAssesment.Api.SurveyResponses.Services
+namespace DamageAssesment.Api.Responses.Services
 {
     public class SurveyServiceProvider :ServiceProviderBase, ISurveyServiceProvider
     {
@@ -10,11 +10,11 @@ namespace DamageAssesment.Api.SurveyResponses.Services
         {
         }
 
-        public async Task<List<Survey>> getSurveysAsync()
+        public async Task<List<Survey>> getSurveysAsync(string token)
         {
             try
             {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                 var surveys = JsonConvert.DeserializeObject<List<Survey>>(responseJsonString);
 
                 if (surveys == null || !surveys.Any())
@@ -28,12 +28,12 @@ namespace DamageAssesment.Api.SurveyResponses.Services
             }
         }
 
-        public async Task<Survey> getSurveyAsync(int surveyId)
+        public async Task<Survey> getSurveyAsync(int surveyId, string token)
         {
             try
             {
                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:SurveyById"), surveyId);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token);
                 var survey = JsonConvert.DeserializeObject<Survey>(responseJsonString);
 
                 if (survey == null )