Project Folder Name changed from SurveyResponses to Responses

DamageAssesmentApi/DamageAssesment.Api.Answers.Test/AnswersServiceTest.cs

@@ -98,7 +98,7 @@ namespace DamageAssesment.Api.Answers.Test
             mockAnswerService.Setup(service => service.PostAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (OkObjectResult)await AnswerProvider.CreateAnswer(mockInputAnswer);
+            var result =  (OkObjectResult) await AnswerProvider.CreateAnswer(mockInputAnswer);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -112,7 +112,7 @@ namespace DamageAssesment.Api.Answers.Test
             mockAnswerService.Setup(service => service.PostAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (BadRequestObjectResult)await AnswerProvider.CreateAnswer(mockInputAnswer);
+            var result = (BadRequestObjectResult)  await AnswerProvider.CreateAnswer(mockInputAnswer);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -126,7 +126,7 @@ namespace DamageAssesment.Api.Answers.Test
             mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (OkObjectResult)await AnswerProvider.UpdateAnswer(mockInputAnswer);
+            var result = (OkObjectResult) await AnswerProvider.UpdateAnswer(mockInputAnswer);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -140,7 +140,7 @@ namespace DamageAssesment.Api.Answers.Test
             mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (NotFoundObjectResult)await AnswerProvider.UpdateAnswer(mockInputAnswer);
+            var result = (NotFoundObjectResult) await AnswerProvider.UpdateAnswer(mockInputAnswer);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -154,7 +154,7 @@ namespace DamageAssesment.Api.Answers.Test
             mockAnswerService.Setup(service => service.UpdateAnswerAsync(mockInputAnswer)).ReturnsAsync(mockResponse);
 
             var AnswerProvider = new AnswersController(mockAnswerService.Object);
-            var result = (BadRequestObjectResult)await AnswerProvider.UpdateAnswer(mockInputAnswer);
+            var result = (BadRequestObjectResult) await AnswerProvider.UpdateAnswer(mockInputAnswer);
 
             Assert.Equal(400, result.StatusCode);
         }

DamageAssesmentApi/DamageAssesment.Api.Answers.Test/MocData.cs

@@ -43,9 +43,9 @@ namespace DamageAssesment.Api.Answers.Test
             return (false, list, null);
         }
 
-        public static async Task<Answers.Db.Answer> getInputAnswerData()
+        public static async Task<Answers.Models.Answer> getInputAnswerData()
         {
-            return new Answers.Db.Answer { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 };
+            return new Answers.Models.Answer { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 };
 
         }
 

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

@@ -1,11 +1,9 @@
 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
 {
-    [Route("api")]
     [ApiController]
     public class AnswersController: ControllerBase
     {
@@ -14,7 +12,10 @@ namespace DamageAssesment.Api.Answers.Controllers
         public AnswersController(IAnswersProvider answersProvider) { 
         this.answerProvider=answersProvider;
         }
-        //get all answers
+        /// <summary>
+        /// Get all answers
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet("Answers")]
         public async Task<ActionResult> GetAnswersAsync() {
         
@@ -26,7 +27,11 @@ namespace DamageAssesment.Api.Answers.Controllers
                return NoContent();
 
         }
-        //get answer based on answerid
+        /// <summary>
+        /// Get an answer based on answerId.
+        /// </summary>
+
+        [Authorize(Roles = "admin")]
         [HttpGet("Answers/{Id}")]
         public async Task<ActionResult> GetAnswerByIdAsync(int Id)
         {
@@ -39,32 +44,40 @@ namespace DamageAssesment.Api.Answers.Controllers
             return NotFound();
 
         }
-        // get all answers based on response id
+        /// <summary>
-        [HttpGet("AnswersByResponse/{ResponseId}")]
+        /// Get all answers based on responseId.
-        public async Task<IActionResult> GetAnswersByResponseId(int ResponseId)
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpGet("Answers/ByResponse/{responseid}")]
+        public async Task<IActionResult> GetAnswersByResponseId(int responseid)
         {
-            var result = await this.answerProvider.GetAnswersAsync(ResponseId);
+            var result = await this.answerProvider.GetAnswersAsync(responseid);
             if(result.IsSuccess)
             {
                 return Ok(result.Answers);
             }
             return NoContent();
         }
-        // get all answers based on question id
+        /// <summary>
-        [HttpGet("AnswersByQuestion/{QuestionId}")]
+        /// Get all answers based on questionId.
-        public async Task<IActionResult> AnswersByQuestionId(int QuestionId)
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpGet("Answers/ByQuestion/{questionid}")]
+        public async Task<IActionResult> AnswersByQuestionId(int questionid)
         {
-            var result = await this.answerProvider.GetAnswersByQuestionAsync(QuestionId);
+            var result = await this.answerProvider.GetAnswersByQuestionAsync(questionid);
             if (result.IsSuccess)
             {
                 return Ok(result.Answers);
             }
             return NotFound();
         }
-        //update existing answer
+        /// <summary>
-
+        /// Update an existing answer.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPut("Answers")]
-        public async Task<IActionResult> UpdateAnswer(Db.Answer answer)
+        public async Task<IActionResult> UpdateAnswer(Models.Answer answer)
         {
             if (answer != null)
             {
@@ -80,13 +93,16 @@ namespace DamageAssesment.Api.Answers.Controllers
             }
             return NotFound();
         }
-        //save new answer
+        /// <summary>
+        /// Save a new answer.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPost("Answers")]
-        public async Task<IActionResult> CreateAnswer(Db.Answer answer)
+        public async Task<IActionResult> CreateAnswer(Models.Answer answer)
         {
             if (answer != null)
             {
-                var result = await this.answerProvider.PostAnswerAsync(answer);
+                var result =  await this.answerProvider.PostAnswerAsync(answer);
                 if (result.IsSuccess)
                 {
                     return Ok(result.Answer);
@@ -95,7 +111,10 @@ namespace DamageAssesment.Api.Answers.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = answer.Id }, answer);
         }
-        //delete existing answer
+        /// <summary>
+        ///  Delete an existing answer.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpDelete("Answers/{id}")]
         public async Task<IActionResult> DeleteAnswer(int id)
         {

DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj

@@ -4,10 +4,12 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

@@ -10,7 +10,13 @@ namespace DamageAssesment.Api.Answers.Db
             
         }
         public DbSet<Db.Answer> Answers { get; set; }
-       
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<Answer>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
     }
 
 }

DamageAssesmentApi/DamageAssesment.Api.Answers/Interfaces/IAnswersProvider.cs

@@ -6,8 +6,9 @@
         Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersByQuestionAsync(int questionId);
         Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> GetAnswerByIdAsync(int Id);
         Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync(int responseId);
-        Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Db.Answer Answer);
+        Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer);
-        Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Db.Answer Answer);
+        Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer);
         Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> DeleteAnswerAsync(int Id);
+        void SeedData();
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Answers/Profiles/AnswersProfile.cs

@@ -7,6 +7,7 @@ namespace DamageAssesment.Api.Answers.Profiles
         public AnswersProfile()
         {
             CreateMap<Db.Answer,Models.Answer>();
+            CreateMap<Models.Answer, Db.Answer>();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Answers/Program.cs

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

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

@@ -18,12 +18,11 @@ namespace DamageAssesment.Api.Answers.Providers
             this.answerDbContext = answerDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+            //SeedData();
         }
 
         public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync()
         {
-
             try
             {
                 logger?.LogInformation("Query Question");
@@ -108,16 +107,17 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Db.Answer Answer)
+        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer)
         {
             try
             {
                 logger?.LogInformation("Query Answer");
                 if (!AnswerExists(Answer.Id))
                 {
-                    answerDbContext.Answers.Add(Answer);
+                    Db.Answer answer = mapper.Map<Models.Answer, Db.Answer>(Answer);
-                    answerDbContext.SaveChanges();
+                    answerDbContext.Answers.Add(answer);
-                    var result = mapper.Map<Db.Answer, Models.Answer>(Answer);
+                    await answerDbContext.SaveChangesAsync();
+                    var result = mapper.Map<Db.Answer, Models.Answer>(answer);
                     return (true, result, null);
                 }
                 return (false, null, "Answer is already exits");
@@ -128,7 +128,7 @@ namespace DamageAssesment.Api.Answers.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Db.Answer Answer)
+        public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer)
         {
             try
             {
@@ -137,9 +137,10 @@ namespace DamageAssesment.Api.Answers.Providers
                     var existing = answerDbContext.Answers.AsNoTracking().FirstOrDefault(x => x.Id == Answer.Id);
                     if (existing != null)
                     {
-                        answerDbContext.Answers.Update(Answer);
+                        Db.Answer answer = mapper.Map<Models.Answer, Db.Answer>(Answer);
-                        answerDbContext.SaveChanges();
+                        answerDbContext.Answers.Update(answer);
-                        return (true, mapper.Map<Db.Answer, Models.Answer>(Answer), "Successful");
+                        await answerDbContext.SaveChangesAsync();
+                        return (true, mapper.Map<Db.Answer, Models.Answer>(answer), "Successful");
                     }
                     else
                     {
@@ -152,7 +153,6 @@ namespace DamageAssesment.Api.Answers.Providers
                     logger?.LogInformation($"{Answer} Bad Request");
                     return (false, null, "Bad request");
                 }
-
             }
             catch (Exception ex)
             {
@@ -187,7 +187,7 @@ namespace DamageAssesment.Api.Answers.Providers
             return answerDbContext.Answers.AsNoTracking().Count(e => e.Id == id) > 0;
         }
 
-        private void SeedData()
+        public void SeedData()
         {
             if (!answerDbContext.Answers.Any())
             {
@@ -199,10 +199,6 @@ namespace DamageAssesment.Api.Answers.Providers
                 answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
                 answerDbContext.SaveChanges();
             }
-
         }
-
-
-
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

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

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

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

@@ -17,7 +17,7 @@ namespace DamageAssesment.Api.Attachments.Test
 
             for (int i = 0; i < 10; i++)
             {
-                list.Add(new Attachments.Models.Attachment(i, Guid.NewGuid().ToString() + "@gmail.com")
+                list.Add(new Attachments.Models.Attachment()
                 {
                     Id = i,
                     AnswerId = i,
@@ -73,10 +73,10 @@ namespace DamageAssesment.Api.Attachments.Test
             return (false, list, null);
         }
 
-        public static async Task<List<Attachments.Db.Attachment>> getInputAttachmentData()
+        public static async Task<List<Attachments.Models.Attachment>> getInputAttachmentData()
         {
-            List<Attachments.Db.Attachment> Attachments=new List<Db.Attachment>();
+            List<Attachments.Models.Attachment> Attachments=new List<Models.Attachment>();
-            Attachments.Add(new Db.Attachment{ Id = 0, AnswerId = 10, ResponseId = 10, URI = "sample", IsDeleted = false,FileName="sample1" }) ;
+            Attachments.Add(new Models.Attachment{ Id = 0, AnswerId = 10, ResponseId = 10, URI = "sample", IsDeleted = false,FileName="sample1" }) ;
             return Attachments;
         }
 

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

@@ -1,13 +1,13 @@
 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;
 
 namespace DamageAssesment.Api.Attachments.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class AttachmentsController : ControllerBase
     {
@@ -19,7 +19,10 @@ namespace DamageAssesment.Api.Attachments.Controllers
             this.AttachmentProvider = AttachmentsProvider;
             this.UploadService = uploadService;  
         }
-        //get all Attachments
+        /// <summary>
+        /// Get all attachments.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet("Attachments")]
         public async Task<ActionResult> GetAttachmentsAsync()
         {
@@ -32,7 +35,10 @@ namespace DamageAssesment.Api.Attachments.Controllers
             return NoContent();
 
         }
-        //get all Attachment by Id
+        /// <summary>
+        /// Get all attachments by attachmentId.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet("Attachments/{id}")]
         public async Task<ActionResult> GetAttachmentbyIdAsync(int id)
         {
@@ -73,7 +79,10 @@ namespace DamageAssesment.Api.Attachments.Controllers
         //    }
         //}
 
-        //Save new Attachment
+        /// <summary>
+        /// Save new Attachment(s)
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPost("Attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo)
         {
@@ -81,9 +90,9 @@ namespace DamageAssesment.Api.Attachments.Controllers
             {
                 if (attachmentInfo.Answers.Count > 0)
                 {
-                    var Attachments = await this.AttachmentProvider.GetAttachmentCounter();
+                    var Attachments =  await this.AttachmentProvider.GetAttachmentCounter();
-                    List<Db.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
+                    List<Models.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers);
-                    var result = await this.AttachmentProvider.PostAttachmentAsync(attachments);
+                    var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments);
                     if (result.IsSuccess)
                     {
                         return Ok(result.Attachments);
@@ -97,8 +106,10 @@ namespace DamageAssesment.Api.Attachments.Controllers
                 return BadRequest($"Internal server error: {ex}");
             }
         }
-
+        /// <summary>
-        //Save new Attachment
+        /// Modify an new attachment.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPut("Attachments"), DisableRequestSizeLimit]
         public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
         {
@@ -106,10 +117,10 @@ namespace DamageAssesment.Api.Attachments.Controllers
             {
                 if (attachmentInfo.Answers.Count > 0)
                 {
-                    var res = await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
+                    var res =  await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers);
                     if (res.IsSuccess)
                     {
-                        List<Db.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
+                        List<Models.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments);
                         var result = await this.AttachmentProvider.PutAttachmentAsync(attachments);
                         if (result.IsSuccess)
                         {
@@ -126,12 +137,15 @@ namespace DamageAssesment.Api.Attachments.Controllers
                 return BadRequest($"Internal server error: {ex}");
             }
         }
-        //delete existing Attachment
+        /// <summary>
-        [HttpDelete("Delete")]
+        /// Delete an existing attachment.
-        public async Task<IActionResult> DeleteAttachment(int Id)
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpDelete("Attachments/{id}")]
+        public async Task<IActionResult> DeleteAttachment(int id)
         {
             // database soft delete
-            var result = await this.AttachmentProvider.DeleteAttachmentAsync(Id);
+            var result = await this.AttachmentProvider.DeleteAttachmentAsync(id);
             if (result.IsSuccess)
             {
                 // deleting file from folder

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

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

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

@@ -4,11 +4,13 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <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.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />

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

@@ -8,5 +8,12 @@ namespace DamageAssesment.Api.Attachments.Db
         {
         }
         public DbSet<Db.Attachment> Attachments { get; set; }
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<Attachment>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
     }
 }

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

@@ -6,8 +6,8 @@ namespace DamageAssesment.Api.Attachments.Interfaces
     {
         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync();
         Task<(bool IsSuccess, Models.Attachment Attachment, string ErrorMessage)> GetAttachmentByIdAsync(int Id);
-        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Db.Attachment> Attachments);
+        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments);
-        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Db.Attachment> Attachments);
+        Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments);
         Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> DeleteAttachmentAsync(int Id);
         Task<(bool IsSuccess, int counter, string Path)> DeleteAttachmentsAsync(int responseId, int answerId);
         Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds);

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

@@ -4,9 +4,9 @@ namespace DamageAssesment.Api.Attachments.Interfaces
 {
     public interface IUploadService
     {
-        List<Db.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
+        List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
-        List<Db.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
+        List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
-        public List<Db.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
+        public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
         void Deletefile(string path);
         void Movefile(string path);
     }

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

@@ -13,10 +13,10 @@ namespace DamageAssesment.Api.Attachments.Models
         public bool IsDeleted { get; set; }
         public string FileName { get; set; }
 
-        public Attachment(int answerId, string uri)
+        //public Attachment(int answerId, string uri)
-        {
+        //{
-            this.AnswerId = answerId;
+        //    this.AnswerId = answerId;
-            this.URI = uri;
+        //    this.URI = uri;
-        }
+        //}
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Profiles/AttachmentsProfiles.cs

@@ -5,6 +5,7 @@
         public AttachmentsProfiles()
         {
             CreateMap<Db.Attachment, Models.Attachment>();
+            CreateMap<Models.Attachment, Db.Attachment>();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Attachments/Program.cs

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

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

@@ -21,7 +21,7 @@ namespace DamageAssesment.Api.Attachments.Providers
             this.logger = logger;
             this.mapper = mapper;
             this.uploadservice = uploadservice;
-            SeedData();
+           // SeedData();
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
         {
@@ -65,14 +65,15 @@ namespace DamageAssesment.Api.Attachments.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Db.Attachment> Attachments)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments)
         {
             try
             {
                 logger?.LogInformation("Query Attachment");
-                AttachmentDbContext.Attachments.AddRange(Attachments);
+                List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
-                AttachmentDbContext.SaveChanges();
+                AttachmentDbContext.Attachments.AddRange(attachments);
-                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachments);
+                await AttachmentDbContext.SaveChangesAsync();
+                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -82,14 +83,15 @@ namespace DamageAssesment.Api.Attachments.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Db.Attachment> Attachments)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments)
         {
             try
             {
                 logger?.LogInformation("Query Attachment");
-                AttachmentDbContext.Attachments.UpdateRange(Attachments);
+                List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
-                AttachmentDbContext.SaveChanges();
+                AttachmentDbContext.Attachments.UpdateRange(attachments);
-                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachments);
+                await AttachmentDbContext.SaveChangesAsync();
+                var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
                 return (true, result, null);
             }
             catch (Exception ex)
@@ -108,7 +110,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachments.Count > 0)
                 {
                     AttachmentDbContext.Attachments.RemoveRange(Attachments);
-                    AttachmentDbContext.SaveChanges();
+                    await AttachmentDbContext.SaveChangesAsync();
                 }
                 return (true, AttachmentId, "");
             }
@@ -141,7 +143,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 if (Attachments.Count > 0)
                 {
                     AttachmentDbContext.Attachments.RemoveRange(Attachments);
-                    AttachmentDbContext.SaveChanges();
+                    await AttachmentDbContext.SaveChangesAsync();
                 }
                 return (true, AttachmentId, "");
             }
@@ -152,7 +154,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 return (false, AttachmentId, "");
             }
         }
-        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)>GetAttachmentInfo(List<AnswerInfo> answers)
+        public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentInfo(List<AnswerInfo> answers)
         {
             try
             {
@@ -181,7 +183,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                 }
                 Attachment.IsDeleted = true;
                 AttachmentDbContext.Attachments.Update(Attachment);
-                AttachmentDbContext.SaveChanges();
+                await AttachmentDbContext.SaveChangesAsync();
                 return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id} is deleted");
             }
             catch (Exception ex)
@@ -204,10 +206,11 @@ namespace DamageAssesment.Api.Attachments.Providers
                 FileModel fileModel= new FileModel(){AttachmentId=0,FileName="Sample",FileContent= "c2FtcGxl",FileExtension=".txt"};
                 List<AnswerInfo> answerInfos=new List<AnswerInfo>();
                 answerInfos.Add(new AnswerInfo(){ AnswerId = 1,postedFiles=new List<FileModel> { fileModel }});
-                List<Db.Attachment> attachments = uploadservice.UploadAttachment(1, 0, answerInfos);
+                List<Models.Attachment> attachments = uploadservice.UploadAttachment(1, 0, answerInfos);
                 if (attachments.Count > 0)
                 {
-                    AttachmentDbContext.Attachments.AddRange(attachments);
+                    List<Db.Attachment> Attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(attachments);
+                    AttachmentDbContext.Attachments.AddRange(Attachments);
                     AttachmentDbContext.SaveChanges();
                 }
             }

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

@@ -24,7 +24,7 @@ namespace DamageAssesment.Api.Attachments.Providers
             uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
         }
-        public List<Db.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
+        public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
         {
             var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
             String responseDirectory = "Response-" + responseId;
@@ -42,7 +42,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                     Deletefile(searchFile);
                 }
             }
-            List<Db.Attachment> attachments = new List<Db.Attachment>();
+            List<Models.Attachment> attachments = new List<Models.Attachment>();
             foreach (IFormFile item in postedFile)
             {
                 
@@ -55,15 +55,15 @@ namespace DamageAssesment.Api.Attachments.Providers
                 {
                     item.CopyTo(stream);
                 }
-                attachments.Add(new Db.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
+                attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
             }
 
             return attachments;
         }
 
-        public List<Db.Attachment> UploadAttachment(int responseId, int counter,List<AnswerInfo> answers)
+        public List<Models.Attachment> UploadAttachment(int responseId, int counter,List<AnswerInfo> answers)
         {
-            List<Db.Attachment> attachments = new List<Db.Attachment>();
+            List<Models.Attachment> attachments = new List<Models.Attachment>();
             try
             {
                 foreach (var item in answers)
@@ -94,20 +94,20 @@ namespace DamageAssesment.Api.Attachments.Providers
                         var dbPath = Path.Combine(fullDirectoryPath, fileName);
                         File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
 
-                        attachments.Add(new Db.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
+                        attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
                     }
                 }
                 return attachments;
             }
             catch (Exception ex) {
-                return new List<Db.Attachment>();
+                return new List<Models.Attachment>();
             }
 
            
         }
-        public List<Db.Attachment> UpdateAttachments(int responseId,List<AnswerInfo> answers,IEnumerable<Models.Attachment> attachments)
+        public List<Models.Attachment> UpdateAttachments(int responseId,List<AnswerInfo> answers,IEnumerable<Models.Attachment> attachments)
         {
-            List<Db.Attachment> Dbattachments = new List<Db.Attachment>();
+            List<Models.Attachment> Dbattachments = new List<Models.Attachment>();
             foreach (Models.Attachment searchFile in attachments)
             {
                 Deletefile(searchFile.URI);
@@ -131,7 +131,7 @@ namespace DamageAssesment.Api.Attachments.Providers
                     var dbPath = Path.Combine(fullDirectoryPath, fileName);
                     File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
 
-                    Dbattachments.Add(new Db.Attachment { Id=attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
+                    Dbattachments.Add(new Models.Attachment { Id=attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath });
                 }
             }
             return Dbattachments;

DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

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

@@ -2,6 +2,7 @@
 using DamageAssesment.Api.Documents.Interfaces;
 using DamageAssesment.Api.Documents.Models;
 using DamageAssesment.Api.Documents.Providers;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
@@ -24,6 +25,7 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// Get all document link type.
         /// </summary>
         [HttpGet]
+        [Authorize(Roles = "admin")]
         [Route("doculinks/types")]
         public async Task<IActionResult> GetLinkTypesAsync()
         {
@@ -37,6 +39,7 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// <summary>
         /// Get a document link type by id.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet]
         [Route("doculinks/types/{id}")]
         public async Task<IActionResult> GetLinkTypeAsync(int id)
@@ -51,6 +54,7 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// <summary>
         /// Update a existing document link type.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPut]
         [Route("doculinks/types")]
         public async Task<IActionResult> UpdateLinkType(Models.LinkType linkType)
@@ -72,6 +76,7 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// <summary>
         /// Create a new document link type.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks/types")]
         public async Task<IActionResult> CreateLinkType(Models.LinkType linkType)
@@ -90,6 +95,7 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// <summary>
         /// Delete a  existing document link type by id.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpDelete]
         [Route("doculinks/types/{id}")]
         public async Task<IActionResult> DeleteLinkType(int id)
@@ -101,11 +107,12 @@ namespace DamageAssesment.Api.Documents.Controllers
             }
             return NotFound();
         }
-            /// <summary>
+        /// <summary>
-            /// Get all documents.
+        /// Get all documents.
-            /// </summary>
+        /// </summary>
-            /// 
+        
-            [Route("doculinks")]
+        [Authorize(Roles = "admin")]
+        [Route("doculinks")]
         [Route("doculinks/{linktype:alpha}")]
         [Route("doculinks/{linktype:alpha}/{language:alpha}")]
         [HttpGet]
@@ -138,6 +145,7 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// <summary>
         /// Get a document by id.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet]
         [Route("doculinks/{id}")]
         [Route("doculinks/{id}/{linktype:alpha}")]
@@ -154,6 +162,7 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// <summary>
         /// Upload new document.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPut]
         [Route("doculinks/{id}")]
         public async Task<IActionResult> UpdateDocument(int id,DocumentInfo documentInfo)
@@ -178,6 +187,7 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// <summary>
         /// update existing document.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPost]
         [Route("doculinks")]
         public async Task<IActionResult> CreateDocument(DocumentInfo documentInfo)
@@ -205,6 +215,7 @@ namespace DamageAssesment.Api.Documents.Controllers
         /// <summary>
         /// Delete document by id.
         /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpDelete]
         [Route("doculinks/{id}")]
         public async Task<IActionResult> DeleteDocument(int id)

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

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

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">

DamageAssesmentApi/DamageAssesment.Api.Documents/Program.cs

@@ -2,23 +2,73 @@ 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(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);
 });
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+//builder.Services.AddSwaggerGen();
 builder.Services.AddScoped<IDocumentsProvider, documentsProvider>();
 builder.Services.AddScoped<IUploadService, UploadService>();
 builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
@@ -36,6 +86,7 @@ if (app.Environment.IsDevelopment())
     app.UseSwaggerUI();
 }
 
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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/appsettings.json

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

DamageAssesmentApi/DamageAssesment.Api.Employees.Test/EmployeeServiceTest.cs

@@ -43,11 +43,11 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task GetEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse("Emp1");
+            var mockResponse = await MockData.getOkResponse(1);
-            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync("Emp1")).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync(1)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.GetEmployeeByIdAsync("Emp1");
+            var result = (OkObjectResult)await EmployeeProvider.GetEmployeeByIdAsync(1);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -57,10 +57,10 @@ namespace DamageAssesment.Api.Employees.Test
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync("Emp99")).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.GetEmployeeByIdAsync(99999)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundResult)await EmployeeProvider.GetEmployeeByIdAsync("Emp99");
+            var result = (NotFoundResult)await EmployeeProvider.GetEmployeeByIdAsync(99999);
             Assert.Equal(404, result.StatusCode);
         }
 
@@ -68,7 +68,7 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task PostEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse("Emp1");
+            var mockResponse = await MockData.getOkResponse(1);
             var mockInputEmployee = await MockData.getInputEmployeeData();
             mockEmployeeService.Setup(service => service.PostEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
 
@@ -96,12 +96,12 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task PutEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse("Emp1");
+            var mockResponse = await MockData.getOkResponse(1);
             var mockInputEmployee = await MockData.getInputEmployeeData();
-            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(1,mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.UpdateEmployee(mockInputEmployee);
+            var result = (OkObjectResult)await EmployeeProvider.UpdateEmployee(1,mockInputEmployee);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -112,10 +112,10 @@ namespace DamageAssesment.Api.Employees.Test
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
             var mockInputEmployee = await MockData.getInputEmployeeData();
-            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(1, mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundObjectResult)await EmployeeProvider.UpdateEmployee(mockInputEmployee);
+            var result = (NotFoundObjectResult)await EmployeeProvider.UpdateEmployee(1, mockInputEmployee);
 
             Assert.Equal(404, result.StatusCode);
         }
@@ -126,10 +126,10 @@ namespace DamageAssesment.Api.Employees.Test
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputEmployee = await MockData.getInputEmployeeData();
-            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(mockInputEmployee)).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.UpdateEmployeeAsync(1, mockInputEmployee)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (BadRequestObjectResult)await EmployeeProvider.UpdateEmployee(mockInputEmployee);
+            var result = (BadRequestObjectResult)await EmployeeProvider.UpdateEmployee(1, mockInputEmployee);
 
             Assert.Equal(400, result.StatusCode);
         }
@@ -138,12 +138,12 @@ namespace DamageAssesment.Api.Employees.Test
         public async Task DeleteEmployeeAsync_ShouldReturnStatusCode200()
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
-            var mockResponse = await MockData.getOkResponse("Emp1");
+            var mockResponse = await MockData.getOkResponse(1);
 
-            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync("Emp1")).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync(1)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (OkObjectResult)await EmployeeProvider.DeleteEmployee("Emp1");
+            var result = (OkObjectResult)await EmployeeProvider.DeleteEmployee(1);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -153,10 +153,10 @@ namespace DamageAssesment.Api.Employees.Test
         {
             var mockEmployeeService = new Mock<IEmployeesProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync("Emp1")).ReturnsAsync(mockResponse);
+            mockEmployeeService.Setup(service => service.DeleteEmployeeAsync(1)).ReturnsAsync(mockResponse);
 
             var EmployeeProvider = new EmployeesController(mockEmployeeService.Object);
-            var result = (NotFoundResult)await EmployeeProvider.DeleteEmployee("Emp1");
+            var result = (NotFoundResult)await EmployeeProvider.DeleteEmployee(1);
 
             Assert.Equal(404, result.StatusCode);
         }

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

@@ -1,8 +1,4 @@
-using System;
+using System.Text;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DamageAssesment.Api.Employees.Test
 {
@@ -15,13 +11,13 @@ namespace DamageAssesment.Api.Employees.Test
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Employees.Models.Employee { Id = "Emp"+i, Name = "Emoployee"+i, Email = "abc"+i+"@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18-i), IsActive = true, PreferredLanguage = "en" });
+                list.Append(new Employees.Models.Employee { Id = i, Name = "Emoployee"+i, Email = "abc"+i+"@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18-i), IsActive = true, PreferredLanguage = "en" });
             }
             return (true, list, null);
         }
 
 
-        public static async Task<(bool, Employees.Models.Employee, string)> getOkResponse(string Id)
+        public static async Task<(bool, Employees.Models.Employee, string)> getOkResponse(int Id)
         {
             var Employees = await getOkResponse();
             var Employee = Employees.Item2.FirstOrDefault(s => s.Id == Id);
@@ -33,19 +29,19 @@ namespace DamageAssesment.Api.Employees.Test
             return (false, null, "Bad Request");
         }
 
-        public static async Task<(bool, Employees.Models.Employee, string)> getNotFoundResponse()
+        public static async Task<(bool, Models.Employee, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Employees.Models.Employee>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Models.Employee>, string)> getNoContentResponse()
         {
             IEnumerable<Employees.Models.Employee> list = new List<Employees.Models.Employee>();
             return (false, list, null);
         }
 
-        public static async Task<Employees.Db.Employee> getInputEmployeeData()
+        public static async Task<Models.Employee> getInputEmployeeData()
         {
-            return new Employees.Db.Employee { Id = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" };
+            return new Models.Employee { Id = 1, Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" };
 
         }
 

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

@@ -1,10 +1,10 @@
 using DamageAssesment.Api.Employees.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Employees.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class EmployeesController : ControllerBase
     {
@@ -15,7 +15,11 @@ namespace DamageAssesment.Api.Employees.Controllers
         {
             this.EmployeeProvider = EmployeesProvider;
         }
-        //get all Employees
+
+        /// <summary>
+        /// GET request for retrieving employees.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet("Employees")]
         public async Task<ActionResult> GetEmployeesAsync()
         {
@@ -28,12 +32,16 @@ namespace DamageAssesment.Api.Employees.Controllers
             return NoContent();
 
         }
-        //get Employee based on Employeeid
+
-        [HttpGet("Employees/{Id}")]
+        /// <summary>
-        public async Task<ActionResult> GetEmployeeByIdAsync(string Id)
+        /// GET request for retrieving an employee by ID.
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpGet("Employees/{id}")]
+        public async Task<ActionResult> GetEmployeeByIdAsync(int id)
         {
 
-            var result = await EmployeeProvider.GetEmployeeByIdAsync(Id);
+            var result = await EmployeeProvider.GetEmployeeByIdAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Employee);
@@ -41,14 +49,18 @@ namespace DamageAssesment.Api.Employees.Controllers
             return NotFound();
 
         }
-        //update existing Employee
 
-        [HttpPut("Employees")]
+        /// <summary>
-        public async Task<IActionResult> UpdateEmployee(Db.Employee Employee)
+        /// 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)
         {
             if (Employee != null)
             {
-                var result = await this.EmployeeProvider.UpdateEmployeeAsync(Employee);
+                var result = await this.EmployeeProvider.UpdateEmployeeAsync(id,Employee);
                 if (result.IsSuccess)
                 {
                     return Ok(result.Employee);
@@ -60,9 +72,14 @@ namespace DamageAssesment.Api.Employees.Controllers
             }
             return NotFound();
         }
-        //save new Employee
+
+        /// <summary>
+        /// 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(Db.Employee Employee)
+        public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
         {
             if (Employee != null)
             {
@@ -73,11 +90,15 @@ namespace DamageAssesment.Api.Employees.Controllers
                 }
                 return BadRequest(result.ErrorMessage);
             }
-            return CreatedAtRoute("DefaultApi", new { id = Employee.Id }, Employee);
+            return CreatedAtRoute("DefaultApi", new { Id = Employee.Id }, Employee);
         }
-        //delete existing Employee
+        /// <summary>
+        /// 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(string id)
+        public async Task<IActionResult> DeleteEmployee(int id)
         {
             var result = await this.EmployeeProvider.DeleteEmployeeAsync(id);
             if (result.IsSuccess)

DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj

@@ -1,13 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

@@ -5,7 +5,9 @@ namespace DamageAssesment.Api.Employees.Db
     public class Employee
     {
         [Key]
-        public string Id { get; set; }
+        public int Id { get; set; }
+        [StringLength(50)]
+        public string EmployeeCode { get; set; }
 
         [StringLength(50)]
         public string Name { get; set; }
@@ -17,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Db
 
         [StringLength(50)]
         public string Email { get; set; }
-        public bool IsActive {get;set;}
+        public bool IsActive { get; set; }
         public string? PreferredLanguage { get; set; } = "en";
     }
 }

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

@@ -7,8 +7,15 @@ namespace DamageAssesment.Api.Employees.Db
         public DbSet<Db.Employee> Employees { get; set; }
         public EmployeeDbContext(DbContextOptions options) : base(options)
         {
+        }
 
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
 
+            modelBuilder.Entity<Employee>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/Interfaces/IEmployeesProvider.cs

@@ -3,9 +3,10 @@
     public interface IEmployeesProvider
     {
         Task<(bool IsSuccess, IEnumerable<Models.Employee> Employees, string ErrorMessage)> GetEmployeesAsync();
-        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(string Id);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(int Id);
-        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Db.Employee Employee);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Models.Employee Employee);
-        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(Db.Employee Employee);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(int Id, Models.Employee Employee);
-        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(string Id);
+        Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(int Id);
+        void SeedData();
     }
 }

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

@@ -4,18 +4,11 @@ namespace DamageAssesment.Api.Employees.Models
 {
     public class Employee
     {
-        [Key]
+        public int Id { get; set; }
-        public string Id { get; set; }
+        public string EmployeeCode { get; set; }
-
-        [StringLength(50)]
         public string Name { get; set; }
-
         public DateTime BirthDate { get; set; }
-
-        [StringLength(50)]
         public string OfficePhoneNumber { get; set; }
-
-        [StringLength(50)]
         public string Email { get; set; }
         public bool IsActive { get; set; }
         public string? PreferredLanguage { get; set; } = "en";

DamageAssesmentApi/DamageAssesment.Api.Employees/Profiles/EmployeesProfile.cs

@@ -7,6 +7,7 @@ namespace DamageAssesment.Api.Employees.Profiles
         public EmployeesProfile()
         {
             CreateMap<Db.Employee, Models.Employee>();
+            CreateMap<Models.Employee, Db.Employee>();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Employees/Program.cs

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

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

@@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Providers
             this.EmployeeDbContext = EmployeeDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+            // SeedData();
         }
 
         public async Task<(bool IsSuccess, IEnumerable<Models.Employee> Employees, string ErrorMessage)> GetEmployeesAsync()
@@ -45,12 +45,12 @@ namespace DamageAssesment.Api.Employees.Providers
 
         }
 
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(string Id)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> GetEmployeeByIdAsync(int Id)
         {
             try
             {
                 logger?.LogInformation("Query Employee");
-                var Employee = await EmployeeDbContext.Employees.AsNoTracking().FirstOrDefaultAsync(q => q.Id.ToLower() == Id.ToLower());
+                var Employee = await EmployeeDbContext.Employees.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
                 if (Employee != null)
                 {
                     logger?.LogInformation($"{Employee} customer(s) found");
@@ -65,19 +65,21 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Db.Employee Employee)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> PostEmployeeAsync(Models.Employee Employee)
         {
             try
             {
+                Db.Employee _employee = mapper.Map<Models.Employee, Db.Employee>(Employee);
+
                 logger?.LogInformation("Query Employee");
-                if (!EmployeeExists(Employee.Id))
+                if (!EmployeeCodeExists(Employee.EmployeeCode))
                 {
-                    EmployeeDbContext.Employees.Add(Employee);
+                    EmployeeDbContext.Employees.Add(_employee);
+                    Employee.Id = _employee.Id;
                     EmployeeDbContext.SaveChanges();
-                    var result = mapper.Map<Db.Employee, Models.Employee>(Employee);
+                    return (true, Employee, null);
-                    return (true, result, null);
                 }
-                return (false, null, "Employee is already exits");
+                return (false, null, "Employee code is already exits");
             }
             catch (Exception ex)
             {
@@ -85,19 +87,21 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(Db.Employee Employee)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> UpdateEmployeeAsync(int Id, Models.Employee Employee)
         {
             try
             {
                 if (Employee != null)
                 {
-                    var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id.ToLower() == Employee.Id.ToLower()).FirstOrDefaultAsync();
+                    var _employee = await EmployeeDbContext.Employees.AsNoTracking().Where(s => s.Id == Id).FirstOrDefaultAsync();
 
                     if (_employee != null)
                     {
-                        EmployeeDbContext.Employees.Update(Employee);
+                        Db.Employee vEmployee = mapper.Map<Models.Employee, Db.Employee>(Employee);
+                        EmployeeDbContext.Employees.Update(vEmployee);
                         EmployeeDbContext.SaveChanges();
-                        return (true, mapper.Map<Db.Employee, Models.Employee>(Employee), "Successful");
+                        Employee.Id = Id;
+                        return (true, Employee, "Successful");
                     }
                     else
                     {
@@ -118,11 +122,11 @@ namespace DamageAssesment.Api.Employees.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(string Id)
+        public async Task<(bool IsSuccess, Models.Employee Employee, string ErrorMessage)> DeleteEmployeeAsync(int Id)
         {
             try
             {
-                Db.Employee Employee = EmployeeDbContext.Employees.AsNoTracking().Where(a => a.Id.ToLower() == Id.ToLower()).FirstOrDefault();
+                Db.Employee Employee = EmployeeDbContext.Employees.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
                 if (Employee == null)
                 {
                     return (false, null, "Not Found");
@@ -135,24 +139,29 @@ namespace DamageAssesment.Api.Employees.Providers
             {
 
                 logger?.LogError(ex.ToString());
-                return (false,null, ex.Message);
+                return (false, null, ex.Message);
             }
         }
-        private bool EmployeeExists(string id)
+        private bool EmployeeExists(int id)
         {
-            return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id.ToLower() == id.ToLower()) > 0;
+            return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.Id == id) > 0;
         }
 
-        private void SeedData()
+        private bool EmployeeCodeExists(string employeeCode)
+        {
+            return EmployeeDbContext.Employees.AsNoTracking().Count(e => e.EmployeeCode.ToLower() == employeeCode.ToLower()) > 0;
+        }
+
+        public void SeedData()
         {
             if (!EmployeeDbContext.Employees.Any())
             {
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678",BirthDate=DateTime.Now.AddYears(-18), IsActive = true,PreferredLanguage="en" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 1, EmployeeCode = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 2, EmployeeCode = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30) ,IsActive = true, PreferredLanguage = "fr" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 3, EmployeeCode = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30), IsActive = true, PreferredLanguage = "fr" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20) ,IsActive = true, PreferredLanguage = "en" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 4, EmployeeCode = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20), IsActive = true, PreferredLanguage = "en" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23) ,IsActive = true, PreferredLanguage = "sp" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" });
-                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32) ,IsActive = true, PreferredLanguage = "sp" });
+                EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 6, EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), IsActive = true, PreferredLanguage = "es" });
                 EmployeeDbContext.SaveChanges();
             }
 

DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.json

@@ -1,14 +1,12 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*",
+  "AllowedHosts": "*"
-  "settings": {
-    "endpoint1": "xxx",
-    "endpoint2": "xxx",
-    "endpoint3": "xxx"
-  }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations.Test/LocationsServiceTest.cs

@@ -1,11 +1,6 @@
-using AutoMapper;
 using DamageAssesment.Api.Locations.Controllers;
-using DamageAssesment.Api.Locations.Db;
 using DamageAssesment.Api.Locations.Interfaces;
-using DamageAssesment.Api.Locations.Profiles;
-using DamageAssesment.Api.Locations.Providers;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
 using Moq;
 using Xunit;
 
@@ -13,131 +8,144 @@ namespace DamageAssesment.Api.Locations.Test
 {
     public class LocationsServiceTest
     {
-
+        //Test for locations
-        [Fact(DisplayName = "Get Location using Location ID")]
+        [Fact(DisplayName = "Get Locations - Ok case")]
-        public async Task GetLocationsUsingLocationID()
+        public async Task GetLocationsAsync_ShouldReturnStatusCode200()
         {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
+            var mockLocationService = new Mock<ILocationsProvider>();
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
+            var mockResponse = await MockData.getOkResponseLocation();
-            .Options;
+            mockLocationService.Setup(service => service.GetLocationsAsync()).ReturnsAsync(mockResponse);
 
-            var dbContext = new LocationDbContext(options);
+            var locationProvider = new LocationsController(mockLocationService.Object);
-            CreateLocations(dbContext);
+            var result = (OkObjectResult)await locationProvider.GetLocationsAsync();
-            //Mapping 
-            var LocationsProfile = new LocationProfile();
-            var configuration = new MapperConfiguration(cfg => cfg.AddProfile(LocationsProfile));
-            var mapper = new Mapper(configuration);
 
-            var LocationsProvider = new LocationsProvider(dbContext, null, mapper);
+            Assert.Equal(200, result.StatusCode);
-            //Testmethode
-            var Location = await LocationsProvider.GetLocationByIdAsync("Loc3");
-
-            Assert.True(Location.IsSuccess);
-            Assert.Null(Location.ErrorMessage);
-        }
-        [Fact(DisplayName = "Get Locations")]
-        public async Task GetAllLocationsTest()
-        {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
-            .Options;
-
-            var dbContext = new LocationDbContext(options);
-            CreateLocations(dbContext);
-            //Mapping 
-            var LocationsProfile = new LocationProfile();
-            var configuration = new MapperConfiguration(cfg => cfg.AddProfile(LocationsProfile));
-            var mapper = new Mapper(configuration);
-
-            var LocationsProvider = new LocationsProvider(dbContext, null, mapper);
-            //Testmethode
-            var Location = await LocationsProvider.GetLocationsAsync();
-
-            Assert.True(Location.IsSuccess);
-            Assert.Null(Location.ErrorMessage);
         }
 
-        [Fact(DisplayName = "Delete Location by Id")]
+
-        public async Task DeleteLocationTest()
+        [Fact(DisplayName = "Get Locations - NoContent Case")]
+        public async Task GetLocationsAsync_ShouldReturnStatusCode204()
         {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
+            var mockLocationService = new Mock<ILocationsProvider>();
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
+            var mockResponse = await MockData.getNotFoundResponseLocation();
-            .Options;
+            mockLocationService.Setup(service => service.GetLocationsAsync()).ReturnsAsync(mockResponse);
 
-            var dbContext = new LocationDbContext(options);
+            var locationProvider = new LocationsController(mockLocationService.Object);
-            CreateLocations(dbContext);
+            var result = (NoContentResult)await locationProvider.GetLocationsAsync();
-            //Mapping 
-            var LocationsProfile = new LocationProfile();
-            var configuration = new MapperConfiguration(cfg => cfg.AddProfile(LocationsProfile));
-            var mapper = new Mapper(configuration);
 
-            var LocationsProvider = new LocationsProvider(dbContext, null, mapper);
+            Assert.Equal(204, result.StatusCode);
-            //Testmethode
-            var Location = await LocationsProvider.DeleteLocationAsync("Loc2");
-
-            Assert.True(Location.IsSuccess);
-            Assert.NotNull(Location.ErrorMessage);
         }
-        [Fact(DisplayName = "Add Location")]
+
-        public async Task AddLocationTest()
+        [Fact(DisplayName = "Get Locations by Id- Ok case")]
+        public async Task GetLocationsByIdAsync_ShouldReturnStatusCode200()
         {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
+            var mockLocationService = new Mock<ILocationsProvider>();
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
+            var mockResponse = await MockData.getOkResponseLocation(1);
-            .Options;
+            mockLocationService.Setup(service => service.GetLocationByIdAsync(1)).ReturnsAsync(mockResponse);
 
-            var dbContext = new LocationDbContext(options);
+            var locationProvider = new LocationsController(mockLocationService.Object);
-            CreateLocations(dbContext);
+            var result = (OkObjectResult)await locationProvider.GetLocationByIdAsync(1);
-            //Mapping 
-            var LocationsProfile = new LocationProfile();
-            var configuration = new MapperConfiguration(cfg => cfg.AddProfile(LocationsProfile));
-            var mapper = new Mapper(configuration);
-            var LocationsProvider = new LocationsProvider(dbContext, null, mapper);
-            //Testmethode
-            Db.Location newLocation = new Db.Location() { Id = "Loc9", RegionId = "1", Name = "Test 1", MaintenanceCenter = "1", SchoolType = "US" };
-            var Location = await LocationsProvider.PostLocationAsync(newLocation);
 
-            Assert.True(Location.IsSuccess);
+            Assert.Equal(200, result.StatusCode);
-            Assert.Null(Location.ErrorMessage);
         }
-        [Fact(DisplayName = "Update Location")]
-        public async Task UpdateLocationTest()
-        {
-            var options = new DbContextOptionsBuilder<LocationDbContext>()
-            .UseInMemoryDatabase(nameof(GetLocationsUsingLocationID))
-            .Options;
-            var dbContext = new LocationDbContext(options);
-            CreateLocations(dbContext);
-            //Mapping 
-            var LocationsProfile = new LocationProfile();
-            var configuration = new MapperConfiguration(cfg => cfg.AddProfile(LocationsProfile));
-            var mapper = new Mapper(configuration);
-            var LocationsProvider = new LocationsProvider(dbContext, null, mapper);
-            //Testmethode
-            Db.Location updateLocation = new Db.Location() { Id = "Loc1", RegionId = "1", Name = "Tampa", MaintenanceCenter = "1", SchoolType = "NA" };
-            var Location = await LocationsProvider.UpdateLocationAsync(updateLocation);
-            var modified = dbContext.Locations.FirstOrDefault(a => a.Id == updateLocation.Id);
-            Assert.True(Location.IsSuccess);
-            Assert.NotNull(Location.ErrorMessage);
-        }
-        private static void CreateLocations(LocationDbContext dbContext)
-        {
-            //Create sample data for testing
-            if (dbContext.Locations.Count() == 0)
-            {
-                for (int i = 1; i < 6; i++)
-                {
-                    dbContext.Locations.Add(new Db.Location()
-                    {
-                        Id = "Loc"+i.ToString(),
-                        RegionId = i.ToString(),
-                        Name = "Test Location" + Guid.NewGuid().ToString(),
-                        MaintenanceCenter = i.ToString(),
-                        SchoolType = "US"
 
-                    });
+
-                }
+        [Fact(DisplayName = "Get Locations By Id - NoFound Case")]
-                dbContext.SaveChanges();
+        public async Task GetLocationsByIdAsync_ShouldReturnStatusCode404()
-            }
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocationNotFoundResponse();
+            mockLocationService.Setup(service => service.GetLocationByIdAsync(1)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (NotFoundResult)await locationProvider.GetLocationByIdAsync(1);
+
+            Assert.Equal(404, result.StatusCode);
+        }
+
+
+        [Fact(DisplayName = "Post Location - Ok case")]
+        public async Task PostLocationAsync_ShouldReturnStatusCode200()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getOkResponseLocation(1);
+            var mockInputLocation = new Models.Location { Id = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.PostLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.CreateLocation(mockInputLocation);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Post Location - BadRequest case")]
+        public async Task PostLocationAsync_ShouldReturnStatusCode400()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocationNotFoundResponse();
+            var mockInputLocation = new Models.Location { Id = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.PostLocationAsync(mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (BadRequestObjectResult)await locationProvider.CreateLocation(mockInputLocation);
+
+            Assert.Equal(400, result.StatusCode);
+        }
+
+
+        [Fact(DisplayName = "Put Location - Ok case")]
+        public async Task PutLocationAsync_ShouldReturnStatusCode200()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocation(true, "update success");
+            var mockInputLocation = new Models.Location { Id = 1, LocationCode ="Loc1", RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.UpdateLocationAsync(1,mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.UpdateLocation(1,mockInputLocation);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Put Location - NotFound case")]
+        public async Task PutLocationAsync_ShouldReturnStatusCode404()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocation(false, null);
+            var mockInputLocation = new Models.Location { Id = 1, RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            mockLocationService.Setup(service => service.UpdateLocationAsync(1,mockInputLocation)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (NotFoundResult)await locationProvider.UpdateLocation(1,mockInputLocation);
+
+            Assert.Equal(404, result.StatusCode);
+        }
+
+
+        [Fact(DisplayName = "Delete Location - Ok case")]
+        public async Task DeleteLocationAsync_ShouldReturnStatusCode200()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocation(true, "delete success");
+            mockLocationService.Setup(service => service.DeleteLocationAsync(1)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (OkObjectResult)await locationProvider.DeleteLocation(1);
+
+            Assert.Equal(200, result.StatusCode);
+        }
+
+        [Fact(DisplayName = "Delete Location - NotFound case")]
+        public async Task DeleteLocationAsync_ShouldReturnStatusCode404()
+        {
+            var mockLocationService = new Mock<ILocationsProvider>();
+            var mockResponse = await MockData.getLocation(false, null);
+            mockLocationService.Setup(service => service.DeleteLocationAsync(1)).ReturnsAsync(mockResponse);
+
+            var locationProvider = new LocationsController(mockLocationService.Object);
+            var result = (NotFoundResult)await locationProvider.DeleteLocation(1);
+
+            Assert.Equal(404, result.StatusCode);
         }
 
         //Tests for regions
@@ -172,11 +180,11 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task GetRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse("1");
+            var mockResponse = await MockData.getOkResponse(1);
-            mockRegionService.Setup(service => service.GetRegionByIdAsync("1")).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.GetRegionByIdAsync(1)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.GetRegionAsync("1");
+            var result = (OkObjectResult)await regionProvider.GetRegionAsync(1);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -186,18 +194,18 @@ namespace DamageAssesment.Api.Locations.Test
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockRegionService.Setup(service => service.GetRegionByIdAsync("99")).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.GetRegionByIdAsync(99999)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundResult)await regionProvider.GetRegionAsync("99");
+            var result = (NotFoundResult)await regionProvider.GetRegionAsync(99);
             Assert.Equal(404, result.StatusCode);
         }
 
         [Fact(DisplayName = "Post Region - Ok case")]
-        public async Task PostSurveyAsync_ShouldReturnStatusCode200()
+        public async Task PostRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse("1");
+            var mockResponse = await MockData.getOkResponse(1);
             var mockInputRegion = await MockData.getInputRegionData();
             mockRegionService.Setup(service => service.PostRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
 
@@ -208,7 +216,7 @@ namespace DamageAssesment.Api.Locations.Test
         }
 
         [Fact(DisplayName = "Post Region - BadRequest case")]
-        public async Task PostSurveyAsync_ShouldReturnStatusCode400()
+        public async Task PostRegionAsync_ShouldReturnStatusCode400()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getBadRequestResponse();
@@ -225,68 +233,68 @@ namespace DamageAssesment.Api.Locations.Test
         public async Task PutRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse("1");
+            var mockResponse = await MockData.getOkResponse(1);
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(1,mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
+            var result = (OkObjectResult)await regionProvider.PutRegionAsync(1,mockInputRegion);
 
             Assert.Equal(200, result.StatusCode);
         }
 
         [Fact(DisplayName = "Put Region - NotFound case")]
-        public async Task PutSurveyAsync_ShouldReturnStatusCode404()
+        public async Task PutRegionAsync_ShouldReturnStatusCode404()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(1, mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
+            var result = (NotFoundObjectResult)await regionProvider.PutRegionAsync(1,mockInputRegion);
 
             Assert.Equal(404, result.StatusCode);
         }
 
         [Fact(DisplayName = "Put Region - BadRequest case")]
-        public async Task PutSurveyAsync_ShouldReturnStatusCode400()
+        public async Task PutRegionyAsync_ShouldReturnStatusCode400()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getBadRequestResponse();
             var mockInputRegion = await MockData.getInputRegionData();
-            mockRegionService.Setup(service => service.PutRegionAsync(mockInputRegion)).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.PutRegionAsync(1, mockInputRegion)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (BadRequestObjectResult)await regionProvider.PutRegionAsync(mockInputRegion);
+            var result = (BadRequestObjectResult)await regionProvider.PutRegionAsync(1, mockInputRegion);
 
             Assert.Equal(400, result.StatusCode);
         }
 
         [Fact(DisplayName = "Delete Region - Ok case")]
-        public async Task DeleteSurveyAsync_ShouldReturnStatusCode200()
+        public async Task DeleteRegionAsync_ShouldReturnStatusCode200()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
-            var mockResponse = await MockData.getOkResponse("1");
+            var mockResponse = await MockData.getOkResponse(1);
 
-            mockRegionService.Setup(service => service.DeleteRegionAsync("1")).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.DeleteRegionAsync(1)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (OkObjectResult)await regionProvider.DeleteRegionAsync("1");
+            var result = (OkObjectResult)await regionProvider.DeleteRegionAsync(1);
 
             Assert.Equal(200, result.StatusCode);
         }
 
         [Fact(DisplayName = "Delete Region - NotFound case")]
-        public async Task DeleteSurveyAsync_ShouldReturnStatusCode404()
+        public async Task DeleteRegionAsync_ShouldReturnStatusCode404()
         {
             var mockRegionService = new Mock<IRegionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
 
-            mockRegionService.Setup(service => service.DeleteRegionAsync("1")).ReturnsAsync(mockResponse);
+            mockRegionService.Setup(service => service.DeleteRegionAsync(1)).ReturnsAsync(mockResponse);
 
             var regionProvider = new RegionsController(mockRegionService.Object);
-            var result = (NotFoundResult)await regionProvider.DeleteRegionAsync("1");
+            var result = (NotFoundResult)await regionProvider.DeleteRegionAsync(1);
 
             Assert.Equal(404, result.StatusCode);
         }

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

@@ -9,17 +9,52 @@ namespace DamageAssesment.Api.Locations.Test
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Locations.Models.Region { Id = "R" + i, Abbreviation = "AB" + i, Name = "Region " + i });
+                list.Append(new Locations.Models.Region { Id = i, Abbreviation = "AB" + i, Name = "Region " + i });
             }
             return (true, list, null);
         }
 
 
-        public static async Task<(bool, Locations.Models.Region, string)> getOkResponse(string Id)
+        public static async Task<(bool, Locations.Models.Region, string)> getOkResponse(int Id)
         {
-            var surveys = await getOkResponse();
+            var regions = await getOkResponse();
-            var survey = surveys.Item2.FirstOrDefault(s => s.Id == Id);
+            var region = regions.Item2.FirstOrDefault(s => s.Id == Id);
-            return (true, survey, null);
+            return (true, region, null);
+        }
+
+
+        public static async Task<(bool, IEnumerable<Models.Location>, string)> getOkResponseLocation()
+        {
+            IEnumerable<Locations.Models.Location> list = new List<Models.Location>();
+
+            for (int i = 0; i < 10; i++)
+            {
+                list.Append(new Locations.Models.Location { Id = i, RegionId = i, Name = "Location" });
+            }
+            return (true, list, null);
+        }
+
+        public static async Task<(bool, IEnumerable<Models.Location>, string)> getNotFoundResponseLocation()
+        {
+            return (false, null, null);
+        }
+
+        public static async Task<(bool, Models.Location, string)> getOkResponseLocation(int Id)
+        {
+            var locations = await getOkResponseLocation();
+            var location = locations.Item2.FirstOrDefault(s => s.Id == Id);
+            return (true, location, null);
+        }
+
+        public static async Task<(bool, Models.Location, string)> getLocation(bool value, string message)
+        {
+            var location = new Models.Location { Id = 1, LocationCode = "Loc1", RegionId = 1, Name = "Location 1", SchoolType = "US", MaintenanceCenter = "1" };
+            return (value, location, message);
+        }
+
+        public static async Task<(bool, Locations.Models.Location, string)> getLocationNotFoundResponse()
+        {
+            return (false, null, "Not Found");
         }
 
         public static async Task<(bool, Locations.Models.Region, string)> getBadRequestResponse()
@@ -39,8 +74,7 @@ namespace DamageAssesment.Api.Locations.Test
 
         public static async Task<Locations.Models.Region> getInputRegionData()
         {
-            return new Locations.Models.Region { Id = "R99", Name = "Region 99", Abbreviation = "A99" };
+            return new Locations.Models.Region { Id = 99999, Name = "Region 99", Abbreviation = "A99" };
         }
-
     }
 }

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

@@ -1,20 +1,22 @@
 using DamageAssesment.Api.Locations.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Locations.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class LocationsController : ControllerBase
     {
         private ILocationsProvider LocationProvider;
-
         public LocationsController(ILocationsProvider LocationsProvider)
         {
             this.LocationProvider = LocationsProvider;
         }
-        // Get all Locations
+        /// <summary>
+        /// Get all locations.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet("Locations")]
         public async Task<ActionResult> GetLocationsAsync()
         {
@@ -22,14 +24,17 @@ namespace DamageAssesment.Api.Locations.Controllers
             var result = await LocationProvider.GetLocationsAsync();
             if (result.IsSuccess)
             {
-                return Ok(result.locations);
+                return Ok(result.Locations);
             }
-            return NotFound();
+            return NoContent();
 
         }
-        // Get all Location based on Id
+        /// <summary>
+        /// Get all locations based on locationdId.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpGet("Locations/{id}")]
-        public async Task<ActionResult> GetLocationByIdAsync(string id)
+        public async Task<ActionResult> GetLocationByIdAsync(int id)
         {
 
             var result = await LocationProvider.GetLocationByIdAsync(id);
@@ -40,44 +45,53 @@ namespace DamageAssesment.Api.Locations.Controllers
             return NotFound();
 
         }
-        // Update Location entity
+        /// <summary>
-        [HttpPut("Locations")]
+        /// Update a Location.
-        public async Task<IActionResult> UpdateLocation(Db.Location Location)
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpPut("Locations/{id}")]
+        public async Task<IActionResult> UpdateLocation(int id, Models.Location Location)
         {
             if (Location != null)
             {
-                var result = await this.LocationProvider.UpdateLocationAsync(Location);
+                var result = await this.LocationProvider.UpdateLocationAsync(id, Location);
                 if (result.IsSuccess)
                 {
-                    return Ok(result.ErrorMessage);
+                    return Ok(result.Location);
                 }
                 return NotFound();
             }
             return NotFound();
         }
-        //save new location
+        /// <summary>
+        /// Save a new location.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpPost("Locations")]
-        public async Task<IActionResult> CreateLocation(Db.Location Location)
+        public async Task<IActionResult> CreateLocation(Models.Location Location)
         {
             if (Location != null)
             {
                 var result = await this.LocationProvider.PostLocationAsync(Location);
                 if (result.IsSuccess)
                 {
-                    return Ok(result.Question);
+                    return Ok(result.Location);
                 }
-                return NotFound();
+                return BadRequest(result.ErrorMessage);
             }
-            return CreatedAtRoute("DefaultApi", new { id = Location.Id }, Location);
+            return BadRequest();
         }
-        //delete existing location
+        /// <summary>
+        /// Delete an existing location.
+        /// </summary>
+        [Authorize(Roles = "admin")]
         [HttpDelete("Locations/{id}")]
-        public async Task<IActionResult> DeleteLocation(string id)
+        public async Task<IActionResult> DeleteLocation(int id)
         {
             var result = await this.LocationProvider.DeleteLocationAsync(id);
             if (result.IsSuccess)
             {
-                return Ok(result.ErrorMessage);
+                return Ok(result.Location);
             }
             return NotFound();
         }

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

@@ -1,9 +1,9 @@
 using DamageAssesment.Api.Locations.Interfaces;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Locations.Controllers
 {
-    [Route("api/[controller]")]
     [ApiController]
     public class RegionsController : ControllerBase
     {
@@ -13,31 +13,39 @@ namespace DamageAssesment.Api.Locations.Controllers
         {
             this.regionProvider = regionProvider;
         }
-
+        /// <summary>
-        // Get all Regions
+        /// Get all regions.2
-        [HttpGet]
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpGet("regions")]
         public async Task<ActionResult> GetRegionsAsync()
         {
             var result = await regionProvider.GetRegionsAsync();
             if (result.IsSuccess)
             {
-                return Ok(result.regions);
+                return Ok(result.Regions);
             }
             return NoContent();
         }
-
+        /// <summary>
-        [HttpGet("{Id}")]
+        /// GET request for retrieving a region by its ID.
-        public async Task<ActionResult> GetRegionAsync(string Id)
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpGet("regions/{id}")]
+        public async Task<ActionResult> GetRegionAsync(int id)
         {
-            var result = await this.regionProvider.GetRegionByIdAsync(Id);
+            var result = await this.regionProvider.GetRegionByIdAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Region);
             }
             return NotFound();
         }
-
+        /// <summary>
-        [HttpPost]
+        /// POST request for creating a new region.
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpPost("regions")]
         public async Task<ActionResult> PostRegionAsync(Models.Region region)
         {
             var result = await this.regionProvider.PostRegionAsync(region);
@@ -47,11 +55,14 @@ namespace DamageAssesment.Api.Locations.Controllers
             }
             return BadRequest(result.ErrorMessage);
         }
-
+        /// <summary>
-        [HttpPut]
+        /// PUT request for updating an existing region.
-        public async Task<ActionResult> PutRegionAsync(Models.Region region)
+        /// </summary>
+        [Authorize(Roles = "admin")]
+        [HttpPut("regions/{id}")]
+        public async Task<ActionResult> PutRegionAsync(int id, Models.Region region)
         {
-            var result = await this.regionProvider.PutRegionAsync(region);
+            var result = await this.regionProvider.PutRegionAsync(id,region);
             if (result.IsSuccess)
             {
                 return Ok(result.Region);
@@ -61,11 +72,15 @@ namespace DamageAssesment.Api.Locations.Controllers
 
             return BadRequest(result.ErrorMessage);
         }
+        /// <summary>
+        /// DELETE request for deleting a region based on ID.
+        /// </summary>
 
-        [HttpDelete("{Id}")]
+        [Authorize(Roles = "admin")]
-        public async Task<ActionResult> DeleteRegionAsync(string Id)
+        [HttpDelete("regions/{id}")]
+        public async Task<ActionResult> DeleteRegionAsync(int id)
         {
-            var result = await this.regionProvider.DeleteRegionAsync(Id);
+            var result = await this.regionProvider.DeleteRegionAsync(id);
             if (result.IsSuccess)
             {
                 return Ok(result.Region);

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

@@ -4,10 +4,12 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

@@ -6,18 +6,20 @@ namespace DamageAssesment.Api.Locations.Db
     public class Location
     {
         [Key]
+        public int Id { get; set; }
+        [ForeignKey("Region")]
+        public int RegionId { get; set; }
         [StringLength(4)]
-        public string Id { get; set; }
+        public string LocationCode { get; set; }
 
         [StringLength(50)]
         public string Name { get; set; }
 
-        [StringLength(1)]
+        [StringLength(4)]
         public string MaintenanceCenter { get; set; }
 
         [StringLength(2)]
         public string SchoolType { get; set; }
-        [ForeignKey("Region")]
+
-        public string RegionId { get; set; }
     }
 }

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

@@ -2,7 +2,7 @@
 
 namespace DamageAssesment.Api.Locations.Db
 {
-    public class LocationDbContext:DbContext
+    public class LocationDbContext : DbContext
     {
         public DbSet<Db.Location> Locations { get; set; }
         public DbSet<Db.Region> Regions { get; set; }
@@ -10,5 +10,17 @@ namespace DamageAssesment.Api.Locations.Db
         {
 
         }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<Location>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<Region>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+
+        }
     }
 }

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

@@ -5,15 +5,12 @@ namespace DamageAssesment.Api.Locations.Db
     public class Region
     {
         [Key]
-        [StringLength(2)]
+        public int Id { get; set; }
-        public string Id { get; set; }
   
         [StringLength(50)]
         public string Name { get; set; }
 
         [StringLength(5)]
         public string Abbreviation { get; set; }
-
-       // public ICollection<Location> Locations { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Interfaces/ILocationsProvider.cs

@@ -4,10 +4,11 @@ namespace DamageAssesment.Api.Locations.Interfaces
 {
     public interface ILocationsProvider
     {
-        Task<(bool IsSuccess, IEnumerable<Models.Location> locations, string ErrorMessage)> GetLocationsAsync();
+        Task<(bool IsSuccess, IEnumerable<Models.Location> Locations, string ErrorMessage)> GetLocationsAsync();
-        Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> GetLocationByIdAsync(string Id);
+        Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> GetLocationByIdAsync(int Id);
-        Task<(bool IsSuccess, Models.Location Question, string ErrorMessage)> PostLocationAsync(Db.Location Location);
+        Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> PostLocationAsync(Models.Location Location);
-        Task<(bool IsSuccess, string ErrorMessage)> UpdateLocationAsync(Db.Location Location);
+        Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> UpdateLocationAsync(int Id, Models.Location Location);
-        Task<(bool IsSuccess, string ErrorMessage)> DeleteLocationAsync(string Id);
+        Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> DeleteLocationAsync(int Id);
+        void SeedData();
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Interfaces/IRegionsProvider.cs

@@ -2,10 +2,11 @@
 {
     public interface IRegionsProvider
     {
-        Task<(bool IsSuccess, IEnumerable<Models.Region> regions, string ErrorMessage)> GetRegionsAsync();
+        Task<(bool IsSuccess, IEnumerable<Models.Region> Regions, string ErrorMessage)> GetRegionsAsync();
-        Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(string Id);
+        Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(int Id);
         Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> PostRegionAsync(Models.Region region);
-        Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> PutRegionAsync(Models.Region region);
+        Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> PutRegionAsync(int Id, Models.Region region);
-        Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> DeleteRegionAsync(string Id);
+        Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> DeleteRegionAsync(int Id);
+        void SeedData();
     }
 }

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

@@ -4,19 +4,12 @@ namespace DamageAssesment.Api.Locations.Models
 {
     public class Location
     {
-        [StringLength(4)]
+        [Key]
-        public string Id { get; set; }
+        public int Id { get; set; }
-
+        public int RegionId { get; set; }
-        [StringLength(1)]
+        public string LocationCode { get; set; }
-        public string RegionId { get; set; }
-
-        [StringLength(50)]
         public string Name { get; set; }
-
-        [StringLength(1)]
         public string MaintenanceCenter { get; set; }
-
-        [StringLength(2)]
         public string SchoolType { get; set; }
     }
 }

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

@@ -4,14 +4,8 @@ namespace DamageAssesment.Api.Locations.Models
 {
     public class Region
     {
-        
+        public int Id { get; set; }
-        [StringLength(1)]
-        public string Id { get; set; }
-
-        [StringLength(50)]
         public string Name { get; set; }
-
-        [StringLength(5)]
         public string Abbreviation { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Profiles/LocationProfile.cs

@@ -5,6 +5,7 @@
         public LocationProfile()
         {
             CreateMap<Db.Location, Models.Location>();
+            CreateMap<Models.Location, Db.Location>();
         }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Locations/Program.cs

@@ -1,17 +1,74 @@
 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();
+builder.Services.AddSwaggerGen(options =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    options.IncludeXmlComments(xmlPath);
 
+    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
+    {
+        Name = "Bearer",
+        BearerFormat = "JWT",
+        Scheme = "bearer",
+        Description = "Specify the authorization token.",
+        In = ParameterLocation.Header,
+        Type = SecuritySchemeType.Http,
+    };
+
+    options.AddSecurityDefinition("jwt_auth", securityDefinition);
+
+    // Make sure swagger UI requires a Bearer token specified
+    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
+    {
+        Reference = new OpenApiReference()
+        {
+            Id = "jwt_auth",
+            Type = ReferenceType.SecurityScheme
+        }
+    };
+
+    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
+    {
+        {securityScheme, new string[] { }},
+    };
+
+    options.AddSecurityRequirement(securityRequirements);
+});
 builder.Services.AddScoped<ILocationsProvider, LocationsProvider>();
 builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
@@ -19,15 +76,28 @@ 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())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
+
+    using (var serviceScope = app.Services.CreateScope())
+    {
+        var services = serviceScope.ServiceProvider;
+        var locationProvider = services.GetRequiredService<ILocationsProvider>();
+        var regionProvider = services.GetRequiredService<IRegionsProvider>();
+        locationProvider.SeedData();
+        regionProvider.SeedData();
+    }
 }
 
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -17,42 +17,19 @@ namespace DamageAssesment.Api.Locations.Providers
             this.locationDbContext = locationDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+            //SeedData();
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Location> locations, string ErrorMessage)> GetLocationsAsync()
+        public async Task<(bool IsSuccess, IEnumerable<Models.Location> Locations, string ErrorMessage)> GetLocationsAsync()
-        {
-
-            try
-            {
-                logger?.LogInformation("Query Question");
-                var Location = await locationDbContext.Locations.AsNoTracking().ToListAsync();
-                if (Location != null)
-                {
-                    logger?.LogInformation($"{Location.Count} Locations(s) found");
-                    var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(Location);
-                    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.Location Location, string ErrorMessage)> GetLocationByIdAsync(string Id)
         {
             try
             {
                 logger?.LogInformation("Query Location");
-                var Location = await locationDbContext.Locations.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                var locations = await locationDbContext.Locations.AsNoTracking().ToListAsync();
-                if (Location != null)
+                if (locations != null)
                 {
-                    logger?.LogInformation($"{Location} customer(s) found");
+                    logger?.LogInformation($"{locations.Count} Locations(s) found");
-                    var result = mapper.Map<Db.Location, Models.Location>(Location);
+                    var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(locations);
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -63,21 +40,42 @@ namespace DamageAssesment.Api.Locations.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Location Question, string ErrorMessage)> PostLocationAsync(Db.Location Location)
+
+        public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> GetLocationByIdAsync(int Id)
         {
             try
             {
                 logger?.LogInformation("Query Location");
-                if (!LocationExists(Location.Id))
+                var location = await locationDbContext.Locations.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                if (location != null)
                 {
-                    locationDbContext.Locations.Add(Location);
+                    logger?.LogInformation($"{location}  found");
-                    locationDbContext.SaveChanges();
+                    var result = mapper.Map<Db.Location, Models.Location>(location);
-                    var result = mapper.Map<Db.Location, Models.Location>(Location);
                     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.Location Location, string ErrorMessage)> PostLocationAsync(Models.Location location)
+        {
+            try
+            {
+                if (!LocationCodeExists(location.LocationCode))
+                {
+                    Db.Location _location = mapper.Map<Models.Location, Db.Location>(location);
+                    locationDbContext.Locations.Add(_location);
+                    await locationDbContext.SaveChangesAsync();
+                    location.Id = _location.Id;
+                    return (true, location, null);
+                }
                 else
                 {
-                    return (false, null, "Location is Already exists");
+                    return (false, null, "Location code is already exists");
                 }
             }
             catch (Exception ex)
@@ -86,56 +84,67 @@ namespace DamageAssesment.Api.Locations.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, string ErrorMessage)> UpdateLocationAsync(Db.Location Location)
+        public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> UpdateLocationAsync(int Id, Models.Location location)
         {
             try
             {
-                locationDbContext.Entry(Location).State = EntityState.Modified;
+                if (LocationExists(Id))
-                locationDbContext.SaveChanges();
-                return (true, "Record updated successfully");
-            }
-            catch (Exception ex)
-            {
-
-                logger?.LogError(ex.ToString());
-                return (false, ex.Message);
-            }
-        }
-        public async Task<(bool IsSuccess, string ErrorMessage)> DeleteLocationAsync(string Id)
-        {
-            try
-            {
-                Db.Location Location = locationDbContext.Locations.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
-                if (Location == null)
                 {
-                    return (false, "record not found");
+                    Db.Location _location = mapper.Map<Models.Location, Db.Location>(location);
+                    locationDbContext.Entry(_location).State = EntityState.Modified;
+                    await locationDbContext.SaveChangesAsync();
+                    return (true, location, "Record updated successfully");
+                }
+                else
+                {
+                    return (false, null, "Location is not exists");
                 }
-                locationDbContext.Locations.Remove(Location);
-                locationDbContext.SaveChanges();
-                return (true, "Record deleted successfully");
             }
             catch (Exception ex)
             {
-
                 logger?.LogError(ex.ToString());
-                return (false, ex.Message);
+                return (false, null, ex.Message);
+            }
+        }
+        public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> DeleteLocationAsync(int Id)
+        {
+            try
+            {
+                Db.Location location = locationDbContext.Locations.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
+                if (location == null)
+                {
+                    return (false, null, "record not found");
+                }
+                locationDbContext.Locations.Remove(location);
+                await locationDbContext.SaveChangesAsync();
+                return (true, mapper.Map<Db.Location, Models.Location>(location), "Record deleted successfully");
+            }
+            catch (Exception ex)
+            {
+                logger?.LogError(ex.ToString());
+                return (false, null, ex.Message);
             }
         }
 
-        private bool LocationExists(string id)
+        private bool LocationExists(int id)
         {
             return locationDbContext.Locations.AsNoTracking().Count(e => e.Id == id) > 0;
         }
-        private void SeedData()
+
+        private bool LocationCodeExists(string locationCode)
+        {
+            return locationDbContext.Locations.AsNoTracking().Count(e => e.LocationCode.ToLower() == locationCode.ToLower()) > 0;
+        }
+        public void SeedData()
         {
             if (!locationDbContext.Locations.Any())
             {
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc1", RegionId = "1", Name = "BOB GRAHAM EDUCATION CENTER 1", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = 1, LocationCode = "Loc1", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 1", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc2", RegionId = "2", Name = "BOB GRAHAM EDUCATION CENTER 2", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = 2, LocationCode = "Loc2", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 2", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc3", RegionId = "3", Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = 3, LocationCode = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc4", RegionId = "1", Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = 4, LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc5", RegionId = "2", Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });
-                locationDbContext.Locations.Add(new Db.Location() { Id = "Loc6", RegionId = "3", Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
+                locationDbContext.Locations.Add(new Db.Location() { Id = 6, LocationCode = "Loc6", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
                 locationDbContext.SaveChanges();
             }
 

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

@@ -1,7 +1,6 @@
 using AutoMapper;
 using DamageAssesment.Api.Locations.Db;
 using DamageAssesment.Api.Locations.Interfaces;
-using DamageAssesment.Api.Locations.Models;
 using Microsoft.EntityFrameworkCore;
 
 namespace DamageAssesment.Api.Locations.Providers
@@ -17,10 +16,10 @@ namespace DamageAssesment.Api.Locations.Providers
             this.locationDbContext = regionDbContext;
             this.logger = logger;
             this.mapper = mapper;
-            SeedData();
+            //SeedData();
         }
 
-        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(string Id)
+        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(int Id)
         {
             try
             {
@@ -42,7 +41,7 @@ namespace DamageAssesment.Api.Locations.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Region> regions, string ErrorMessage)> GetRegionsAsync()
+        public async Task<(bool IsSuccess, IEnumerable<Models.Region> Regions, string ErrorMessage)> GetRegionsAsync()
         {
             try
             {
@@ -70,11 +69,10 @@ namespace DamageAssesment.Api.Locations.Providers
             {
                 if (region != null)
                 {
-                    var regions = await locationDbContext.Regions.AsNoTracking().ToListAsync();
+                    var _region = mapper.Map<Models.Region, Db.Region>(region);
-
+                    locationDbContext.Regions.Add(_region);
-                    region.Id = Convert.ToString(regions.Count + 1);
+                    await locationDbContext.SaveChangesAsync();
-                    locationDbContext.Regions.Add(mapper.Map<Models.Region, Db.Region>(region));
+                    region.Id = _region.Id;
-                    locationDbContext.SaveChanges();
                     logger?.LogInformation($"{region} added successfuly");
                     return (true, region, "Successful");
                 }
@@ -91,30 +89,38 @@ namespace DamageAssesment.Api.Locations.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> PutRegionAsync(Models.Region region)
+        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> PutRegionAsync(int Id, Models.Region region)
         {
             try
             {
                 if (region != null)
                 {
-                    var _region = await locationDbContext.Regions.AsNoTracking().Where(s => s.Id == region.Id).FirstOrDefaultAsync();
+                    var _region = await locationDbContext.Regions.AsNoTracking().Where(s => s.Id == Id).FirstOrDefaultAsync();
 
                     if (_region != null)
                     {
-                        locationDbContext.Regions.Update(mapper.Map<Models.Region, Db.Region>(region));
+                        if (RegionExists(region.Id))
-                        locationDbContext.SaveChanges();
+                        {
-                        return (true, region, "Region updated Successfuly");
+                            locationDbContext.Regions.Update(mapper.Map<Models.Region, Db.Region>(region));
+                            locationDbContext.SaveChanges();
+                            return (true, region, "Region updated Successfuly");
+                        }
+                        else
+                        {
+                            logger?.LogInformation($"RegionID: {Id} Not exists");
+                            return (false, null, "Region not exists");
+                        }
                     }
                     else
                     {
-                        logger?.LogInformation($"RegionID: {region.Id} Not found");
+                        logger?.LogInformation($"RegionID: {Id} Not found");
                         return (false, null, "Not Found");
                     }
 
                 }
                 else
                 {
-                    logger?.LogInformation($"RegionID: {region.Id} Bad Request");
+                    logger?.LogInformation($"RegionID: {Id} Bad Request");
                     return (false, null, "Bad request");
                 }
             }
@@ -125,7 +131,7 @@ namespace DamageAssesment.Api.Locations.Providers
             }
         }
 
-        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> DeleteRegionAsync(string Id)
+        public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> DeleteRegionAsync(int Id)
         {
             try
             {
@@ -150,13 +156,18 @@ namespace DamageAssesment.Api.Locations.Providers
             }
         }
 
-        private void SeedData()
+        private bool RegionExists(int id)
+        {
+            return locationDbContext.Regions.AsNoTracking().Count(e => e.Id == id) > 0;
+        }
+
+        public void SeedData()
         {
             if (!locationDbContext.Regions.Any())
             {
-                locationDbContext.Regions.Add(new Db.Region() { Id = "1", Name = "North", Abbreviation = "N" });
+                locationDbContext.Regions.Add(new Db.Region() { Id = 1, Name = "North", Abbreviation = "N" });
-                locationDbContext.Regions.Add(new Db.Region() { Id = "2", Name = "South", Abbreviation = "S" });
+                locationDbContext.Regions.Add(new Db.Region() { Id = 2, Name = "South", Abbreviation = "S" });
-                locationDbContext.Regions.Add(new Db.Region() { Id = "3", Name = "Central", Abbreviation = "C" });
+                locationDbContext.Regions.Add(new Db.Region() { Id = 3, Name = "Central", Abbreviation = "C" });
                 locationDbContext.SaveChanges();
             }
         }

DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

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

@@ -1,13 +1,9 @@
-using DamageAssesment.Api.Questions.Db;
+using DamageAssesment.Api.Questions.Interfaces;
-using DamageAssesment.Api.Questions.Interfaces;
+using Microsoft.AspNetCore.Authorization;
-using DamageAssesment.Api.Questions.Models;
-using DamageAssesment.Api.Questions.Providers;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 
 namespace DamageAssesment.Api.Questions.Controllers
 {
-    [Route("api")]
     [ApiController]
     public class QuestionsController : ControllerBase
     {
@@ -15,45 +11,68 @@ namespace DamageAssesment.Api.Questions.Controllers
 
         public QuestionsController(IQuestionsProvider questionsProvider)
         {
-
             this.questionsProvider = questionsProvider;
-
         }
-        // get all questions
+        /// <summary>
-        [HttpGet("Questions")]
+        /// GET request for retrieving questions.
-        public async Task<IActionResult> GetQuestionsAsync()
+        /// </summary>
+
+        //get all questions
+        [Authorize(Roles = "admin,survey,user,report")]
+        [Route("Questions")]
+        [Route("Questions/{language:alpha}")]
+        [HttpGet]
+        public async Task<IActionResult> GetQuestionsAsync(string? language)
         {
-            var result = await this.questionsProvider.GetQuestionsAsync();
+            var result = await this.questionsProvider.GetQuestionsAsync(language);
             if (result.IsSuccess)
             {
                 return Ok(result.Questions);
             }
             return NoContent();
         }
+
         //Get questions based on question id
-        [HttpGet("Questions/{id}")]
+        /// <summary>
-        public async Task<IActionResult> GetQuestionAsync(int id)
+        /// 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]
+        public async Task<IActionResult> GetQuestionByIdAsync(int id, string? language)
         {
-            var result = await this.questionsProvider.GetQuestionAsync(id);
+            var result = await this.questionsProvider.GetQuestionAsync(id, language);
             if (result.IsSuccess)
             {
                 return Ok(result.Question);
             }
             return NotFound();
         }
+
         //get all questions based on survey id
-        [HttpGet("GetSurveyQuestions/{surveyId}")]
+        /// <summary>
-        public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? Language)
+        /// 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]
+        public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? language)
         {
-            if (string.IsNullOrEmpty(Language)) Language = "en";
+            var result = await this.questionsProvider.GetSurveyQuestionAsync(surveyId, language);
-            var result = await this.questionsProvider.GetSurveyQuestionAsync(surveyId, Language);
             if (result.IsSuccess)
             {
                 return Ok(result.SurveyQuestions);
             }
             return NotFound();
         }
-        //update existing question
+        /// <summary>
+        /// PUT request for updating a question (multilingual).
+        /// </summary>
+
+        [Authorize(Roles = "admin")]
         [HttpPut("Questions")]
         public async Task<IActionResult> UpdateQuestion(Models.Question question)
         {
@@ -71,7 +90,11 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
         }
-        //save new question
+        /// <summary>
+        /// POST request for creating a new question (multilingual).
+        /// </summary>
+
+        [Authorize(Roles = "admin")]
         [HttpPost("Questions")]
         public async Task<IActionResult> CreateQuestion(Models.Question question)
         {
@@ -86,7 +109,11 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
         }
-        // delete existing question
+        /// <summary>
+        /// DELETE request for deleting a question based on ID.
+        /// </summary>
+
+        [Authorize(Roles = "admin")]
         [HttpDelete("Questions/{id}")]
         public async Task<IActionResult> DeleteQuestion(int id)
         {
@@ -98,23 +125,31 @@ namespace DamageAssesment.Api.Questions.Controllers
             return NotFound();
         }
 
+        /// <summary>
+        /// GET request for retrieving question categories.
+        /// </summary>
 
-        // get all questions
+        [Authorize(Roles = "admin,user,report")]
-        [HttpGet("QuestionCategories")]
+        [HttpGet("Questions/Categories")]
-        public async Task<IActionResult> GetQuestionCategoriesAsync()
+        [HttpGet("Questions/Categories/{language:alpha}")]
+        public async Task<IActionResult> GetQuestionCategoriesAsync(string? language)
         {
-            var result = await this.questionsProvider.GetQuestionCategoriesAsync();
+            var result = await this.questionsProvider.GetQuestionCategoriesAsync(language);
             if (result.IsSuccess)
             {
                 return Ok(result.QuestionCategories);
             }
             return NoContent();
         }
-        //Get questions based on question id
+        /// <summary>
-        [HttpGet("QuestionCategories/{id}")]
+        /// GET request for retrieving a question category by ID.
-        public async Task<IActionResult> GetQuestionCategoryAsync(int 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)
         {
-            var result = await this.questionsProvider.GetQuestionCategoryAsync(id);
+            var result = await this.questionsProvider.GetQuestionCategoryAsync(id, language);
             if (result.IsSuccess)
             {
                 return Ok(result.QuestionCategory);
@@ -123,8 +158,11 @@ namespace DamageAssesment.Api.Questions.Controllers
         }
 
 
-        //update existing question
+        /// <summary>
-        [HttpPut("QuestionCategories")]
+        /// PUT request for updating a question category.
+        /// </summary>
+        [Authorize(Roles = "admin,survey,report")]
+        [HttpPut("Questions/Categories")]
         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -141,8 +179,12 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = questionCategory.Id }, questionCategory);
         }
-        //save new question
+        /// <summary>
-        [HttpPost("QuestionCategories")]
+        /// POST request for creating a new question category.
+        /// </summary>
+
+        [Authorize(Roles = "admin")]
+        [HttpPost("Questions/Categories")]
         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
         {
             if (questionCategory != null)
@@ -156,8 +198,12 @@ namespace DamageAssesment.Api.Questions.Controllers
             }
             return CreatedAtRoute("DefaultApi", new { id = questionCategory.Id }, questionCategory);
         }
-        // delete existing question
+        /// <summary>
-        [HttpDelete("QuestionCategories/{id}")]
+        /// 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)
         {
             var result = await this.questionsProvider.DeleteQuestionCategoryAsync(id);

DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj

@@ -1,13 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

@@ -0,0 +1,15 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using System.ComponentModel.DataAnnotations;
+
+namespace DamageAssesment.Api.Questions.Db
+{
+    public class CategoryTranslation
+    {
+        [Key]
+        public int Id { get; set; }
+        [ForeignKey("QuestionCategory")]
+        public int CategoryId { get; set; }
+        public string Title { get; set; }
+        public string Language { get; set; }
+    }
+}

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

@@ -20,7 +20,6 @@ namespace DamageAssesment.Api.Questions.Db
         public bool Key { get; set; }
         [ForeignKey("Survey")]
         public int? SurveyId { get; set; }
-        public string QuestionGroup { get; set; }
         [ForeignKey("QuestionCategory")]
         public int CategoryId { get; set; }
 

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

@@ -7,8 +7,8 @@ namespace DamageAssesment.Api.Questions.Db
     {
         [Key]
         public int Id { get; set; }
-        public string CategoryName { get; set; }
+        public string IconName { get; set; }
-        public string CategoryImage { get; set; }
+        public string IconLibrary { get; set; }
 
     }
 }

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

@@ -10,16 +10,29 @@ namespace DamageAssesment.Api.Questions.Db
         public DbSet<Db.QuestionType> QuestionTypes { get; set; }
         public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; }
         public DbSet<Db.QuestionCategory> QuestionCategories { get; set; }
+        public DbSet<Db.CategoryTranslation> CategoryTranslations { get; set; }
         public QuestionDbContext(DbContextOptions options) : base(options)
         {
 
         }
-        //protected override void OnModelCreating(ModelBuilder modelBuilder)
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        //{
+        {
-        //    modelBuilder.Entity<Question>()
+            base.OnModelCreating(modelBuilder);
-        //        .HasOne(a => a.QuestionType)
+            modelBuilder.Entity<Question>()
-        //        .WithOne(b => b.Question)
+                .Property(item => item.Id)
-        //        .HasForeignKey<QuestionType>(b => b.QuestionTypeID);
+                .ValueGeneratedOnAdd();
-        //}
+            modelBuilder.Entity<QuestionType>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<QuestionsTranslation>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<QuestionCategory>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+            modelBuilder.Entity<CategoryTranslation>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
     }
 }

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

@@ -4,18 +4,19 @@ namespace DamageAssesment.Api.Questions.Interfaces
 {
     public interface IQuestionsProvider : IQuestionTypesProvider
     {
-        Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> GetQuestionAsync(int Id);
+        Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> GetQuestionAsync(int id, string language);
-        Task<(bool IsSuccess, IEnumerable<Models.Question> Questions, string ErrorMessage)> GetQuestionsAsync();
+        Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language);
-        Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string Language);
+        Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string language);
-        Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
+        Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
-        Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
+        Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
-        Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> DeleteQuestionAsync(int Id);
+        Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id);
 
 
-        Task<(bool IsSuccess, IEnumerable<Models.QuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync();
+        Task<(bool IsSuccess, IEnumerable<Models.MultiLanQuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync(string? language);
-        Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int Id);
+        Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int id, string? language);
-        Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory);
+        Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory);
-        Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory);
+        Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory);
-        Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id);
+        Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int id);
+        void SeedData();
     }
 }

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

@@ -0,0 +1,8 @@
+namespace DamageAssesment.Api.Questions.Models
+{
+    public class CategoryTranslation
+    {
+        public string Title { get; set; }
+        public string Language { get; set; }
+    }
+}

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

@@ -1,24 +1,18 @@
-using System.ComponentModel.DataAnnotations;
+namespace DamageAssesment.Api.Questions.Models
-
-namespace DamageAssesment.Api.Questions.Models
 {
-    public class Question
+     public class Question: BaseQuestion
+    {
+        public List<QuestionsTranslation> Questions { get; set; }
+    }
+    public class BaseQuestion
     {
         public int Id { get; set; }
-        public List<QuestionsTranslation> Questions { get; set; }
-
-        //public int QuestionTypeID { get; set; }
-
         public string TypeText { get; set; } = string.Empty;
-
         public int QuestionNumber { get; set; }
         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 string QuestionGroup { get; set; }
         public int CategoryId { get; set; }
-        // public int? Survey_SurveyID { get; set; }
     }
 }

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

@@ -1,9 +1,17 @@
 namespace DamageAssesment.Api.Questions.Models
 {
-    public class QuestionCategory
+    public class MultiLanQuestionCategory : BaseQuestionCategory
+    {
+        public object Titles { get; set; }
+    }
+    public class QuestionCategory : BaseQuestionCategory
+    {
+        public List<CategoryTranslation> Categories { get; set; }
+    }
+    public class BaseQuestionCategory
     {
         public int Id { get; set; }
-        public string CategoryName { get; set; }
+        public string IconName { get; set; }
-        public string CategoryImage { get; set; }
+        public string IconLibrary { get; set; }
     }
 }

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

@@ -3,6 +3,10 @@
     public class QuestionsTranslation
     {
         public string QuestionText { get; set; }
-        public string Language { get; set; } = "En";
+        public string Language { get; set; } = "en";
+    }
+    public class MultiLanguage : BaseQuestion
+    {
+        public Dictionary<string,string> Text { get; set; }
     }
 }

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

@@ -3,8 +3,8 @@
     public class SurveyQuestions
     {
         public int CategoryId { get; set; }
-        public string CategoryName { get; set; }
+        public string IconName { get; set; }
-        public string CategoryImage { get; set; }
+        public string IconLibrary { get; set; }
-        public List<Question> Questions { get; set; }
+        public List<MultiLanguage> QuestionsText { get; set; }
     }
 }

DamageAssesmentApi/DamageAssesment.Api.Questions/Profiles/QuestionProfile.cs

@@ -8,11 +8,15 @@ namespace DamageAssesment.Api.Questions.Profiles
         {
             CreateMap<Db.Question, Models.Question>().ForMember(dest => dest.TypeText,
                 opt => opt.MapFrom(src => src.QuestionType.TypeText));
+            CreateMap<Db.Question, Models.MultiLanguage>().ForMember(dest => dest.TypeText,
+                opt => opt.MapFrom(src => src.QuestionType.TypeText));
             CreateMap<Models.QuestionCategory, Db.QuestionCategory>();
-            CreateMap<Db.QuestionCategory, Models.QuestionCategory>();
+            CreateMap<Db.QuestionCategory, Models.MultiLanQuestionCategory>();
             CreateMap<Models.Question, Db.Question>();
             CreateMap<Db.QuestionsTranslation, Models.QuestionsTranslation>();
             CreateMap<Models.QuestionsTranslation, Db.QuestionsTranslation>();
+            CreateMap<Db.CategoryTranslation, Models.CategoryTranslation>();
+            CreateMap<Models.CategoryTranslation, Db.CategoryTranslation>();
         }
     }
 }

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.Extensions.Options;
+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();
@@ -15,9 +37,43 @@ builder.Services.AddControllers();
 builder.Services.AddScoped<IQuestionsProvider, QuestionsProvider>();
 builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies());
 
-
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+//builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(options =>
+{
+    // Include XML comments from your assembly
+    var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
+    var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
+    options.IncludeXmlComments(xmlPath);
+
+    OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme()
+    {
+        Name = "Bearer",
+        BearerFormat = "JWT",
+        Scheme = "bearer",
+        Description = "Specify the authorization token.",
+        In = ParameterLocation.Header,
+        Type = SecuritySchemeType.Http,
+    };
+
+    options.AddSecurityDefinition("jwt_auth", securityDefinition);
+
+    // Make sure swagger UI requires a Bearer token specified
+    OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme()
+    {
+        Reference = new OpenApiReference()
+        {
+            Id = "jwt_auth",
+            Type = ReferenceType.SecurityScheme
+        }
+    };
+    OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement()
+    {
+        {securityScheme, new string[] { }},
+    };
+    options.AddSecurityRequirement(securityRequirements);
+});
+
 builder.Services.AddDbContext<QuestionDbContext>(option =>
 {
     option.UseInMemoryDatabase("Questions");
@@ -29,8 +85,15 @@ if (app.Environment.IsDevelopment())
 {
     app.UseSwagger();
     app.UseSwaggerUI();
-}
 
+    using (var serviceScope = app.Services.CreateScope())
+    {
+        var services = serviceScope.ServiceProvider;
+        var questionProvider = services.GetRequiredService<IQuestionsProvider>();
+        questionProvider.SeedData();
+    }
+}
+app.UseAuthentication();
 app.UseAuthorization();
 
 app.MapControllers();

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

@@ -2,9 +2,7 @@
 using DamageAssesment.Api.Questions.Db;
 using DamageAssesment.Api.Questions.Interfaces;
 using DamageAssesment.Api.Questions.Models;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace DamageAssesment.Api.Questions.Providers
 {
@@ -24,54 +22,122 @@ namespace DamageAssesment.Api.Questions.Providers
             SeedData();
         }
 
-
+        public void SeedData()
-
-        private void SeedData()
         {
 
             if (!questionDbContext.QuestionsTranslations.Any())
             {
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() {Id=1, QuestionId = 1, QuestionText = "Can You Open ?",Language="en" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 1, QuestionId = 1, QuestionText = "Can You Open ?", Language = "en" });
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 2, QuestionId = 1, QuestionText = "Peux-tu ouvrir ?", Language = "fr" });
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 3, QuestionId = 2, QuestionText = "Are the grounds flodded ?", Language = "en" });
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 4, QuestionId = 2, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 5, QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" });
                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 6, QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 7, QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "sp" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 7, QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 8, QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "sp" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 8, QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
-                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 9, QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "sp" });
+                questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 9, QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
                 questionDbContext.SaveChanges();
             }
             if (!questionDbContext.Questions.Any())
             {
-                questionDbContext.Questions.Add(new Db.Question() { Id = 1,  QuestionTypeId = 2, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, QuestionGroup = "group1",CategoryId=1 });
+                questionDbContext.Questions.Add(new Db.Question() { Id = 1,  QuestionTypeId = 2, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1 });
-                questionDbContext.Questions.Add(new Db.Question() { Id = 2,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, QuestionGroup = "group1", CategoryId = 1 });
+                questionDbContext.Questions.Add(new Db.Question() { Id = 2,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false,  CategoryId = 1 });
-                questionDbContext.Questions.Add(new Db.Question() { Id = 3,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true, QuestionGroup = "group1", CategoryId = 2 });
+                questionDbContext.Questions.Add(new Db.Question() { Id = 3,  QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true,  CategoryId = 2 });
                 questionDbContext.SaveChanges();
             }
             if (!questionDbContext.QuestionTypes.Any())
             {
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 1, TypeText = "Text 1" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 1, TypeText = "RadioButton" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 2, TypeText = "Text 2" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 2, TypeText = "CheckBox" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 3, TypeText = "Text 3" });
+                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 3, TypeText = "TextBox" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 4, TypeText = "Text 4" });
-                questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 5, TypeText = "Text 5" });
                 questionDbContext.SaveChanges();
             }
 
             if (!questionDbContext.QuestionCategories.Any())
             {
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 1, CategoryName = "Category 1", CategoryImage="img1" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 1, IconName = "Flooding", IconLibrary= "https://example.com/images/img1.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 2, CategoryName = "Category 2", CategoryImage = "img1" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 2, IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 3, CategoryName = "Category 3", CategoryImage = "img1" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 3, IconName = "Structural", IconLibrary = "https://example.com/images/img3.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 4, CategoryName = "Category 4", CategoryImage = "img1" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 4, IconName = "Utility", IconLibrary = "https://example.com/images/img4.png" });
-                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory()   { Id = 5, CategoryName = "Category 5", CategoryImage = "img1" });
+                questionDbContext.QuestionCategories.Add(new Db.QuestionCategory()   { Id = 5, IconName = "Debris", IconLibrary = "https://example.com/images/img5.png" });
                 questionDbContext.SaveChanges();
             }
 
+            if (!questionDbContext.CategoryTranslations.Any())
+            {
+
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 1, CategoryId = 1, Title = "Flooding", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 2, CategoryId = 2, Title = "Electrical", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 3, CategoryId = 3, Title = "Structural", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 4, CategoryId = 4, Title = "Utility", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 5, CategoryId = 5, Title = "Debris", Language = "en" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 6, CategoryId = 1, Title = "Inondation", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 7, CategoryId = 2, Title = "Électrique", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 8, CategoryId = 3, Title = "De construction", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 9, CategoryId = 4, Title = "Utilitaire", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 10, CategoryId = 5, Title = "Débris", Language = "fr" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 11, CategoryId = 1, Title = "Inundación", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 12, CategoryId = 2, Title = "Eléctrica", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 13, CategoryId = 3, Title = "Estructural", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 14, CategoryId = 4, Title = "Utilidad", Language = "es" });
+                questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 15, CategoryId = 5, Title = "Escombros", Language = "es" });
+                questionDbContext.SaveChanges();
+            }
         }
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.Question> Questions, string ErrorMessage)> GetQuestionsAsync()
+        public List<Models.CategoryTranslation> GetCategoryTranslations(int id, string? language)
+        {
+            List<Models.CategoryTranslation> categoryTranslations = new List<Models.CategoryTranslation>();
+            if (string.IsNullOrEmpty(language))
+            {
+                categoryTranslations = mapper.Map<List<Db.CategoryTranslation>, List<Models.CategoryTranslation>>(
+                    questionDbContext.CategoryTranslations.AsNoTracking().Where(a => a.CategoryId == id).ToList());
+            }
+            else
+            {
+                categoryTranslations = mapper.Map<List<Db.CategoryTranslation>, List<Models.CategoryTranslation>>(
+                questionDbContext.CategoryTranslations.AsNoTracking().Where(a => a.CategoryId == id && a.Language == language).ToList());
+            }
+            return categoryTranslations;
+        }
+        public object CreateCategoryMultiLanguageObject(List<Models.CategoryTranslation> categoryTranslations)
+        {
+            object MultiLanguage = new object();
+            Dictionary<string, string> dict = new Dictionary<string, string>();
+            foreach (Models.CategoryTranslation item in categoryTranslations)
+            {
+                dict.Add(item.Language, item.Title);
+            }
+            MultiLanguage = dict;
+            return MultiLanguage;
+        }
+        public List<Models.QuestionsTranslation> GetQuestionsTranslations(int id, string? language)
+        {
+            List<Models.QuestionsTranslation> QuestionTranslations;
+            if (string.IsNullOrEmpty(language))
+            {
+                QuestionTranslations = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                    questionDbContext.QuestionsTranslations.AsNoTracking().Where(a => a.QuestionId == id).ToList());
+            }
+            else
+            {
+                QuestionTranslations = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                questionDbContext.QuestionsTranslations.AsNoTracking().Where(a => a.QuestionId == id && a.Language == language).ToList());
+            }
+            return QuestionTranslations;
+        }
+        public Dictionary<string, string> CreateMultiLanguageObject(List<Models.QuestionsTranslation> questions)
+        {
+            MultiLanguage MultiLanguage = new MultiLanguage();
+            Dictionary<string, string> dict = new Dictionary<string, string>();
+            foreach (Models.QuestionsTranslation item in questions)
+            {
+                dict.Add(item.Language, item.QuestionText);
+            }
+            //MultiLanguage.questionText = dict;
+            return dict;
+        }
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language)
         {
             try
             {
@@ -81,11 +147,10 @@ namespace DamageAssesment.Api.Questions.Providers
                 {
 
                     //logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.Question>>(questions);
+                    var result = mapper.Map<IEnumerable<Db.Question>, IEnumerable<Models.MultiLanguage>>(questions);
-                    foreach (var question in result)
+                    foreach (var item in result)
                     {
-                        question.Questions=mapper.Map<List<Db.QuestionsTranslation>,List<Models.QuestionsTranslation>>(
+                        item.Text = CreateMultiLanguageObject(GetQuestionsTranslations(item.Id, language));
-                            questionDbContext.QuestionsTranslations.Where(a=>a.QuestionId==question.Id).ToList());
                     }
                     return (true, result, null);
                 }
@@ -97,18 +162,17 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> GetQuestionAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> GetQuestionAsync(int id, string language)
         {
             try
             {
                 logger?.LogInformation("Query Question");
-                var question = await questionDbContext.Questions.Include("QuestionType").AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                var question = await questionDbContext.Questions.Include("QuestionType").AsNoTracking().FirstOrDefaultAsync(q => q.Id == id);
                 if (question != null)
                 {
                     logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<Db.Question, Models.Question>(question);
+                    var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);                    
-                    result.Questions = mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                    result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(id, language));
-                            questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == result.Id).ToList());
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -119,35 +183,34 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public List<Models.Question>  GetSurveyQuestion(List<Models.Question> questions,string Language)
+        public List<Models.MultiLanguage> GetSurveyQuestion(List<Models.MultiLanguage> questions, string language)
         {
             foreach (var item in questions)
             {
-                item.Questions= mapper.Map<List<Db.QuestionsTranslation>, List<Models.QuestionsTranslation>>(
+                item.Text = CreateMultiLanguageObject(GetQuestionsTranslations(item.Id, language));
-                            questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == item.Id && a.Language== Language).ToList());
             }
             return questions;
         }
-        public async Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int SurveyId, string Language)
+        public async Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int SurveyId, string language)
         {
             try
             {
                 logger?.LogInformation("Query Question");
-                var questions = await questionDbContext.Questions.Include("QuestionType").Where(a=>a.SurveyId==SurveyId).AsNoTracking().ToListAsync();
+                var questions = await questionDbContext.Questions.Include("QuestionType").Where(a => a.SurveyId == SurveyId).AsNoTracking().ToListAsync();
                 if (questions != null)
                 {
                     List<SurveyQuestions> surveyQuestionsList = new List<SurveyQuestions>();
-                    List<int> CategoryIds=questions.Select(a=>a.CategoryId).Distinct().ToList();
+                    List<int> CategoryIds = questions.Select(a => a.CategoryId).Distinct().ToList();
-                    var questioncategories = await questionDbContext.QuestionCategories.Where(a =>CategoryIds.Contains(a.Id)).ToListAsync();
+                    var questioncategories = await questionDbContext.QuestionCategories.Where(a => CategoryIds.Contains(a.Id)).ToListAsync();
                     //logger?.LogInformation($"{question} customer(s) found");
                     foreach (var item in questioncategories)
                     {
                         surveyQuestionsList.Add(new SurveyQuestions()
                         {
                             CategoryId = item.Id,
-                            CategoryImage = item.CategoryImage,
+                            IconLibrary = item.IconLibrary,
-                            CategoryName = item.CategoryName,
+                            IconName = item.IconName,
-                            Questions = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.Question>>(questions.Where(a => a.CategoryId == item.Id).ToList()), Language)
+                            QuestionsText = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanguage>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language)
                         });
                     }
 
@@ -162,20 +225,22 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question)
+        public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question)
         {
             try
             {
                 logger?.LogInformation("Query Question");
                 var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
                 var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
-                dbquestion.QuestionTypeId=questionDbContext.QuestionTypes.Where(a=>a.TypeText==Question.TypeText).Select(a=>a.Id).FirstOrDefault();
+                dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
                 questionDbContext.Questions.Add(dbquestion);
                 dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
                 questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
                 questionDbContext.SaveChanges();
                 Question.Id = dbquestion.Id;
-                return (true, Question, null);
+                var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
+                result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id,""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -183,7 +248,7 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
+        public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
         {
             try
             {
@@ -192,12 +257,14 @@ namespace DamageAssesment.Api.Questions.Providers
                 dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
                 questionDbContext.Entry(dbquestion).State = EntityState.Modified;
                 var oldquestions = questionDbContext.QuestionsTranslations.Where(a => a.QuestionId == dbquestion.Id).ToList();
-                if(oldquestions!=null)
+                if (oldquestions != null)
                     questionDbContext.QuestionsTranslations.RemoveRange(oldquestions);
                 dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
                 questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
                 questionDbContext.SaveChanges();
-                return (true, Question, null);
+                var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
+                result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -206,21 +273,23 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.Question Question, string ErrorMessage)> DeleteQuestionAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id)
         {
             try
             {
-                var question = await questionDbContext.Questions.Where(x => x.Id == Id).FirstOrDefaultAsync();
+                var question = await questionDbContext.Questions.Where(x => x.Id == id).FirstOrDefaultAsync();
 
                 if (question != null)
                 {
+                    var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);
+                    result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
                     questionDbContext.Questions.Remove(question);
                     questionDbContext.SaveChanges();
-                    return (true, mapper.Map<Db.Question, Models.Question>(question), $"QuestionID {Id} deleted Successfuly");
+                    return (true, result, $"QuestionID {id} deleted Successfuly");
                 }
                 else
                 {
-                    logger?.LogInformation($"QuestionID: {Id} Not found");
+                    logger?.LogInformation($"QuestionID: {id} Not found");
                     return (false, null, "Not Found");
                 }
             }
@@ -231,11 +300,9 @@ namespace DamageAssesment.Api.Questions.Providers
             }
         }
 
-
-
         //Question Category Logic
 
-        public async Task<(bool IsSuccess, IEnumerable<Models.QuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync()
+        public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanQuestionCategory> QuestionCategories, string ErrorMessage)> GetQuestionCategoriesAsync(string? language)
         {
             try
             {
@@ -244,7 +311,11 @@ namespace DamageAssesment.Api.Questions.Providers
                 if (questionCategories != null)
                 {
                     //logger?.LogInformation($"{question} customer(s) found");
-                    var result = mapper.Map<IEnumerable<Db.QuestionCategory>, IEnumerable<Models.QuestionCategory>>(questionCategories);
+                    var result = mapper.Map<IEnumerable<Db.QuestionCategory>, IEnumerable<Models.MultiLanQuestionCategory>>(questionCategories);
+                    foreach (var category in result)
+                    {
+                        category.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(category.Id, language));
+                    }
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -255,16 +326,17 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> GetQuestionCategoryAsync(int id, string? language)
         {
             try
             {
                 logger?.LogInformation("Query Question");
-                var questioncategory = await questionDbContext.QuestionCategories.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
+                var questioncategory = await questionDbContext.QuestionCategories.AsNoTracking().FirstOrDefaultAsync(q => q.Id == id);
                 if (questioncategory != null)
                 {
                     logger?.LogInformation($"{questioncategory} customer(s) found");
-                    var result = mapper.Map<Db.QuestionCategory, Models.QuestionCategory>(questioncategory);
+                    var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(questioncategory);
+                    result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, language));
                     return (true, result, null);
                 }
                 return (false, null, "Not found");
@@ -275,17 +347,23 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> PostQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
         {
             try
             {
                 logger?.LogInformation("Query Question");
                 var dbQuestionCategory = mapper.Map<Models.QuestionCategory, Db.QuestionCategory>(QuestionCategory);
+                var dbCategorytranslations = mapper.Map<List<Models.CategoryTranslation>, List<Db.CategoryTranslation>>(QuestionCategory.Categories);
                 // Question.QuestionType = GetQuestionType(Question.QuestionTypeId);
                 questionDbContext.QuestionCategories.Add(dbQuestionCategory);
                 questionDbContext.SaveChanges();
-                QuestionCategory.Id=dbQuestionCategory.Id;
+                QuestionCategory.Id = dbQuestionCategory.Id;
-                return (true, QuestionCategory, null);
+                dbCategorytranslations.ForEach(i => i.CategoryId = QuestionCategory.Id);
+                questionDbContext.CategoryTranslations.AddRange(dbCategorytranslations);
+                questionDbContext.SaveChanges();
+                var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(dbQuestionCategory);
+                result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -293,15 +371,23 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> UpdateQuestionCategoryAsync(Models.QuestionCategory QuestionCategory)
         {
             try
             {
                 var dbQuestionCategory = mapper.Map<Models.QuestionCategory, Db.QuestionCategory>(QuestionCategory);
+                var dbCategorytranslations = mapper.Map<List<Models.CategoryTranslation>, List<Db.CategoryTranslation>>(QuestionCategory.Categories);
                 questionDbContext.Entry(dbQuestionCategory).State = EntityState.Modified;
-
+                QuestionCategory.Id = dbQuestionCategory.Id;
+                var oldcategories = questionDbContext.CategoryTranslations.Where(a => a.CategoryId == dbQuestionCategory.Id).ToList();
+                if (oldcategories != null)
+                    questionDbContext.CategoryTranslations.RemoveRange(oldcategories);
+                dbCategorytranslations.ForEach(i => i.CategoryId = QuestionCategory.Id);
+                questionDbContext.CategoryTranslations.AddRange(dbCategorytranslations);
                 questionDbContext.SaveChanges();
-                return (true, QuestionCategory, null);
+                var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(dbQuestionCategory);
+                result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
+                return (true, result, null);
             }
             catch (Exception ex)
             {
@@ -310,18 +396,20 @@ namespace DamageAssesment.Api.Questions.Providers
                 return (false, null, ex.Message);
             }
         }
-        public async Task<(bool IsSuccess, Models.QuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id)
+        public async Task<(bool IsSuccess, Models.MultiLanQuestionCategory QuestionCategory, string ErrorMessage)> DeleteQuestionCategoryAsync(int Id)
         {
             try
             {
                 var questioncategory = await questionDbContext.QuestionCategories.Where(x => x.Id == Id).FirstOrDefaultAsync();
                 if (questioncategory != null)
                 {
+                    var result = mapper.Map<Db.QuestionCategory, Models.MultiLanQuestionCategory>(questioncategory);
+                    result.Titles = CreateCategoryMultiLanguageObject(GetCategoryTranslations(result.Id, ""));
                     var question = await questionDbContext.Questions.Where(x => x.Id == Id).ToListAsync();
                     questionDbContext.Questions.RemoveRange(question);
                     questionDbContext.QuestionCategories.Remove(questioncategory);
                     questionDbContext.SaveChanges();
-                    return (true, mapper.Map<Db.QuestionCategory, Models.QuestionCategory>(questioncategory), $"QuestionID {Id} deleted Successfuly");
+                    return (true, result, $"QuestionID {Id} deleted Successfuly");
                 }
                 else
                 {

DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.json

@@ -1,4 +1,7 @@
 {
+  "JwtSettings": {
+    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
+  },
   "Logging": {
     "LogLevel": {
       "Default": "Information",

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/CategoryMockData.cs

@@ -8,42 +8,42 @@ namespace DamageAssesment.Api.Questions.Test
 {
     public class CategoryMockData
     {
-        public static async Task<(bool, IEnumerable<Questions.Models.QuestionCategory>, string)> getOkResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanQuestionCategory>, string)> getOkResponse()
         {
-            IEnumerable<Questions.Models.QuestionCategory> list = new List<Questions.Models.QuestionCategory>();
+            IEnumerable<Questions.Models.MultiLanQuestionCategory> list = new List<Questions.Models.MultiLanQuestionCategory>();
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Questions.Models.QuestionCategory { Id = i, CategoryImage = "img"+i,CategoryName="Category "+i  });
+                list.Append(new Questions.Models.MultiLanQuestionCategory { Id = i, IconLibrary = "img"+i,IconName="Category "+i  });
             }
             return (true, list, null);
         }
 
-        public static async Task<(bool, Questions.Models.QuestionCategory, string)> getOkResponse(int Id)
+        public static async Task<(bool, Questions.Models.MultiLanQuestionCategory, string)> getOkResponse(int Id)
         {
             var Questions = await getOkResponse();
             var Question = Questions.Item2.FirstOrDefault(s => s.Id == Id);
             return (true, Question, null);
         }
 
-        public static async Task<(bool, Questions.Models.QuestionCategory, string)> getBadRequestResponse()
+        public static async Task<(bool, Questions.Models.MultiLanQuestionCategory, string)> getBadRequestResponse()
         {
             return (false, null, "Bad Request");
         }
 
-        public static async Task<(bool, Questions.Models.QuestionCategory, string)> getNotFoundResponse()
+        public static async Task<(bool, Questions.Models.MultiLanQuestionCategory, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Questions.Models.QuestionCategory>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanQuestionCategory>, string)> getNoContentResponse()
         {
-            IEnumerable<Questions.Models.QuestionCategory> list = new List<Questions.Models.QuestionCategory>();
+            IEnumerable<Questions.Models.MultiLanQuestionCategory> list = new List<Questions.Models.MultiLanQuestionCategory>();
             return (false, list, null);
         }
 
         public static async Task<Questions.Models.QuestionCategory> getInputQuestionCategoryData()
         {
-            return new Questions.Models.QuestionCategory { Id = 1, CategoryName = "Category 1",CategoryImage="img 1" };
+            return new Questions.Models.QuestionCategory { Id = 1, IconName = "Category 1",IconLibrary="img 1" };
 
         }
     }

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/MockData.cs

@@ -1,24 +1,17 @@
-using DamageAssesment.Api.Questions.Db;
+using System.Text;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DamageAssesment.Api.Questions.Test
 {
     public class MockData
     {
 
-        public static async Task<(bool, IEnumerable<Questions.Models.Question>, string)> getOkResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanguage>, string)> getOkResponse()
         {
-            IEnumerable<Questions.Models.Question> list = new List<Questions.Models.Question>();
+            IEnumerable<Questions.Models.MultiLanguage> list = new List<Questions.Models.MultiLanguage>();
 
             for (int i = 0; i < 10; i++)
             {
-                list.Append(new Questions.Models.Question { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, QuestionGroup = "group1",CategoryId=i });
+                list.Append(new Questions.Models.MultiLanguage { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=i });
             }
             return (true, list, null);
         }
@@ -30,38 +23,38 @@ namespace DamageAssesment.Api.Questions.Test
 
             for (int i = 0; i < 10; i++)
             {
-                List<Models.Question> question = new List<Models.Question>();
+                List<Models.MultiLanguage> question = new List<Models.MultiLanguage>();
-                question.Add(new Models.Question { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, QuestionGroup = "group1", CategoryId = i });
+                question.Add(new Models.MultiLanguage { Id = i, TypeText = "Text" + i, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = i });
                 list.Append(new Questions.Models.SurveyQuestions
                 {
                     CategoryId = i,
-                    CategoryImage = "img" + i,
+                    IconLibrary = "img" + i,
-                    CategoryName = "Category " + i,
+                    IconName = "Category " + i,
-                    Questions = question
+                    QuestionsText = question
                 });
             }
             return (true, list, null);
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getOkResponse(int Id)
+        public static async Task<(bool, Questions.Models.MultiLanguage, string)> getOkResponse(int Id)
         {
             var Questions = await getOkResponse();
             var Question = Questions.Item2.FirstOrDefault(s => s.Id == Id);
             return (true, Question, null);
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getBadRequestResponse()
+        public static async Task<(bool, Questions.Models.MultiLanguage, string)> getBadRequestResponse()
         {
             return (false, null, "Bad Request");
         }
 
-        public static async Task<(bool, Questions.Models.Question, string)> getNotFoundResponse()
+        public static async Task<(bool, Questions.Models.MultiLanguage, string)> getNotFoundResponse()
         {
             return (false, null, "Not Found");
         }
-        public static async Task<(bool, IEnumerable<Questions.Models.Question>, string)> getNoContentResponse()
+        public static async Task<(bool, IEnumerable<Questions.Models.MultiLanguage>, string)> getNoContentResponse()
         {
-            IEnumerable<Questions.Models.Question> list = new List<Questions.Models.Question>();
+            IEnumerable<Questions.Models.MultiLanguage> list = new List<Questions.Models.MultiLanguage>();
             return (false, list, null);
         }
         public static async Task<(bool, List<Questions.Models.SurveyQuestions>, string)> getNoSurveyContentResponse()
@@ -79,7 +72,7 @@ namespace DamageAssesment.Api.Questions.Test
             };
             List<Models.QuestionsTranslation> QuestionsTranslations = new List<Models.QuestionsTranslation>();
             QuestionsTranslations.Add(QuestionsTranslation);
-            return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, QuestionGroup = "group1" ,CategoryId=1};
+            return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1};
 
         }
 

DamageAssesmentApi/DamageAssesment.Api.QuestionsTest/QuestionsServiceTest.cs

@@ -1,16 +1,7 @@
-
-using AutoMapper;
 using DamageAssesment.Api.Questions.Controllers;
-using DamageAssesment.Api.Questions.Db;
 using DamageAssesment.Api.Questions.Interfaces;
-using DamageAssesment.Api.Questions.Models;
-using DamageAssesment.Api.Questions.Profiles;
-using DamageAssesment.Api.Questions.Providers;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Moq;
-using Newtonsoft.Json;
 using Xunit;
 
 namespace DamageAssesment.Api.Questions.Test
@@ -22,10 +13,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getOkResponse();
-            mockQuestionService.Setup(service => service.GetQuestionsAsync()).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionsAsync(null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionsAsync();
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionsAsync(null);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -35,10 +26,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getNoContentResponse();
-            mockQuestionService.Setup(service => service.GetQuestionsAsync()).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionsAsync(null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NoContentResult)await QuestionProvider.GetQuestionsAsync();
+            var result = (NoContentResult)await QuestionProvider.GetQuestionsAsync(null);
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -48,10 +39,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getOkResponse(1);
-            mockQuestionService.Setup(service => service.GetQuestionAsync(1)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionAsync(1,null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionAsync(1);
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionByIdAsync(1,null);
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -61,10 +52,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await MockData.getNotFoundResponse();
-            mockQuestionService.Setup(service => service.GetQuestionAsync(99)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionAsync(99,null)).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NotFoundResult)await QuestionProvider.GetQuestionAsync(99);
+            var result = (NotFoundResult)await QuestionProvider.GetQuestionByIdAsync(99,null);
             Assert.Equal(404, result.StatusCode);
         }
 
@@ -197,10 +188,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getOkResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync()).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync("en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoriesAsync();
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoriesAsync("en");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -210,10 +201,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getNoContentResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync()).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoriesAsync("en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NoContentResult)await QuestionProvider.GetQuestionCategoriesAsync();
+            var result = (NoContentResult)await QuestionProvider.GetQuestionCategoriesAsync("en");
 
             Assert.Equal(204, result.StatusCode);
         }
@@ -223,10 +214,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getOkResponse(1);
-            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(1)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(1, "en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoryAsync(1);
+            var result = (OkObjectResult)await QuestionProvider.GetQuestionCategoryAsync(1, "en");
 
             Assert.Equal(200, result.StatusCode);
         }
@@ -236,10 +227,10 @@ namespace DamageAssesment.Api.Questions.Test
         {
             var mockQuestionService = new Mock<IQuestionsProvider>();
             var mockResponse = await CategoryMockData.getNotFoundResponse();
-            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(99)).ReturnsAsync(mockResponse);
+            mockQuestionService.Setup(service => service.GetQuestionCategoryAsync(99, "en")).ReturnsAsync(mockResponse);
 
             var QuestionProvider = new QuestionsController(mockQuestionService.Object);
-            var result = (NotFoundResult)await QuestionProvider.GetQuestionCategoryAsync(99);
+            var result = (NotFoundResult)await QuestionProvider.GetQuestionCategoryAsync(99, "en");
             Assert.Equal(404, result.StatusCode);
         }
 

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

@@ -0,0 +1,193 @@
+using DamageAssesment.Api.Responses.Interfaces;
+using DamageAssesment.Api.Responses.Models;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DamageAssesment.Api.Responses.Controllers
+{
+    [ApiController]
+    public class ResponsesController : ControllerBase
+    {
+        private readonly ISurveysResponse surveyResponseProvider;
+        public ResponsesController(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()
+        {
+            var result = await this.surveyResponseProvider.GetSurveyResponsesAsync();
+            if (result.IsSuccess)
+            {
+                return Ok(result.surveyResponses);
+            }
+
+            if (result.ErrorMessage == "No Data Found")
+                return NoContent();
+
+            return BadRequest(result.ErrorMessage);
+        }
+        /// <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)
+        {
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyid);
+            if (result.IsSuccess)
+            {
+                return Ok(result.SurveyResponses);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// GET request for retrieving survey responses by survey and location IDs.
+        /// </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)
+        {
+            var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid);
+            if (result.IsSuccess)
+            {
+                return Ok(result.SurveyResponses);
+            }
+
+            return NoContent();
+        }
+        /// <summary>
+        /// GET request for retrieving survey responses by survey, question, and answer.
+        /// </summary>
+        /// <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)
+            {
+                return Ok(result.SurveyResponses);
+            }
+
+            return NoContent();
+        }
+        /// <summary>
+        /// 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)
+        {
+            var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyid);
+            if (result.IsSuccess)
+            {
+                return Ok(result.Answers);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// 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)
+        {
+            var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyid);
+            if (result.IsSuccess)
+            {
+                return Ok(result.SurveyResponses);
+            }
+            return NoContent();
+        }
+        /// <summary>
+        /// 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)
+        {
+            var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.SurveyResponse);
+            }
+            return NoContent();
+        }
+
+        /// <summary>
+        /// 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)
+        {
+            var result = await this.surveyResponseProvider.PostSurveyResponseAsync(surveyResponse);
+            if (result.IsSuccess)
+            {
+                return Ok(result.SurveyResponse);
+            }
+            return BadRequest(result.ErrorMessage);
+        }
+        /// <summary>
+        /// PUT request for updating an existing survey response.
+        /// </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)
+        {
+            var result = await this.surveyResponseProvider.PutSurveyResponseAsync(id, surveyResponse);
+            if (result.IsSuccess)
+            {
+                return Ok(result.SurveyResponse);
+            }
+            if (result.ErrorMessage == "Not Found")
+                return NotFound(result.ErrorMessage);
+
+            return BadRequest(result.ErrorMessage);
+        }
+        /// <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)
+        {
+            var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(id);
+            if (result.IsSuccess)
+            {
+                return Ok(result.SurveyResponse);
+            }
+            return NotFound();
+        }
+        /// <summary>
+        /// 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)
+        {
+            var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(request);
+
+            if (result.IsSuccess)
+                return Ok(result.SurveyResponse);
+            else
+                return BadRequest(result.ErrorMessage);
+        }
+    }
+}

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

@@ -4,13 +4,14 @@
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />

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

@@ -0,0 +1,31 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace DamageAssesment.Api.Responses.Db
+{
+    public class SurveyResponse
+    {
+        [Key]
+        public int Id { get; set; }
+
+        [ForeignKey("Survey")]
+        public int SurveyId { get; set; }
+        [ForeignKey("Location")]
+        public int LocationId { get; set; }
+
+        [StringLength(6)]
+        [ForeignKey("Employee")]
+        public int EmployeeId { get; set; }
+
+        public DateTime? CreatedDate { get; set; } = DateTime.Now;
+
+        [StringLength(50)]
+        public string? ClientDevice { get; set; }
+
+        [StringLength(250)]
+        public string? KeyAnswerResult { get; set; }
+        public double? Longitute { get; set; }
+        public double? Latitude { get; set; }
+
+    }
+}

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

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace DamageAssesment.Api.Responses.Db
+{
+    public class SurveyResponseDbContext:DbContext
+    {
+        public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }
+
+        public SurveyResponseDbContext(DbContextOptions options) : base(options)
+        {
+
+        }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+            modelBuilder.Entity<SurveyResponse>()
+                .Property(item => item.Id)
+                .ValueGeneratedOnAdd();
+        }
+    }
+}

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
     {
@@ -13,11 +12,11 @@ namespace DamageAssesment.Api.SurveyResponses.Interfaces
         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> DeleteSurveyResponseAsync(int Id);
         Task<(bool IsSuccess, dynamic SurveyResponse, string ErrorMessage)> GetSurveyResponseByIdAsync(int responseId);
         Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAsync(int surveyId);
-        Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, string location);
+        Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId);
         Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId);
         Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer);
 
-        Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.AnswerRequest answers);
+        Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Request request);
 
     }
 }

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

@@ -1,16 +1,16 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Answer
     {
         public int Id { get; set; }
         public int QuestionId { get; set; }
-        public string? LocationId { get; set; }
+        public int LocationId { get; set; }
         public string AnswerText { get; set; }
-        public string? Comment { get; set; }
+        public string Comment { get; set; }
         public int SurveyResponseId { get; set; }
-        public string? RegionId { get; set; }
+        public int RegionId { get; set; }
        // public string? Name { get; set; }
        // public string? Abbreviation { get; set; }
 

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

@@ -1,6 +1,6 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
-    public class QuestionRequest
+    public class AnswerRequest
     {
         public int QuestionId { get; set; }
         public string AnswerText { get; set; }

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,21 +1,16 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Employee
     {
-        public string Id { get; set; }
+        public int Id { get; set; }
-
+        public string EmployeeCode { get; set; }
-        [StringLength(50)]
         public string Name { get; set; }
-
         public DateTime BirthDate { get; set; }
-
-        [StringLength(50)]
         public string OfficePhoneNumber { get; set; }
-
-        [StringLength(50)]
         public string Email { get; set; }
         public bool IsActive { get; set; }
+        public string PreferredLanguage { get; set; }
     }
 }

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

@@ -1,9 +1,9 @@
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Location
     {
-        public string Id { get; set; }
+        public int Id { get; set; }
-        public string RegionId { get; set; }
+        public int RegionId { get; set; }
         public string Name { get; set; }
         public string MaintenanceCenter { get; set; }
         public string SchoolType { get; set; }

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

@@ -0,0 +1,17 @@
+using System.Collections.Generic;
+
+namespace DamageAssesment.Api.Responses.Models
+{
+     public class Question
+    {
+        public int Id { get; set; }
+        public string TypeText { get; set; }
+        public int QuestionNumber { get; set; }
+        public bool IsRequired { get; set; }
+        public bool Comment { get; set; }
+        public bool Key { get; set; }
+        public int SurveyId { get; set; }
+        public int CategoryId { get; set; }
+        public Dictionary<string, string> Text { get; set; }
+    }
+}

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

@@ -1,10 +1,10 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace DamageAssesment.Api.SurveyResponses.Models
+namespace DamageAssesment.Api.Responses.Models
 {
     public class Region
     {
-        public string Id { get; set; }
+        public int Id { get; set; }
         public string Name { get; set; }
         public string Abbreviation { get; set; }
     }

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

@@ -0,0 +1,15 @@
+namespace DamageAssesment.Api.Responses.Models
+{
+    public class Request
+    {
+        public int SurveyId { get; set; }
+        public int LocationId { get; set; }
+        public int EmployeeId { get; set; }
+        public string? ClientDevice { get; set; }
+        public string? KeyAnswerResult { get; set; }
+        public double? Longitute { get; set; }
+        public double? Latitude { get; set; }
+        public DateTime? CreatedDate { get; set; } = DateTime.Now;
+        public List<AnswerRequest> Answers { get; set; }
+    }
+}