forked from MDCPS/DamageAssessment_Backend
		
	Compare commits
	
		
			23 Commits
		
	
	
		
			dev
			...
			user-acces
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 9b9bba1f60 | |||
| 1caa3e549b | |||
| d36e7632f2 | |||
| 9320469798 | |||
| 992afeab5e | |||
| 3f41cf6e10 | |||
| f8c7fce182 | |||
| 432baafc22 | |||
| 902919074e | |||
| cbddb944d5 | |||
| 0c7fe88d45 | |||
| f8cb7e7980 | |||
| 9c97f08289 | |||
| 3b07723ebe | |||
| 3f67b578e4 | |||
| 126da500a1 | |||
| b569f6d404 | |||
| 94ea46c466 | |||
| 15acd00959 | |||
| 46520c7e62 | |||
| f6387fc371 | |||
| 4ebd40108d | |||
| 77816605d1 | 
| @ -1,7 +1,6 @@ | |||||||
| using DamageAssesment.Api.Answers.Interfaces; | using DamageAssesment.Api.Answers.Interfaces; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; |  | ||||||
| using Microsoft.OpenApi.Any; |  | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Answers.Controllers | namespace DamageAssesment.Api.Answers.Controllers | ||||||
| { | { | ||||||
| @ -16,7 +15,7 @@ namespace DamageAssesment.Api.Answers.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all answers |         /// Get all answers | ||||||
|         /// </summary> |         /// </summary> | ||||||
|          |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("answers")] |         [HttpGet("answers")] | ||||||
|         public async Task<ActionResult> GetAnswersAsync() { |         public async Task<ActionResult> GetAnswersAsync() { | ||||||
|          |          | ||||||
| @ -32,7 +31,7 @@ namespace DamageAssesment.Api.Answers.Controllers | |||||||
|         /// Get an answer based on answerId. |         /// Get an answer based on answerId. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |  | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("answers/{id}")] |         [HttpGet("answers/{id}")] | ||||||
|         public async Task<ActionResult> GetAnswerByIdAsync(int id) |         public async Task<ActionResult> GetAnswerByIdAsync(int id) | ||||||
|         { |         { | ||||||
| @ -48,6 +47,7 @@ namespace DamageAssesment.Api.Answers.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all answers based on responseId. |         /// Get all answers based on responseId. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("answers/byresponse/{responseid}")] |         [HttpGet("answers/byresponse/{responseid}")] | ||||||
|         public async Task<IActionResult> GetAnswersByResponseId(int responseid) |         public async Task<IActionResult> GetAnswersByResponseId(int responseid) | ||||||
|         { |         { | ||||||
| @ -61,7 +61,7 @@ namespace DamageAssesment.Api.Answers.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all answers based on questionId. |         /// Get all answers based on questionId. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("answers/byquestion/{questionid}")] |         [HttpGet("answers/byquestion/{questionid}")] | ||||||
|         public async Task<IActionResult> AnswersByQuestionId(int questionid) |         public async Task<IActionResult> AnswersByQuestionId(int questionid) | ||||||
|         { |         { | ||||||
| @ -75,7 +75,7 @@ namespace DamageAssesment.Api.Answers.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Update an existing answer. |         /// Update an existing answer. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPut("answers")] |         [HttpPut("answers")] | ||||||
|         public async Task<IActionResult> UpdateAnswer(Models.Answer answer) |         public async Task<IActionResult> UpdateAnswer(Models.Answer answer) | ||||||
|         { |         { | ||||||
| @ -96,7 +96,7 @@ namespace DamageAssesment.Api.Answers.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Save a new answer. |         /// Save a new answer. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPost("answers")] |         [HttpPost("answers")] | ||||||
|         public async Task<IActionResult> CreateAnswer(Models.Answer answer) |         public async Task<IActionResult> CreateAnswer(Models.Answer answer) | ||||||
|         { |         { | ||||||
| @ -114,7 +114,7 @@ namespace DamageAssesment.Api.Answers.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         ///  Delete an existing answer. |         ///  Delete an existing answer. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpDelete("answers/{id}")] |         [HttpDelete("answers/{id}")] | ||||||
|         public async Task<IActionResult> DeleteAnswer(int id) |         public async Task<IActionResult> DeleteAnswer(int id) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -1,23 +1,73 @@ | |||||||
| using DamageAssesment.Api.Answers.Db; | using DamageAssesment.Api.Answers.Db; | ||||||
| using DamageAssesment.Api.Answers.Interfaces; | using DamageAssesment.Api.Answers.Interfaces; | ||||||
| using DamageAssesment.Api.Answers.Providers; | using DamageAssesment.Api.Answers.Providers; | ||||||
|  | using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | using Microsoft.IdentityModel.Tokens; | ||||||
|  | using Microsoft.OpenApi.Models; | ||||||
| using System.Reflection; | using System.Reflection; | ||||||
|  | using System.Text; | ||||||
|  |  | ||||||
| var builder = WebApplication.CreateBuilder(args); | 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. | // Add services to the container. | ||||||
|  |  | ||||||
| builder.Services.AddControllers(); | builder.Services.AddControllers(); | ||||||
| // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | ||||||
| builder.Services.AddEndpointsApiExplorer(); | builder.Services.AddEndpointsApiExplorer(); | ||||||
| //builder.Services.AddSwaggerGen(); | //builder.Services.AddSwaggerGen(); | ||||||
| builder.Services.AddSwaggerGen(c => | builder.Services.AddSwaggerGen(options => | ||||||
| { | { | ||||||
|     // Include XML comments from your assembly |     // Include XML comments from your assembly | ||||||
|     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; |     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; | ||||||
|     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); |     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); | ||||||
|     c.IncludeXmlComments(xmlPath); |     options.IncludeXmlComments(xmlPath); | ||||||
|  |  | ||||||
|  |     OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Name = "Bearer", | ||||||
|  |         BearerFormat = "JWT", | ||||||
|  |         Scheme = "bearer", | ||||||
|  |         Description = "Specify the authorization token.", | ||||||
|  |         In = ParameterLocation.Header, | ||||||
|  |         Type = SecuritySchemeType.Http, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityDefinition("jwt_auth", securityDefinition); | ||||||
|  |  | ||||||
|  |     // Make sure swagger UI requires a Bearer token specified | ||||||
|  |     OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Reference = new OpenApiReference() | ||||||
|  |         { | ||||||
|  |             Id = "jwt_auth", | ||||||
|  |             Type = ReferenceType.SecurityScheme | ||||||
|  |         } | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement() | ||||||
|  |     { | ||||||
|  |         {securityScheme, new string[] { }}, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityRequirement(securityRequirements); | ||||||
| }); | }); | ||||||
| builder.Services.AddScoped<IAnswersProvider, AnswersProvider>(); | builder.Services.AddScoped<IAnswersProvider, AnswersProvider>(); | ||||||
| builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30 | builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30 | ||||||
| @ -35,7 +85,7 @@ if (app.Environment.IsDevelopment()) | |||||||
|     app.UseSwagger(); |     app.UseSwagger(); | ||||||
|     app.UseSwaggerUI(); |     app.UseSwaggerUI(); | ||||||
| } | } | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
|  |  | ||||||
| app.MapControllers(); | app.MapControllers(); | ||||||
|  | |||||||
| @ -1,6 +1,7 @@ | |||||||
| using Azure; | using Azure; | ||||||
| using DamageAssesment.Api.Attachments.Interfaces; | using DamageAssesment.Api.Attachments.Interfaces; | ||||||
| using DamageAssesment.Api.Attachments.Models; | using DamageAssesment.Api.Attachments.Models; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Http; | using Microsoft.AspNetCore.Http; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using System.Net.Http.Headers; | using System.Net.Http.Headers; | ||||||
| @ -21,7 +22,7 @@ namespace DamageAssesment.Api.Attachments.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all attachments. |         /// Get all attachments. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("attachments")] |         [HttpGet("attachments")] | ||||||
|         public async Task<ActionResult> GetAttachmentsAsync() |         public async Task<ActionResult> GetAttachmentsAsync() | ||||||
|         { |         { | ||||||
| @ -37,6 +38,7 @@ namespace DamageAssesment.Api.Attachments.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all attachments by attachmentId. |         /// Get all attachments by attachmentId. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("attachments/{id}")] |         [HttpGet("attachments/{id}")] | ||||||
|         public async Task<ActionResult> GetAttachmentbyIdAsync(int id) |         public async Task<ActionResult> GetAttachmentbyIdAsync(int id) | ||||||
|         { |         { | ||||||
| @ -80,7 +82,7 @@ namespace DamageAssesment.Api.Attachments.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Save new Attachment(s) |         /// Save new Attachment(s) | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPost("attachments"), DisableRequestSizeLimit] |         [HttpPost("attachments"), DisableRequestSizeLimit] | ||||||
|         public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo) |         public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo) | ||||||
|         { |         { | ||||||
| @ -107,7 +109,7 @@ namespace DamageAssesment.Api.Attachments.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Modify an new attachment. |         /// Modify an new attachment. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPut("attachments"), DisableRequestSizeLimit] |         [HttpPut("attachments"), DisableRequestSizeLimit] | ||||||
|         public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo) |         public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo) | ||||||
|         { |         { | ||||||
| @ -136,8 +138,84 @@ namespace DamageAssesment.Api.Attachments.Controllers | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         /// <summary> |         /// <summary> | ||||||
|  |         /// download an existing attachment. | ||||||
|  |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|  |         [HttpGet("attachments/download/{id}")] | ||||||
|  |         public async Task<IActionResult> downloadfile(int id) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id); | ||||||
|  |                 if (!result.IsSuccess) | ||||||
|  |                     return NotFound(); | ||||||
|  |                 string path = await UploadService.GetFile(result.Attachment.URI); | ||||||
|  |                 if (path == null) | ||||||
|  |                     return NotFound(); | ||||||
|  |                 var contentType = GetContentType(result.Attachment.FileName); | ||||||
|  |                 if (contentType == "application/octet-stream") | ||||||
|  |                     return PhysicalFile(path, contentType, result.Attachment.FileName); | ||||||
|  |                 return PhysicalFile(path, contentType, enableRangeProcessing: true);// result.Attachment.FileName); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 // Handle the exception here or log it | ||||||
|  |                 return StatusCode(500, "An error occurred: " + ex.Message); | ||||||
|  |             } | ||||||
|  |             //try | ||||||
|  |             //{ | ||||||
|  |             //    var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id); | ||||||
|  |             //    if(!result.IsSuccess)  | ||||||
|  |             //        return NotFound(); | ||||||
|  |             //    byte[] fileContent = await UploadService.DownloadFile(result.Attachment.URI); | ||||||
|  |             //    if (fileContent == null || fileContent.Length == 0) | ||||||
|  |             //        return NotFound(); | ||||||
|  |             //    var contentType = "application/octet-stream"; | ||||||
|  |             //    return File(fileContent, contentType, result.Attachment.FileName); | ||||||
|  |             //} | ||||||
|  |             //catch (Exception ex) | ||||||
|  |             //{ | ||||||
|  |             //    // Handle the exception here or log it | ||||||
|  |             //    return StatusCode(500, "An error occurred: " + ex.Message); | ||||||
|  |             //} | ||||||
|  |         } | ||||||
|  |         private string GetContentType(string fileName) | ||||||
|  |         { | ||||||
|  |             // You can add more content types based on the file extensions | ||||||
|  |             switch (Path.GetExtension(fileName).ToLower()) | ||||||
|  |             { | ||||||
|  |                 //case ".txt": | ||||||
|  |                 //    return "text/plain"; | ||||||
|  |                 case ".jpg": | ||||||
|  |                 case ".jpeg": | ||||||
|  |                     return "image/jpeg"; | ||||||
|  |                 case ".png": | ||||||
|  |                     return "image/png"; | ||||||
|  |                 case ".gif": | ||||||
|  |                     return "image/gif"; | ||||||
|  |                 case ".bmp": | ||||||
|  |                     return "image/bmp"; | ||||||
|  |                 case ".webp": | ||||||
|  |                     return "image/webp"; | ||||||
|  |                 case ".csv": | ||||||
|  |                     return "text/csv"; | ||||||
|  |                 case ".pdf": | ||||||
|  |                     return "application/pdf"; | ||||||
|  |                 case ".docx": | ||||||
|  |                 case ".doc": | ||||||
|  |                     return "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; | ||||||
|  |                 case ".xlsx": | ||||||
|  |                 case ".xls": | ||||||
|  |                     return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; | ||||||
|  |                 // Add more cases as needed | ||||||
|  |                 default: | ||||||
|  |                     return "application/octet-stream"; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         /// <summary> | ||||||
|         /// Delete an existing attachment. |         /// Delete an existing attachment. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpDelete("attachments/{id}")] |         [HttpDelete("attachments/{id}")] | ||||||
|         public async Task<IActionResult> DeleteAttachment(int id) |         public async Task<IActionResult> DeleteAttachment(int id) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -9,6 +9,7 @@ namespace DamageAssesment.Api.Attachments.Interfaces | |||||||
|         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments); |         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments); | ||||||
|         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments); |         Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments); | ||||||
|         Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> DeleteAttachmentAsync(int Id); |         Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> DeleteAttachmentAsync(int Id); | ||||||
|  |         Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id); | ||||||
|         Task<(bool IsSuccess, int counter, string Path)> DeleteAttachmentsAsync(int responseId, int answerId); |         Task<(bool IsSuccess, int counter, string Path)> DeleteAttachmentsAsync(int responseId, int answerId); | ||||||
|         Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds); |         Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds); | ||||||
|         Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter(); |         Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter(); | ||||||
|  | |||||||
| @ -7,6 +7,8 @@ namespace DamageAssesment.Api.Attachments.Interfaces | |||||||
|         List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile); |         List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile); | ||||||
|         List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers); |         List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers); | ||||||
|         public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments); |         public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments); | ||||||
|  |         Task<byte[]> DownloadFile(string path); | ||||||
|  |         Task<string> GetFile(string path); | ||||||
|         void Deletefile(string path); |         void Deletefile(string path); | ||||||
|         void Movefile(string path); |         void Movefile(string path); | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -1,26 +1,77 @@ | |||||||
| using DamageAssesment.Api.Attachments.Db; | using DamageAssesment.Api.Attachments.Db; | ||||||
| using DamageAssesment.Api.Attachments.Interfaces; | using DamageAssesment.Api.Attachments.Interfaces; | ||||||
| using DamageAssesment.Api.Attachments.Providers; | using DamageAssesment.Api.Attachments.Providers; | ||||||
|  | using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||||
| using Microsoft.AspNetCore.Http.Features; | using Microsoft.AspNetCore.Http.Features; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| using Microsoft.Extensions.FileProviders; | using Microsoft.Extensions.FileProviders; | ||||||
|  | using Microsoft.IdentityModel.Tokens; | ||||||
|  | using Microsoft.OpenApi.Models; | ||||||
| using System.Reflection; | using System.Reflection; | ||||||
|  | using System.Text; | ||||||
|  |  | ||||||
| var builder = WebApplication.CreateBuilder(args); | 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. | // Add services to the container. | ||||||
|  |  | ||||||
| builder.Services.AddControllers(); | builder.Services.AddControllers(); | ||||||
| // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | ||||||
| builder.Services.AddEndpointsApiExplorer(); | builder.Services.AddEndpointsApiExplorer(); | ||||||
| //builder.Services.AddSwaggerGen(); | //builder.Services.AddSwaggerGen(); | ||||||
| builder.Services.AddSwaggerGen(c => | builder.Services.AddSwaggerGen(options => | ||||||
| { | { | ||||||
|     // Include XML comments from your assembly |     // Include XML comments from your assembly | ||||||
|     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; |     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; | ||||||
|     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); |     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); | ||||||
|     c.IncludeXmlComments(xmlPath); |     options.IncludeXmlComments(xmlPath); | ||||||
|  |  | ||||||
|  |     OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Name = "Bearer", | ||||||
|  |         BearerFormat = "JWT", | ||||||
|  |         Scheme = "bearer", | ||||||
|  |         Description = "Specify the authorization token.", | ||||||
|  |         In = ParameterLocation.Header, | ||||||
|  |         Type = SecuritySchemeType.Http, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityDefinition("jwt_auth", securityDefinition); | ||||||
|  |  | ||||||
|  |     // Make sure swagger UI requires a Bearer token specified | ||||||
|  |     OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Reference = new OpenApiReference() | ||||||
|  |         { | ||||||
|  |             Id = "jwt_auth", | ||||||
|  |             Type = ReferenceType.SecurityScheme | ||||||
|  |         } | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement() | ||||||
|  |     { | ||||||
|  |         {securityScheme, new string[] { }}, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityRequirement(securityRequirements); | ||||||
| }); | }); | ||||||
|  | builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>(); | ||||||
| builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>(); | builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>(); | ||||||
| builder.Services.AddScoped<IUploadService, UploadService>(); | builder.Services.AddScoped<IUploadService, UploadService>(); | ||||||
| builder.Services.AddScoped<IAzureBlobService,AzureBlobService>(); | builder.Services.AddScoped<IAzureBlobService,AzureBlobService>(); | ||||||
| @ -45,6 +96,7 @@ if (app.Environment.IsDevelopment()) | |||||||
|     app.UseSwaggerUI(); |     app.UseSwaggerUI(); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
| app.UseHttpsRedirection(); | app.UseHttpsRedirection(); | ||||||
|  |  | ||||||
|  | |||||||
| @ -14,13 +14,17 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|         private ILogger<AttachmentsProvider> logger; |         private ILogger<AttachmentsProvider> logger; | ||||||
|         private IUploadService uploadservice; |         private IUploadService uploadservice; | ||||||
|         private IMapper mapper;  |         private IMapper mapper;  | ||||||
|  |         private readonly IHttpContextAccessor httpContextAccessor; | ||||||
|         public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice) |         private string baseUrl; | ||||||
|  |         public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice, IHttpContextAccessor httpContextAccessor) | ||||||
|         { |         { | ||||||
|             this.AttachmentDbContext = AttachmentDbContext; |             this.AttachmentDbContext = AttachmentDbContext; | ||||||
|             this.logger = logger; |             this.logger = logger; | ||||||
|             this.mapper = mapper; |             this.mapper = mapper; | ||||||
|             this.uploadservice = uploadservice; |             this.uploadservice = uploadservice; | ||||||
|  |             this.httpContextAccessor = httpContextAccessor; | ||||||
|  |             baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}"; | ||||||
|  |             baseUrl = baseUrl + "/attachments/download"; | ||||||
|             SeedData(); |             SeedData(); | ||||||
|         } |         } | ||||||
|         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync() |         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync() | ||||||
| @ -32,6 +36,10 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|                 var Attachment = await AttachmentDbContext.Attachments.AsNoTracking().Where(a => !a.IsDeleted).ToListAsync(); |                 var Attachment = await AttachmentDbContext.Attachments.AsNoTracking().Where(a => !a.IsDeleted).ToListAsync(); | ||||||
|                 if (Attachment != null) |                 if (Attachment != null) | ||||||
|                 { |                 { | ||||||
|  |                     foreach (var attachment in Attachment) | ||||||
|  |                     { | ||||||
|  |                         attachment.URI = $"{baseUrl}/{attachment.Id}"; | ||||||
|  |                     } | ||||||
|                     logger?.LogInformation($"{Attachment.Count} Attachments(s) found"); |                     logger?.LogInformation($"{Attachment.Count} Attachments(s) found"); | ||||||
|                     var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachment); |                     var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachment); | ||||||
|                     return (true, result, null); |                     return (true, result, null); | ||||||
| @ -54,6 +62,7 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|                 if (Attachment != null) |                 if (Attachment != null) | ||||||
|                 { |                 { | ||||||
|                     logger?.LogInformation($"{Attachment} customer(s) found"); |                     logger?.LogInformation($"{Attachment} customer(s) found"); | ||||||
|  |                     Attachment.URI = $"{baseUrl}/{Attachment.Id}"; | ||||||
|                     var result = mapper.Map<Db.Attachment, Models.Attachment>(Attachment); |                     var result = mapper.Map<Db.Attachment, Models.Attachment>(Attachment); | ||||||
|                     return (true, result, null); |                     return (true, result, null); | ||||||
|                 } |                 } | ||||||
| @ -73,6 +82,10 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments); |                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments); | ||||||
|                 AttachmentDbContext.Attachments.AddRange(attachments); |                 AttachmentDbContext.Attachments.AddRange(attachments); | ||||||
|                 await AttachmentDbContext.SaveChangesAsync(); |                 await AttachmentDbContext.SaveChangesAsync(); | ||||||
|  |                 foreach (var attachment in attachments) | ||||||
|  |                 { | ||||||
|  |                     attachment.URI = $"{baseUrl}/{attachment.Id}"; | ||||||
|  |                 } | ||||||
|                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments); |                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments); | ||||||
|                 return (true, result, null); |                 return (true, result, null); | ||||||
|             } |             } | ||||||
| @ -91,6 +104,10 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments); |                 List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments); | ||||||
|                 AttachmentDbContext.Attachments.UpdateRange(attachments); |                 AttachmentDbContext.Attachments.UpdateRange(attachments); | ||||||
|                 await AttachmentDbContext.SaveChangesAsync(); |                 await AttachmentDbContext.SaveChangesAsync(); | ||||||
|  |                 foreach (var attachment in attachments) | ||||||
|  |                 { | ||||||
|  |                     attachment.URI = $"{baseUrl}/{attachment.Id}"; | ||||||
|  |                 } | ||||||
|                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments); |                 var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments); | ||||||
|                 return (true, result, null); |                 return (true, result, null); | ||||||
|             } |             } | ||||||
| @ -197,6 +214,24 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|         { |         { | ||||||
|             return AttachmentDbContext.Attachments.AsNoTracking().Count(e => e.Id == id && !e.IsDeleted) > 0; |             return AttachmentDbContext.Attachments.AsNoTracking().Count(e => e.Id == id && !e.IsDeleted) > 0; | ||||||
|         } |         } | ||||||
|  |         public async Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 Db.Attachment Attachment = AttachmentDbContext.Attachments.Where(a => a.Id == Id).AsNoTracking().FirstOrDefault(); | ||||||
|  |                 if (Attachment == null) | ||||||
|  |                 { | ||||||
|  |                     return (false, null, "Not Found"); | ||||||
|  |                 } | ||||||
|  |                 return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id}"); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |  | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|         private void SeedData() |         private void SeedData() | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -24,6 +24,41 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|             uploadpath = configuration.GetValue<string>("Fileupload:folderpath"); |             uploadpath = configuration.GetValue<string>("Fileupload:folderpath"); | ||||||
|             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath"); |             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath"); | ||||||
|         } |         } | ||||||
|  |         public async Task<string> GetFile(string path) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 if (System.IO.File.Exists(path)) | ||||||
|  |                 { | ||||||
|  |                     return path; | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 return null; // File not found | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 // Handle or log the exception as needed | ||||||
|  |                 throw; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |         } | ||||||
|  |         public async Task<byte[]> DownloadFile(string path) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 if (System.IO.File.Exists(path)) | ||||||
|  |                 { | ||||||
|  |                     return await System.IO.File.ReadAllBytesAsync(path); | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 return null; // File not found | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 // Handle or log the exception as needed | ||||||
|  |                 throw; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile) |         public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile) | ||||||
|         { |         { | ||||||
|             var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath); |             var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath); | ||||||
| @ -89,7 +124,7 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|                     { |                     { | ||||||
|                         counter++; |                         counter++; | ||||||
|  |  | ||||||
|                         var UserfileName = Path.GetFileName(file.FileName); |                         var UserfileName = Path.GetFileName(file.FileName+ file.FileExtension); | ||||||
|                         var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension); |                         var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension); | ||||||
|                         var dbPath = Path.Combine(fullDirectoryPath, fileName); |                         var dbPath = Path.Combine(fullDirectoryPath, fileName); | ||||||
|                         File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent)); |                         File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent)); | ||||||
| @ -126,7 +161,7 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|                 foreach (var file in item.postedFiles) |                 foreach (var file in item.postedFiles) | ||||||
|                 { |                 { | ||||||
|                     Models.Attachment attachment= attachments.Where(a=>a.Id == file.AttachmentId).FirstOrDefault(); |                     Models.Attachment attachment= attachments.Where(a=>a.Id == file.AttachmentId).FirstOrDefault(); | ||||||
|                     var UserfileName = Path.GetFileName(file.FileName); |                     var UserfileName = Path.GetFileName(file.FileName + file.FileExtension); | ||||||
|                     var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension); |                     var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension); | ||||||
|                     var dbPath = Path.Combine(fullDirectoryPath, fileName); |                     var dbPath = Path.Combine(fullDirectoryPath, fileName); | ||||||
|                     File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent)); |                     File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent)); | ||||||
|  | |||||||
| @ -197,7 +197,29 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|             var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1); |             var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1); | ||||||
|             Assert.Equal(404, result.StatusCode); |             Assert.Equal(404, result.StatusCode); | ||||||
|         } |         } | ||||||
|  |         [Fact(DisplayName = "Update Document IsActive- Ok case")] | ||||||
|  |         public async Task UpdateDocumentAsync_ShouldReturnStatusCode200() | ||||||
|  |         { | ||||||
|  |             var mockDocumentService = new Mock<IDoculinkProvider>(); | ||||||
|  |             var mockUploadService = new Mock<IUploadService>(); | ||||||
|  |             var mockResponse = await MockData.getOkResponse(1); | ||||||
|  |             mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse); | ||||||
|  |             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); | ||||||
|  |             var result = (OkObjectResult)await DocumentProvider.UpdateIsActiveDocument(1,true); | ||||||
|  |  | ||||||
|  |             Assert.Equal(200, result.StatusCode); | ||||||
|  |         } | ||||||
|  |         [Fact(DisplayName = "Update Document IsActive - NotFound case")] | ||||||
|  |         public async Task UpdateDocumentAsync_ShouldReturnStatusCode404() | ||||||
|  |         { | ||||||
|  |             var mockDocumentService = new Mock<IDoculinkProvider>(); | ||||||
|  |             var mockUploadService = new Mock<IUploadService>(); | ||||||
|  |             var mockResponse = await MockData.getNotFoundResponse(); | ||||||
|  |             mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse); | ||||||
|  |             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); | ||||||
|  |             var result = (NotFoundResult)await DocumentProvider.UpdateIsActiveDocument(1,true); | ||||||
|  |             Assert.Equal(404, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|         // Link Type Test cases |         // Link Type Test cases | ||||||
|  |  | ||||||
|  | |||||||
| @ -32,6 +32,7 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|                 doclinksAttachments.Add(new DoculinkAttachments() |                 doclinksAttachments.Add(new DoculinkAttachments() | ||||||
|                 { |                 { | ||||||
|                     docName = "",Path="www.google.com", |                     docName = "",Path="www.google.com", | ||||||
|  |                     Language = "en", | ||||||
|                     IsAttachments =false,CustomOrder=1 |                     IsAttachments =false,CustomOrder=1 | ||||||
|                 }); |                 }); | ||||||
|                 list.Add(new DocuLinks.Models.ResDoculink() |                 list.Add(new DocuLinks.Models.ResDoculink() | ||||||
| @ -74,6 +75,7 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|                     docName = "", |                     docName = "", | ||||||
|                     Path = "www.google.com", |                     Path = "www.google.com", | ||||||
|                     IsAttachments = false, |                     IsAttachments = false, | ||||||
|  |                     Language = "en", | ||||||
|                     CustomOrder = 1 |                     CustomOrder = 1 | ||||||
|                 }); |                 }); | ||||||
|                 list.Add(new DocuLinks.Models.ResDoculink() |                 list.Add(new DocuLinks.Models.ResDoculink() | ||||||
| @ -138,6 +140,7 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|                 docName = "", |                 docName = "", | ||||||
|                 Path = "www.google.com", |                 Path = "www.google.com", | ||||||
|                 IsAttachments = false, |                 IsAttachments = false, | ||||||
|  |                 Language = "en", | ||||||
|                 CustomOrder = 1 |                 CustomOrder = 1 | ||||||
|             }); |             }); | ||||||
|             return new Models.Doculink |             return new Models.Doculink | ||||||
| @ -165,6 +168,7 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|                 docName = "", |                 docName = "", | ||||||
|                 Path = "www.google.com", |                 Path = "www.google.com", | ||||||
|                 IsAttachments = false, |                 IsAttachments = false, | ||||||
|  |                 Language = "en", | ||||||
|                 CustomOrder = 1 |                 CustomOrder = 1 | ||||||
|             }); |             }); | ||||||
|             List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>(); |             List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>(); | ||||||
|  | |||||||
| @ -2,8 +2,10 @@ | |||||||
| using DamageAssesment.Api.DocuLinks.Interfaces; | using DamageAssesment.Api.DocuLinks.Interfaces; | ||||||
| using DamageAssesment.Api.DocuLinks.Models; | using DamageAssesment.Api.DocuLinks.Models; | ||||||
| using DamageAssesment.Api.DocuLinks.Providers; | using DamageAssesment.Api.DocuLinks.Providers; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Http; | using Microsoft.AspNetCore.Http; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
|  | using System.Data; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.DocuLinks.Controllers | namespace DamageAssesment.Api.DocuLinks.Controllers | ||||||
| { | { | ||||||
| @ -24,6 +26,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// Get all Doculink type. |         /// Get all Doculink type. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [Route("doculinks/types")] |         [Route("doculinks/types")] | ||||||
|         [Route("doculinks/types/{language:alpha}")] |         [Route("doculinks/types/{language:alpha}")] | ||||||
|         public async Task<IActionResult> GetLinkTypesAsync(string? language) |         public async Task<IActionResult> GetLinkTypesAsync(string? language) | ||||||
| @ -39,6 +42,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// Get a Doculink type by id. |         /// Get a Doculink type by id. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [Route("doculinks/types/{id}")] |         [Route("doculinks/types/{id}")] | ||||||
|         [Route("doculinks/types/{id}/{language:alpha}")] |         [Route("doculinks/types/{id}/{language:alpha}")] | ||||||
|         public async Task<IActionResult> GetLinkTypeAsync(int id, string? language) |         public async Task<IActionResult> GetLinkTypeAsync(int id, string? language) | ||||||
| @ -53,6 +57,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Update a existing Doculink type. |         /// Update a existing Doculink type. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPut] |         [HttpPut] | ||||||
|         [Route("doculinks/types/{id}")] |         [Route("doculinks/types/{id}")] | ||||||
|         public async Task<IActionResult> UpdateLinkType(int id, Models.LinkType linkType) |         public async Task<IActionResult> UpdateLinkType(int id, Models.LinkType linkType) | ||||||
| @ -74,6 +79,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Create a new Doculink type. |         /// Create a new Doculink type. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPost] |         [HttpPost] | ||||||
|         [Route("doculinks/types")] |         [Route("doculinks/types")] | ||||||
|         public async Task<IActionResult> CreateLinkType(Models.LinkType linkType) |         public async Task<IActionResult> CreateLinkType(Models.LinkType linkType) | ||||||
| @ -92,6 +98,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Delete a  existing Doculink type by id. |         /// Delete a  existing Doculink type by id. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpDelete] |         [HttpDelete] | ||||||
|         [Route("doculinks/types/{id}")] |         [Route("doculinks/types/{id}")] | ||||||
|         public async Task<IActionResult> DeleteLinkType(int id) |         public async Task<IActionResult> DeleteLinkType(int id) | ||||||
| @ -104,9 +111,85 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|             return NotFound(); |             return NotFound(); | ||||||
|         } |         } | ||||||
|         /// <summary> |         /// <summary> | ||||||
|  |         /// download an existing attachment. | ||||||
|  |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|  |         [HttpGet("doculinks/download/{id}")] | ||||||
|  |         public async Task<IActionResult> downloadfile(int id) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 var result = await this.documentsProvider.GetDownloadAttachmentAsync(id); | ||||||
|  |                 if (!result.IsSuccess) | ||||||
|  |                     return NotFound(); | ||||||
|  |                 string path = await uploadService.GetFile(result.DoculinkAttachments.Path); | ||||||
|  |                 if (path == null) | ||||||
|  |                     return NotFound(); | ||||||
|  |                 var contentType = GetContentType(result.DoculinkAttachments.docName); | ||||||
|  |                 if (contentType == "application/octet-stream") | ||||||
|  |                     return PhysicalFile(path, contentType, result.DoculinkAttachments.docName); | ||||||
|  |                 return PhysicalFile(path, contentType, enableRangeProcessing: true); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 // Handle the exception here or log it | ||||||
|  |                 return StatusCode(500, "An error occurred: " + ex.Message); | ||||||
|  |             } | ||||||
|  |             //try | ||||||
|  |             //{ | ||||||
|  |             //    var result = await this.documentsProvider.GetDownloadAttachmentAsync(id); | ||||||
|  |             //    if (!result.IsSuccess) | ||||||
|  |             //        return NotFound(); | ||||||
|  |             //    byte[] fileContent = await uploadService.DownloadFile(result.DoculinkAttachments.Path); | ||||||
|  |             //    if (fileContent == null || fileContent.Length == 0) | ||||||
|  |             //        return NotFound(); | ||||||
|  |             //    var contentType = "application/octet-stream"; | ||||||
|  |             //    return File(fileContent, contentType, result.DoculinkAttachments.docName); | ||||||
|  |             //} | ||||||
|  |             //catch (Exception ex) | ||||||
|  |             //{ | ||||||
|  |             //    // Handle the exception here or log it | ||||||
|  |             //    return StatusCode(500, "An error occurred: " + ex.Message); | ||||||
|  |             //} | ||||||
|  |         } | ||||||
|  |         private string GetContentType(string fileName) | ||||||
|  |         { | ||||||
|  |             // You can add more content types based on the file extensions | ||||||
|  |             switch (Path.GetExtension(fileName).ToLower()) | ||||||
|  |             { | ||||||
|  |                 //case ".txt": | ||||||
|  |                 //    return "text/plain"; | ||||||
|  |                 case ".jpg": | ||||||
|  |                 case ".jpeg": | ||||||
|  |                     return "image/jpeg"; | ||||||
|  |                 case ".png": | ||||||
|  |                     return "image/png"; | ||||||
|  |                 case ".gif": | ||||||
|  |                     return "image/gif"; | ||||||
|  |                 case ".bmp": | ||||||
|  |                     return "image/bmp"; | ||||||
|  |                 case ".webp": | ||||||
|  |                     return "image/webp"; | ||||||
|  |                 case ".csv": | ||||||
|  |                     return "text/csv"; | ||||||
|  |                 case ".pdf": | ||||||
|  |                     return "application/pdf"; | ||||||
|  |                 case ".docx": | ||||||
|  |                 case ".doc": | ||||||
|  |                     return "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; | ||||||
|  |                 case ".xlsx": | ||||||
|  |                 case ".xls": | ||||||
|  |                     return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; | ||||||
|  |                 // Add more cases as needed | ||||||
|  |                 default: | ||||||
|  |                     return "application/octet-stream"; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         /// <summary> | ||||||
|         /// Get all Doculink. |         /// Get all Doculink. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|         ///  |          | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [Route("doculinks")] |         [Route("doculinks")] | ||||||
|         [Route("doculinks/{linktype:alpha}")] |         [Route("doculinks/{linktype:alpha}")] | ||||||
|         [Route("doculinks/{linktype:alpha}/{language:alpha}")] |         [Route("doculinks/{linktype:alpha}/{language:alpha}")] | ||||||
| @ -123,6 +206,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all active Doculink. |         /// Get all active Doculink. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [Route("doculinks/active")] |         [Route("doculinks/active")] | ||||||
|         [Route("doculinks/active/{linktype:alpha}")] |         [Route("doculinks/active/{linktype:alpha}")] | ||||||
|         [Route("doculinks/active/{linktype:alpha}/{language:alpha}")] |         [Route("doculinks/active/{linktype:alpha}/{language:alpha}")] | ||||||
| @ -139,6 +223,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all active Doculink. |         /// Get all active Doculink. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [Route("doculinks/active/{linktypeid:int}")] |         [Route("doculinks/active/{linktypeid:int}")] | ||||||
|         [Route("doculinks/active/{linktypeid:int}/{language:alpha}")] |         [Route("doculinks/active/{linktypeid:int}/{language:alpha}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -154,6 +239,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get a Doculink by id. |         /// Get a Doculink by id. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [Route("doculinks/{id}")] |         [Route("doculinks/{id}")] | ||||||
|         [Route("doculinks/{id}/{linktype:alpha}")] |         [Route("doculinks/{id}/{linktype:alpha}")] | ||||||
| @ -168,8 +254,9 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|             return NotFound(); |             return NotFound(); | ||||||
|         } |         } | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// update existing doclink. |         /// Upload new document. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPut] |         [HttpPut] | ||||||
|         [Route("doculinks/{id}")] |         [Route("doculinks/{id}")] | ||||||
|         public async Task<IActionResult> UpdateDocument(int id, ReqDoculink documentInfo) |         public async Task<IActionResult> UpdateDocument(int id, ReqDoculink documentInfo) | ||||||
| @ -193,8 +280,23 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|             return BadRequest(documentInfo); |             return BadRequest(documentInfo); | ||||||
|         } |         } | ||||||
|         /// <summary> |         /// <summary> | ||||||
|  |         /// update existing doclink isactive field. | ||||||
|  |         /// </summary> | ||||||
|  |         [HttpPut] | ||||||
|  |         [Route("doculinks/{id}/{isactive}")] | ||||||
|  |         public async Task<IActionResult> UpdateIsActiveDocument(int id, bool isactive) | ||||||
|  |         { | ||||||
|  |             var result = await this.documentsProvider.UpdateDocumentAsync(id, isactive); | ||||||
|  |             if (result.IsSuccess) | ||||||
|  |             { | ||||||
|  |                 return Ok(result.Document); | ||||||
|  |             } | ||||||
|  |             return NotFound(); | ||||||
|  |         } | ||||||
|  |         /// <summary> | ||||||
|         /// Create new doclink. |         /// Create new doclink. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPost] |         [HttpPost] | ||||||
|         [Route("doculinks")] |         [Route("doculinks")] | ||||||
|         public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo) |         public async Task<IActionResult> CreateDocument(ReqDoculink documentInfo) | ||||||
| @ -220,8 +322,9 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Delete Doculink by id. |         /// Delete document by id. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpDelete] |         [HttpDelete] | ||||||
|         [Route("doculinks/{id}")] |         [Route("doculinks/{id}")] | ||||||
|         public async Task<IActionResult> DeleteDocument(int id) |         public async Task<IActionResult> DeleteDocument(int id) | ||||||
|  | |||||||
| @ -10,6 +10,7 @@ | |||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> |     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> | ||||||
|     <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" /> |     <PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" /> | ||||||
|  |     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> | ||||||
|     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" /> |     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9"> |     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9"> | ||||||
|  | |||||||
| @ -15,5 +15,6 @@ namespace DamageAssesment.Api.DocuLinks.Db | |||||||
|         public string Path { get; set; } |         public string Path { get; set; } | ||||||
|         public bool IsAttachments { get; set; } |         public bool IsAttachments { get; set; } | ||||||
|         public int CustomOrder { get; set; } |         public int CustomOrder { get; set; } | ||||||
|  |         public string Language { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -11,7 +11,9 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces | |||||||
|         Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive); |         Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive); | ||||||
|         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document); |         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document); | ||||||
|         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document); |         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document); | ||||||
|  |         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, bool isactive); | ||||||
|         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id); |         Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id); | ||||||
|  |         Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id); | ||||||
|         Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter(); |         Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter(); | ||||||
|  |  | ||||||
|  |  | ||||||
|  | |||||||
| @ -7,6 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces | |||||||
|         Models.Doculink UploadDocument( int counter, ReqDoculink documentInfo); |         Models.Doculink UploadDocument( int counter, ReqDoculink documentInfo); | ||||||
|         public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo); |         public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo); | ||||||
|         void Deletefile(string path); |         void Deletefile(string path); | ||||||
|  |         Task<byte[]> DownloadFile(string path); | ||||||
|  |         Task<string> GetFile(string path); | ||||||
|         void Movefile(string path); |         void Movefile(string path); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -8,6 +8,7 @@ namespace DamageAssesment.Api.DocuLinks.Models | |||||||
|         public string docName { get; set; } |         public string docName { get; set; } | ||||||
|         public string Path { get; set; } |         public string Path { get; set; } | ||||||
|         public bool IsAttachments { get; set; } |         public bool IsAttachments { get; set; } | ||||||
|  |         public string Language { get; set; } | ||||||
|         public int CustomOrder { get; set; } |         public int CustomOrder { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -7,6 +7,7 @@ namespace DamageAssesment.Api.DocuLinks.Models | |||||||
|         public int Id { get; set; } |         public int Id { get; set; } | ||||||
|         public int linkTypeId { get; set; } |         public int linkTypeId { get; set; } | ||||||
|         public List<DoculinkTranslation> documentsTranslations { get; set; } |         public List<DoculinkTranslation> documentsTranslations { get; set; } | ||||||
|  |         public bool IsActive { get; set; } | ||||||
|         public int CustomOrder { get; set; } |         public int CustomOrder { get; set; } | ||||||
|         public List<FileModel>? Files { get; set; } |         public List<FileModel>? Files { get; set; } | ||||||
|     } |     } | ||||||
| @ -18,5 +19,6 @@ namespace DamageAssesment.Api.DocuLinks.Models | |||||||
|         public int CustomOrder { get; set; } |         public int CustomOrder { get; set; } | ||||||
|         public string url { get;set; } |         public string url { get;set; } | ||||||
|         public bool IsAttachments { get; set; } |         public bool IsAttachments { get; set; } | ||||||
|  |         public string Language { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -2,23 +2,74 @@ using DamageAssesment.Api.DocuLinks.Db; | |||||||
| using DamageAssesment.Api.DocuLinks.Interfaces; | using DamageAssesment.Api.DocuLinks.Interfaces; | ||||||
| using DamageAssesment.Api.DocuLinks.Providers; | using DamageAssesment.Api.DocuLinks.Providers; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||||
|  | using Microsoft.IdentityModel.Tokens; | ||||||
| using System.Reflection; | using System.Reflection; | ||||||
|  | using System.Text; | ||||||
|  | using Microsoft.OpenApi.Models; | ||||||
|  |  | ||||||
| var builder = WebApplication.CreateBuilder(args); | var builder = WebApplication.CreateBuilder(args); | ||||||
|  |  | ||||||
| // Add services to the container. | // 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.AddControllers(); | ||||||
| builder.Services.AddSwaggerGen(c => | builder.Services.AddSwaggerGen(options => | ||||||
| { | { | ||||||
|     // Include XML comments from your assembly |     // Include XML comments from your assembly | ||||||
|     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; |     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; | ||||||
|     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); |     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 | // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | ||||||
| builder.Services.AddEndpointsApiExplorer(); | builder.Services.AddEndpointsApiExplorer(); | ||||||
| builder.Services.AddSwaggerGen(); | builder.Services.AddSwaggerGen(); | ||||||
|  | builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>(); | ||||||
| builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>(); | builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>(); | ||||||
| builder.Services.AddScoped<IUploadService, UploadService>(); | builder.Services.AddScoped<IUploadService, UploadService>(); | ||||||
| builder.Services.AddScoped<IAzureBlobService, AzureBlobService>(); | builder.Services.AddScoped<IAzureBlobService, AzureBlobService>(); | ||||||
| @ -36,6 +87,7 @@ if (app.Environment.IsDevelopment()) | |||||||
|     app.UseSwaggerUI(); |     app.UseSwaggerUI(); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
|  |  | ||||||
| app.MapControllers(); | app.MapControllers(); | ||||||
|  | |||||||
| @ -2,13 +2,16 @@ | |||||||
| using DamageAssesment.Api.DocuLinks.Db; | using DamageAssesment.Api.DocuLinks.Db; | ||||||
| using DamageAssesment.Api.DocuLinks.Interfaces; | using DamageAssesment.Api.DocuLinks.Interfaces; | ||||||
| using DamageAssesment.Api.DocuLinks.Models; | using DamageAssesment.Api.DocuLinks.Models; | ||||||
|  | using Microsoft.AspNetCore.Http; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| using Microsoft.EntityFrameworkCore.Metadata.Internal; | using Microsoft.EntityFrameworkCore.Metadata.Internal; | ||||||
| using System; | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
| using System.Collections.Immutable; | using System.Collections.Immutable; | ||||||
| using System.Diagnostics.Eventing.Reader; | using System.Diagnostics.Eventing.Reader; | ||||||
| using System.Reflection.Metadata; | using System.Reflection.Metadata; | ||||||
|  | using System.Runtime.CompilerServices; | ||||||
| using System.Xml; | using System.Xml; | ||||||
| using System.Xml.Linq; | using System.Xml.Linq; | ||||||
|  |  | ||||||
| @ -22,13 +25,18 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|         private ILogger<DoculinkProvider> logger; |         private ILogger<DoculinkProvider> logger; | ||||||
|         private IUploadService uploadservice; |         private IUploadService uploadservice; | ||||||
|         private IMapper mapper; |         private IMapper mapper; | ||||||
|  |         private readonly IHttpContextAccessor httpContextAccessor; | ||||||
|  |         private string baseUrl; | ||||||
|  |  | ||||||
|         public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice) |         public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IHttpContextAccessor httpContextAccessor) | ||||||
|         { |         { | ||||||
|             this.DocumentDbContext = DocumentDbContext; |             this.DocumentDbContext = DocumentDbContext; | ||||||
|             this.logger = logger; |             this.logger = logger; | ||||||
|             this.mapper = mapper; |             this.mapper = mapper; | ||||||
|             this.uploadservice = uploadservice; |             this.uploadservice = uploadservice; | ||||||
|  |             this.httpContextAccessor = httpContextAccessor; | ||||||
|  |             baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}"; | ||||||
|  |             baseUrl = baseUrl + "/doculinks/download"; | ||||||
|             SeedData(); |             SeedData(); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @ -71,10 +79,10 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|                     { |                     { | ||||||
|                         linkTypeId = 1; |                         linkTypeId = 1; | ||||||
|  |  | ||||||
|                         fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 }; |                         fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1, Language = "en"  }; | ||||||
|                     } |                     } | ||||||
|                     else |                     else | ||||||
|                         fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 }; |                         fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1,Language="en" }; | ||||||
|                     ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } }; |                     ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } }; | ||||||
|                     Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo); |                     Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo); | ||||||
|                     DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document)); |                     DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document)); | ||||||
| @ -170,7 +178,42 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|             MultiLanguage = dicttitle; |             MultiLanguage = dicttitle; | ||||||
|             return MultiLanguage; |             return MultiLanguage; | ||||||
|         } |         } | ||||||
|  |         private List<Models.DoculinkAttachments> GetDocumentAttachment(int id,string? language) | ||||||
|  |         { | ||||||
|  |             List<Db.DoculinkAttachments> doculinkAttachments = null; | ||||||
|  |             if (string.IsNullOrEmpty(language)) | ||||||
|  |             { | ||||||
|  |                 doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList(); | ||||||
|  |             } | ||||||
|  |             else | ||||||
|  |             { | ||||||
|  |                 doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList(); | ||||||
|  |             } | ||||||
|  |             foreach (var attachment in doculinkAttachments) | ||||||
|  |             { | ||||||
|  |                 if (attachment.IsAttachments) | ||||||
|  |                     attachment.Path = $"{baseUrl}/{attachment.Id}"; | ||||||
|  |             } | ||||||
|  |             return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(doculinkAttachments); | ||||||
|  |         } | ||||||
|  |         public async Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 Db.DoculinkAttachments Attachment = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.Id == id).AsNoTracking().FirstOrDefault(); | ||||||
|  |                 if (Attachment == null) | ||||||
|  |                 { | ||||||
|  |                     return (false, null, "Not Found"); | ||||||
|  |                 } | ||||||
|  |                 return (true, mapper.Map<Db.DoculinkAttachments, Models.DoculinkAttachments>(Attachment), $"Attachment {id}"); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |  | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive) |         public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive) | ||||||
|         { |         { | ||||||
|  |  | ||||||
| @ -192,8 +235,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|                         item.titles = multilan.titles; |                         item.titles = multilan.titles; | ||||||
|                         item.description = multilan.description; |                         item.description = multilan.description; | ||||||
|                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language)); |                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language)); | ||||||
|                         item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>( |                         item.doclinksAttachments = GetDocumentAttachment(item.Id,language); | ||||||
|                             DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList()); |  | ||||||
|                     } |                     } | ||||||
|                    // List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList(); |                    // List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList(); | ||||||
|                     return (true, result, null); |                     return (true, result, null); | ||||||
| @ -228,8 +270,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|                         item.titles = multilan.titles; |                         item.titles = multilan.titles; | ||||||
|                         item.description = multilan.description; |                         item.description = multilan.description; | ||||||
|                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language)); |                         item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language)); | ||||||
|                         item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>( |                         item.doclinksAttachments = GetDocumentAttachment(item.Id, language); | ||||||
|                             DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList()); |  | ||||||
|                     } |                     } | ||||||
|                     //List<ResDoculinks> doculinks =  result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList(); |                     //List<ResDoculinks> doculinks =  result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList(); | ||||||
|                     return (true, result, null); |                     return (true, result, null); | ||||||
| @ -284,8 +325,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|                     result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>( |                     result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>( | ||||||
|                             DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList()); |                             DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList()); | ||||||
|  |  | ||||||
|                     result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>( |                     result.doclinksAttachments = GetDocumentAttachment(id, ""); | ||||||
|                         DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList()); |  | ||||||
|                     return (true, result, null); |                     return (true, result, null); | ||||||
|                 } |                 } | ||||||
|                 return (false, null, "Not found"); |                 return (false, null, "Not found"); | ||||||
| @ -317,8 +357,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|                     result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language)); |                     result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language)); | ||||||
|                     result.titles = multilan.titles; |                     result.titles = multilan.titles; | ||||||
|                     result.description = multilan.description; |                     result.description = multilan.description; | ||||||
|                     result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>( |                     result.doclinksAttachments = GetDocumentAttachment(id, language); | ||||||
|                         DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList()); |  | ||||||
|                     return (true, result, null); |                     return (true, result, null); | ||||||
|                 } |                 } | ||||||
|                 return (false, null, "Not found"); |                 return (false, null, "Not found"); | ||||||
| @ -349,7 +388,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|                 result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, "")); |                 result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, "")); | ||||||
|                 result.titles = multilan.titles; |                 result.titles = multilan.titles; | ||||||
|                 result.description = multilan.description; |                 result.description = multilan.description; | ||||||
|                 result.doclinksAttachments = Document.doclinksAttachments; |                 result.doclinksAttachments = GetDocumentAttachment(document.Id,""); | ||||||
|                 return (true, result, null); |                 return (true, result, null); | ||||||
|             } |             } | ||||||
|             catch (Exception ex) |             catch (Exception ex) | ||||||
| @ -391,7 +430,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|                         result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, "")); |                         result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, "")); | ||||||
|                         result.titles = multilan.titles; |                         result.titles = multilan.titles; | ||||||
|                         result.description = multilan.description; |                         result.description = multilan.description; | ||||||
|                         result.doclinksAttachments = Document.doclinksAttachments; |                         result.doclinksAttachments = GetDocumentAttachment(document.Id, ""); | ||||||
|                         return (true, result, "Successful"); |                         return (true, result, "Successful"); | ||||||
|                     } |                     } | ||||||
|                     else |                     else | ||||||
| @ -414,6 +453,35 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|                 return (false, null, ex.Message); |                 return (false, null, ex.Message); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |         public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id,bool isactive) | ||||||
|  |         { | ||||||
|  |  | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 Db.Doculink Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == id).FirstOrDefault(); | ||||||
|  |                 if (Document == null) | ||||||
|  |                 { | ||||||
|  |                     return (false, null, "Not Found"); | ||||||
|  |                 } | ||||||
|  |                 Document.IsActive = isactive; | ||||||
|  |                 DocumentDbContext.Documents.Update(Document); | ||||||
|  |                 DocumentDbContext.SaveChanges(); | ||||||
|  |                 var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document); | ||||||
|  |                 var multilan = CreateMultiLanguageObject(GetDocumentTranslations(Document.Id, "")); | ||||||
|  |                 result.titles = multilan.titles; | ||||||
|  |                 result.description = multilan.description; | ||||||
|  |                 result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, "")); | ||||||
|  |                 result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>( | ||||||
|  |                     DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList()); | ||||||
|  |                 return (true, result, $"DocumentId {id} deleted Successfuly"); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |  | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id) |         public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id) | ||||||
|         { |         { | ||||||
|  |  | ||||||
|  | |||||||
| @ -25,6 +25,41 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|             uploadpath = configuration.GetValue<string>("Fileupload:folderpath"); |             uploadpath = configuration.GetValue<string>("Fileupload:folderpath"); | ||||||
|             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath"); |             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath"); | ||||||
|         } |         } | ||||||
|  |         public async Task<string> GetFile(string path) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 if (System.IO.File.Exists(path)) | ||||||
|  |                 { | ||||||
|  |                     return path; | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 return null; // File not found | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 // Handle or log the exception as needed | ||||||
|  |                 throw; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |         } | ||||||
|  |         public async Task<byte[]> DownloadFile(string path) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 if (System.IO.File.Exists(path)) | ||||||
|  |                 { | ||||||
|  |                     return await System.IO.File.ReadAllBytesAsync(path); | ||||||
|  |                 } | ||||||
|  |  | ||||||
|  |                 return null; // File not found | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 // Handle or log the exception as needed | ||||||
|  |                 throw; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|         public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo) |         public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo) | ||||||
|         { |         { | ||||||
| @ -44,19 +79,20 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|                         counter++; |                         counter++; | ||||||
|                         if (item.IsAttachments) |                         if (item.IsAttachments) | ||||||
|                         { |                         { | ||||||
|                             UserfileName = Path.GetFileName(item.FileName); |                             UserfileName = Path.GetFileName(item.FileName + item.FileExtension); | ||||||
|                             var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension); |                             var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension); | ||||||
|                             path = Path.Combine(fullDirectoryPath, fileName); |                             path = Path.Combine(fullDirectoryPath, fileName); | ||||||
|                             File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent)); |                             File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent)); | ||||||
|                         } |                         } | ||||||
|                         else |                         else | ||||||
|                             path = item.url; |                             path = item.url; | ||||||
|                         attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder }); |                         attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language }); | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|                 Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId, |                 Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId, | ||||||
|                     documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments, |                     documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments, | ||||||
|                     IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true}; |                     IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =documentInfo.IsActive | ||||||
|  |                 }; | ||||||
|              |              | ||||||
|                 return Documents; |                 return Documents; | ||||||
|             } |             } | ||||||
| @ -85,21 +121,21 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|                     counter++; |                     counter++; | ||||||
|                     if (item.IsAttachments) |                     if (item.IsAttachments) | ||||||
|                     { |                     { | ||||||
|                         UserfileName = Path.GetFileName(item.FileName); |                         UserfileName = Path.GetFileName(item.FileName+item.FileExtension); | ||||||
|                         var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension); |                         var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension); | ||||||
|                         path = Path.Combine(fullDirectoryPath, fileName); |                         path = Path.Combine(fullDirectoryPath, fileName); | ||||||
|                         File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent)); |                         File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent)); | ||||||
|                     } |                     } | ||||||
|                     else |                     else | ||||||
|                         path = item.url; |                         path = item.url; | ||||||
|                     attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder }); |                     attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language }); | ||||||
|                 } |                 } | ||||||
|                 Models.Doculink Documents = new Models.Doculink() |                 Models.Doculink Documents = new Models.Doculink() | ||||||
|                 { |                 { | ||||||
|                     Id = documentInfo.Id, |                     Id = documentInfo.Id, | ||||||
|                     linkTypeId = documentInfo.linkTypeId, |                     linkTypeId = documentInfo.linkTypeId, | ||||||
|                     documentsTranslations=documentInfo.documentsTranslations, |                     documentsTranslations=documentInfo.documentsTranslations, | ||||||
|                     IsActive = true, |                     IsActive = documentInfo.IsActive, | ||||||
|                     IsDeleted=false, |                     IsDeleted=false, | ||||||
|                     CustomOrder = documentInfo.CustomOrder, |                     CustomOrder = documentInfo.CustomOrder, | ||||||
|                     doclinksAttachments = attachments |                     doclinksAttachments = attachments | ||||||
|  | |||||||
| @ -6,8 +6,12 @@ | |||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "AllowedHosts": "*", |   "AllowedHosts": "*", | ||||||
|  |   "JwtSettings": { | ||||||
|  |     "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk=" | ||||||
|  |   }, | ||||||
|   "Fileupload": { |   "Fileupload": { | ||||||
|     "folderpath": "DASA_Documents/Active", |     "folderpath": "DASA_Documents/Active", | ||||||
|     "Deletepath": "DASA_Documents/Deleted" |     "Deletepath": "DASA_Documents/Deleted" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | |||||||
| @ -1,4 +1,5 @@ | |||||||
| using DamageAssesment.Api.Employees.Interfaces; | using DamageAssesment.Api.Employees.Interfaces; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Http; | using Microsoft.AspNetCore.Http; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
|  |  | ||||||
| @ -18,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// GET request for retrieving employees. |         /// GET request for retrieving employees. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("employees")] |         [HttpGet("employees")] | ||||||
|         public async Task<ActionResult> GetEmployeesAsync() |         public async Task<ActionResult> GetEmployeesAsync() | ||||||
|         { |         { | ||||||
| @ -35,7 +36,7 @@ namespace DamageAssesment.Api.Employees.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// GET request for retrieving an employee by ID. |         /// GET request for retrieving an employee by ID. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|          |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("employees/{id}")] |         [HttpGet("employees/{id}")] | ||||||
|         public async Task<ActionResult> GetEmployeeByIdAsync(int id) |         public async Task<ActionResult> GetEmployeeByIdAsync(int id) | ||||||
|         { |         { | ||||||
| @ -53,6 +54,7 @@ namespace DamageAssesment.Api.Employees.Controllers | |||||||
|         /// PUT request for updating an existing employee. |         /// PUT request for updating an existing employee. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|         /// <param name="Employee">The updated employee object.</param> |         /// <param name="Employee">The updated employee object.</param> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPut("employees/{id}")] |         [HttpPut("employees/{id}")] | ||||||
|         public async Task<IActionResult> UpdateEmployee(int id, Models.Employee Employee) |         public async Task<IActionResult> UpdateEmployee(int id, Models.Employee Employee) | ||||||
|         { |         { | ||||||
| @ -75,6 +77,7 @@ namespace DamageAssesment.Api.Employees.Controllers | |||||||
|         /// POST request for creating a new employee. |         /// POST request for creating a new employee. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|         /// <param name="Employee">The employee information for creating a new employee.</param> |         /// <param name="Employee">The employee information for creating a new employee.</param> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPost("employees")] |         [HttpPost("employees")] | ||||||
|         public async Task<IActionResult> CreateEmployee(Models.Employee Employee) |         public async Task<IActionResult> CreateEmployee(Models.Employee Employee) | ||||||
|         { |         { | ||||||
| @ -93,6 +96,7 @@ namespace DamageAssesment.Api.Employees.Controllers | |||||||
|         /// DELETE request for deleting an existing employee. |         /// DELETE request for deleting an existing employee. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|         /// <param name="id">The ID of the employee to be deleted.</param> |         /// <param name="id">The ID of the employee to be deleted.</param> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpDelete("employees/{id}")] |         [HttpDelete("employees/{id}")] | ||||||
|         public async Task<IActionResult> DeleteEmployee(int id) |         public async Task<IActionResult> DeleteEmployee(int id) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -1,23 +1,74 @@ | |||||||
| using DamageAssesment.Api.Employees.Db; | using DamageAssesment.Api.Employees.Db; | ||||||
| using DamageAssesment.Api.Employees.Interfaces; | using DamageAssesment.Api.Employees.Interfaces; | ||||||
| using DamageAssesment.Api.Employees.Providers; | using DamageAssesment.Api.Employees.Providers; | ||||||
|  | using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | using Microsoft.IdentityModel.Tokens; | ||||||
|  | using Microsoft.OpenApi.Models; | ||||||
| using System.Reflection; | using System.Reflection; | ||||||
|  | using System.Text; | ||||||
|  |  | ||||||
| var builder = WebApplication.CreateBuilder(args); | var builder = WebApplication.CreateBuilder(args); | ||||||
|  |  | ||||||
| // Add services to the container. | // 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.AddControllers(); | ||||||
| // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | ||||||
| builder.Services.AddEndpointsApiExplorer(); | builder.Services.AddEndpointsApiExplorer(); | ||||||
| //builder.Services.AddSwaggerGen(); | //builder.Services.AddSwaggerGen(); | ||||||
| builder.Services.AddSwaggerGen(c => | builder.Services.AddSwaggerGen(options => | ||||||
| { | { | ||||||
|     // Include XML comments from your assembly |     // Include XML comments from your assembly | ||||||
|     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; |     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; | ||||||
|     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); |     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); | ||||||
|     c.IncludeXmlComments(xmlPath); |     options.IncludeXmlComments(xmlPath); | ||||||
|  |  | ||||||
|  |     OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Name = "Bearer", | ||||||
|  |         BearerFormat = "JWT", | ||||||
|  |         Scheme = "bearer", | ||||||
|  |         Description = "Specify the authorization token.", | ||||||
|  |         In = ParameterLocation.Header, | ||||||
|  |         Type = SecuritySchemeType.Http, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityDefinition("jwt_auth", securityDefinition); | ||||||
|  |  | ||||||
|  |     // Make sure swagger UI requires a Bearer token specified | ||||||
|  |     OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Reference = new OpenApiReference() | ||||||
|  |         { | ||||||
|  |             Id = "jwt_auth", | ||||||
|  |             Type = ReferenceType.SecurityScheme | ||||||
|  |         } | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement() | ||||||
|  |     { | ||||||
|  |         {securityScheme, new string[] { }}, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityRequirement(securityRequirements); | ||||||
| }); | }); | ||||||
|  |  | ||||||
| builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>(); | builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>(); | ||||||
| @ -43,6 +94,7 @@ if (app.Environment.IsDevelopment()) | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
|  |  | ||||||
| app.MapControllers(); | app.MapControllers(); | ||||||
|  | |||||||
| @ -77,7 +77,8 @@ namespace DamageAssesment.Api.Employees.Providers | |||||||
|                     EmployeeDbContext.Employees.Add(_employee); |                     EmployeeDbContext.Employees.Add(_employee); | ||||||
|                     Employee.Id = _employee.Id; |                     Employee.Id = _employee.Id; | ||||||
|                     EmployeeDbContext.SaveChanges(); |                     EmployeeDbContext.SaveChanges(); | ||||||
|                     return (true, Employee, null); |                     //return (true, Employee, null); | ||||||
|  |                     return (true, mapper.Map<Db.Employee, Models.Employee>(_employee), null); | ||||||
|                 } |                 } | ||||||
|                 return (false, null, "Employee code is already exits"); |                 return (false, null, "Employee code is already exits"); | ||||||
|             } |             } | ||||||
|  | |||||||
| @ -8,10 +8,5 @@ | |||||||
|       "Microsoft.AspNetCore": "Warning" |       "Microsoft.AspNetCore": "Warning" | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "AllowedHosts": "*", |   "AllowedHosts": "*" | ||||||
|   "settings": { |  | ||||||
|     "endpoint1": "xxx", |  | ||||||
|     "endpoint2": "xxx", |  | ||||||
|     "endpoint3": "xxx" |  | ||||||
|   } |  | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,4 +1,5 @@ | |||||||
| using DamageAssesment.Api.Locations.Interfaces; | using DamageAssesment.Api.Locations.Interfaces; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Http; | using Microsoft.AspNetCore.Http; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
|  |  | ||||||
| @ -15,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all locations. |         /// Get all locations. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("locations")] |         [HttpGet("locations")] | ||||||
|         public async Task<ActionResult> GetLocationsAsync() |         public async Task<ActionResult> GetLocationsAsync() | ||||||
|         { |         { | ||||||
| @ -31,7 +32,7 @@ namespace DamageAssesment.Api.Locations.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all locations based on locationdId. |         /// Get all locations based on locationdId. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("locations/{id}")] |         [HttpGet("locations/{id}")] | ||||||
|         public async Task<ActionResult> GetLocationByIdAsync(int id) |         public async Task<ActionResult> GetLocationByIdAsync(int id) | ||||||
|         { |         { | ||||||
| @ -47,7 +48,7 @@ namespace DamageAssesment.Api.Locations.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Update a Location. |         /// Update a Location. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPut("locations/{id}")] |         [HttpPut("locations/{id}")] | ||||||
|         public async Task<IActionResult> UpdateLocation(int id, Models.Location Location) |         public async Task<IActionResult> UpdateLocation(int id, Models.Location Location) | ||||||
|         { |         { | ||||||
| @ -65,7 +66,7 @@ namespace DamageAssesment.Api.Locations.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Save a new location. |         /// Save a new location. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPost("locations")] |         [HttpPost("locations")] | ||||||
|         public async Task<IActionResult> CreateLocation(Models.Location Location) |         public async Task<IActionResult> CreateLocation(Models.Location Location) | ||||||
|         { |         { | ||||||
| @ -83,7 +84,7 @@ namespace DamageAssesment.Api.Locations.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Delete an existing location. |         /// Delete an existing location. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpDelete("locations/{id}")] |         [HttpDelete("locations/{id}")] | ||||||
|         public async Task<IActionResult> DeleteLocation(int id) |         public async Task<IActionResult> DeleteLocation(int id) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -1,4 +1,5 @@ | |||||||
| using DamageAssesment.Api.Locations.Interfaces; | using DamageAssesment.Api.Locations.Interfaces; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Locations.Controllers | namespace DamageAssesment.Api.Locations.Controllers | ||||||
| @ -15,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all regions.2 |         /// Get all regions.2 | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("regions")] |         [HttpGet("regions")] | ||||||
|         public async Task<ActionResult> GetRegionsAsync() |         public async Task<ActionResult> GetRegionsAsync() | ||||||
|         { |         { | ||||||
| @ -29,7 +30,7 @@ namespace DamageAssesment.Api.Locations.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// GET request for retrieving a region by its ID. |         /// GET request for retrieving a region by its ID. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet("regions/{id}")] |         [HttpGet("regions/{id}")] | ||||||
|         public async Task<ActionResult> GetRegionAsync(int id) |         public async Task<ActionResult> GetRegionAsync(int id) | ||||||
|         { |         { | ||||||
| @ -43,7 +44,7 @@ namespace DamageAssesment.Api.Locations.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// POST request for creating a new region. |         /// POST request for creating a new region. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPost("regions")] |         [HttpPost("regions")] | ||||||
|         public async Task<ActionResult> PostRegionAsync(Models.Region region) |         public async Task<ActionResult> PostRegionAsync(Models.Region region) | ||||||
|         { |         { | ||||||
| @ -57,7 +58,7 @@ namespace DamageAssesment.Api.Locations.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// PUT request for updating an existing region. |         /// PUT request for updating an existing region. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPut("regions/{id}")] |         [HttpPut("regions/{id}")] | ||||||
|         public async Task<ActionResult> PutRegionAsync(int id, Models.Region region) |         public async Task<ActionResult> PutRegionAsync(int id, Models.Region region) | ||||||
|         { |         { | ||||||
| @ -75,7 +76,7 @@ namespace DamageAssesment.Api.Locations.Controllers | |||||||
|         /// DELETE request for deleting a region based on ID. |         /// DELETE request for deleting a region based on ID. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |  | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpDelete("regions/{id}")] |         [HttpDelete("regions/{id}")] | ||||||
|         public async Task<ActionResult> DeleteRegionAsync(int id) |         public async Task<ActionResult> DeleteRegionAsync(int id) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -1,23 +1,73 @@ | |||||||
| using DamageAssesment.Api.Locations.Db; | using DamageAssesment.Api.Locations.Db; | ||||||
| using DamageAssesment.Api.Locations.Interfaces; | using DamageAssesment.Api.Locations.Interfaces; | ||||||
| using DamageAssesment.Api.Locations.Providers; | using DamageAssesment.Api.Locations.Providers; | ||||||
|  | using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | using Microsoft.IdentityModel.Tokens; | ||||||
|  | using Microsoft.OpenApi.Models; | ||||||
| using System.Reflection; | using System.Reflection; | ||||||
|  | using System.Text; | ||||||
|  |  | ||||||
| var builder = WebApplication.CreateBuilder(args); | var builder = WebApplication.CreateBuilder(args); | ||||||
|  |  | ||||||
| // Add services to the container. | // 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.AddControllers(); | ||||||
| // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | ||||||
| builder.Services.AddEndpointsApiExplorer(); | builder.Services.AddEndpointsApiExplorer(); | ||||||
| //builder.Services.AddSwaggerGen(); | //builder.Services.AddSwaggerGen(); | ||||||
| builder.Services.AddSwaggerGen(c => | builder.Services.AddSwaggerGen(options => | ||||||
| { | { | ||||||
|     // Include XML comments from your assembly |     // Include XML comments from your assembly | ||||||
|     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; |     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; | ||||||
|     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); |     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); | ||||||
|     c.IncludeXmlComments(xmlPath); |     options.IncludeXmlComments(xmlPath); | ||||||
|  |  | ||||||
|  |     OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Name = "Bearer", | ||||||
|  |         BearerFormat = "JWT", | ||||||
|  |         Scheme = "bearer", | ||||||
|  |         Description = "Specify the authorization token.", | ||||||
|  |         In = ParameterLocation.Header, | ||||||
|  |         Type = SecuritySchemeType.Http, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityDefinition("jwt_auth", securityDefinition); | ||||||
|  |  | ||||||
|  |     // Make sure swagger UI requires a Bearer token specified | ||||||
|  |     OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Reference = new OpenApiReference() | ||||||
|  |         { | ||||||
|  |             Id = "jwt_auth", | ||||||
|  |             Type = ReferenceType.SecurityScheme | ||||||
|  |         } | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement() | ||||||
|  |     { | ||||||
|  |         {securityScheme, new string[] { }}, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityRequirement(securityRequirements); | ||||||
| }); | }); | ||||||
| builder.Services.AddScoped<ILocationsProvider, LocationsProvider>(); | builder.Services.AddScoped<ILocationsProvider, LocationsProvider>(); | ||||||
| builder.Services.AddScoped<IRegionsProvider, RegionsProvider>(); | builder.Services.AddScoped<IRegionsProvider, RegionsProvider>(); | ||||||
| @ -26,7 +76,10 @@ builder.Services.AddDbContext<LocationDbContext>(option => | |||||||
| { | { | ||||||
|     option.UseInMemoryDatabase("Locations"); |     option.UseInMemoryDatabase("Locations"); | ||||||
| }); | }); | ||||||
|  |  | ||||||
|  |  | ||||||
| var app = builder.Build(); | var app = builder.Build(); | ||||||
|  | // Add services to the container. | ||||||
|  |  | ||||||
| // Configure the HTTP request pipeline. | // Configure the HTTP request pipeline. | ||||||
| if (app.Environment.IsDevelopment()) | if (app.Environment.IsDevelopment()) | ||||||
| @ -44,6 +97,7 @@ if (app.Environment.IsDevelopment()) | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
|  |  | ||||||
| app.MapControllers(); | app.MapControllers(); | ||||||
|  | |||||||
| @ -1,4 +1,6 @@ | |||||||
| using DamageAssesment.Api.Questions.Interfaces; | using DamageAssesment.Api.Questions.Interfaces; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
|  | using DamageAssesment.Api.Questions.Models; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Questions.Controllers | namespace DamageAssesment.Api.Questions.Controllers | ||||||
| @ -10,16 +12,13 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|  |  | ||||||
|         public QuestionsController(IQuestionsProvider questionsProvider) |         public QuestionsController(IQuestionsProvider questionsProvider) | ||||||
|         { |         { | ||||||
|  |  | ||||||
|             this.questionsProvider = questionsProvider; |             this.questionsProvider = questionsProvider; | ||||||
|  |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// GET request for retrieving questions. |         /// GET request for retrieving questions. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |  | ||||||
|         //get all questions |         //get all questions | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("questions")] |         [Route("questions")] | ||||||
|         [Route("questions/{language:alpha}")] |         [Route("questions/{language:alpha}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -37,6 +36,7 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// GET request for retrieving a question by ID. |         /// GET request for retrieving a question by ID. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("questions/{id}/{language:alpha}")] |         [Route("questions/{id}/{language:alpha}")] | ||||||
|         [Route("questions/{id:int}")] |         [Route("questions/{id:int}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -55,6 +55,7 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|         /// GET request for retrieving survey questions based on a survey ID. |         /// GET request for retrieving survey questions based on a survey ID. | ||||||
|         /// Uri: {Optional language}/GetSurveyQuestions/{surveyId} :Default returns question in all languages  |         /// Uri: {Optional language}/GetSurveyQuestions/{surveyId} :Default returns question in all languages  | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("questions/bysurvey/{surveyId:int}")] |         [Route("questions/bysurvey/{surveyId:int}")] | ||||||
|         [Route("questions/bysurvey/{surveyId:int}/{language:alpha}")] |         [Route("questions/bysurvey/{surveyId:int}/{language:alpha}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -71,6 +72,7 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|         /// PUT request for updating a question (multilingual). |         /// PUT request for updating a question (multilingual). | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |  | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPut("questions")] |         [HttpPut("questions")] | ||||||
|         public async Task<IActionResult> UpdateQuestion(Models.Question question) |         public async Task<IActionResult> UpdateQuestion(Models.Question question) | ||||||
|         { |         { | ||||||
| @ -89,9 +91,51 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question); |             return CreatedAtRoute("DefaultApi", new { id = question.Id }, question); | ||||||
|         } |         } | ||||||
|         /// <summary> |         /// <summary> | ||||||
|  |         /// POST request for creating a multiple question (multilingual). | ||||||
|  |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|  |         [HttpPost("questions/multiple")] | ||||||
|  |         public async Task<IActionResult> CreateQuestions(List<Models.Question> questions) | ||||||
|  |         { | ||||||
|  |             if (questions != null) | ||||||
|  |             { | ||||||
|  |                 var result = await this.questionsProvider.PostQuestionsAsync(questions); | ||||||
|  |                 if (result.IsSuccess) | ||||||
|  |                 { | ||||||
|  |                     return Ok(result.Question); | ||||||
|  |                 } | ||||||
|  |                 if (result.ErrorMessage == "Not Found") | ||||||
|  |                     return NotFound(result.ErrorMessage); | ||||||
|  |  | ||||||
|  |                 return BadRequest(result.ErrorMessage); | ||||||
|  |             } | ||||||
|  |             return CreatedAtRoute("DefaultApi",questions); | ||||||
|  |         } | ||||||
|  |         /// <summary> | ||||||
|  |         /// PUT request for update a multiple question (multilingual) for survey. | ||||||
|  |         /// </summary> | ||||||
|  |         [HttpPut("questions/multiple/{surveyid}")] | ||||||
|  |         public async Task<IActionResult> CreateQuestions(int surveyid, List<Models.Question> questions) | ||||||
|  |         { | ||||||
|  |             if (questions != null) | ||||||
|  |             { | ||||||
|  |                 var result = await this.questionsProvider.PutQuestionsAsync(surveyid,questions); | ||||||
|  |                 if (result.IsSuccess) | ||||||
|  |                 { | ||||||
|  |                     return Ok(result.Question); | ||||||
|  |                 } | ||||||
|  |                 if (result.ErrorMessage == "Not Found") | ||||||
|  |                     return NotFound(result.ErrorMessage); | ||||||
|  |  | ||||||
|  |                 return BadRequest(result.ErrorMessage); | ||||||
|  |             } | ||||||
|  |             return CreatedAtRoute("DefaultApi", questions); | ||||||
|  |         } | ||||||
|  |         /// <summary> | ||||||
|         /// POST request for creating a new question (multilingual). |         /// POST request for creating a new question (multilingual). | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |  | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPost("questions")] |         [HttpPost("questions")] | ||||||
|         public async Task<IActionResult> CreateQuestion(Models.Question question) |         public async Task<IActionResult> CreateQuestion(Models.Question question) | ||||||
|         { |         { | ||||||
| @ -110,6 +154,7 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|         /// DELETE request for deleting a question based on ID. |         /// DELETE request for deleting a question based on ID. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |  | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpDelete("questions/{id}")] |         [HttpDelete("questions/{id}")] | ||||||
|         public async Task<IActionResult> DeleteQuestion(int id) |         public async Task<IActionResult> DeleteQuestion(int id) | ||||||
|         { |         { | ||||||
| @ -125,6 +170,7 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|         /// GET request for retrieving question categories. |         /// GET request for retrieving question categories. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |  | ||||||
|  |         [Authorize(Roles = "admin,user,report")] | ||||||
|         [HttpGet("questions/categories")] |         [HttpGet("questions/categories")] | ||||||
|         [HttpGet("questions/categories/{language:alpha}")] |         [HttpGet("questions/categories/{language:alpha}")] | ||||||
|         public async Task<IActionResult> GetQuestionCategoriesAsync(string? language) |         public async Task<IActionResult> GetQuestionCategoriesAsync(string? language) | ||||||
| @ -139,7 +185,7 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// GET request for retrieving a question category by ID. |         /// GET request for retrieving a question category by ID. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,report")] | ||||||
|         [HttpGet("questions/categories/{id:int}")] |         [HttpGet("questions/categories/{id:int}")] | ||||||
|         [HttpGet("questions/categories/{id:int}/{language:alpha}")] |         [HttpGet("questions/categories/{id:int}/{language:alpha}")] | ||||||
|         public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language) |         public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language) | ||||||
| @ -156,7 +202,7 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// PUT request for updating a question category. |         /// PUT request for updating a question category. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,survey,report")] | ||||||
|         [HttpPut("questions/categories")] |         [HttpPut("questions/categories")] | ||||||
|         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory) |         public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory) | ||||||
|         { |         { | ||||||
| @ -178,6 +224,7 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|         /// POST request for creating a new question category. |         /// POST request for creating a new question category. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |  | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpPost("questions/categories")] |         [HttpPost("questions/categories")] | ||||||
|         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory) |         public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory) | ||||||
|         { |         { | ||||||
| @ -196,6 +243,7 @@ namespace DamageAssesment.Api.Questions.Controllers | |||||||
|         /// DELETE request for deleting a question category based on ID. |         /// DELETE request for deleting a question category based on ID. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |  | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpDelete("questions/categories/{id}")] |         [HttpDelete("questions/categories/{id}")] | ||||||
|         public async Task<IActionResult> DeleteQuestionCategory(int id) |         public async Task<IActionResult> DeleteQuestionCategory(int id) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -8,6 +8,8 @@ namespace DamageAssesment.Api.Questions.Interfaces | |||||||
|         Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language); |         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.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question); |         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question); | ||||||
|  |         Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions); | ||||||
|  |         Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId,List<Models.Question> Questions); | ||||||
|         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question); |         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question); | ||||||
|         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id); |         Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id); | ||||||
|  |  | ||||||
|  | |||||||
| @ -12,7 +12,7 @@ | |||||||
|         public bool IsRequired { get; set; } |         public bool IsRequired { get; set; } | ||||||
|         public bool Comment { get; set; } |         public bool Comment { get; set; } | ||||||
|         public bool Key { get; set; } |         public bool Key { get; set; } | ||||||
|         public int? SurveyId { get; set; } |         public int SurveyId { get; set; } | ||||||
|         public int CategoryId { get; set; } |         public int CategoryId { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,11 +1,33 @@ | |||||||
| using DamageAssesment.Api.Questions.Db; | using DamageAssesment.Api.Questions.Db; | ||||||
| using DamageAssesment.Api.Questions.Interfaces; | using DamageAssesment.Api.Questions.Interfaces; | ||||||
| using DamageAssesment.Api.Questions.Providers; | using DamageAssesment.Api.Questions.Providers; | ||||||
|  | using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | using Microsoft.IdentityModel.Tokens; | ||||||
|  | using Microsoft.OpenApi.Models; | ||||||
| using System.Reflection; | using System.Reflection; | ||||||
|  | using System.Text; | ||||||
|  |  | ||||||
| var builder = WebApplication.CreateBuilder(args); | 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. | // Add services to the container. | ||||||
|  |  | ||||||
| builder.Services.AddControllers(); | builder.Services.AddControllers(); | ||||||
| @ -17,13 +39,41 @@ builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); | |||||||
|  |  | ||||||
| builder.Services.AddEndpointsApiExplorer(); | builder.Services.AddEndpointsApiExplorer(); | ||||||
| //builder.Services.AddSwaggerGen(); | //builder.Services.AddSwaggerGen(); | ||||||
| builder.Services.AddSwaggerGen(c => | builder.Services.AddSwaggerGen(options => | ||||||
| { | { | ||||||
|     // Include XML comments from your assembly |     // Include XML comments from your assembly | ||||||
|     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; |     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; | ||||||
|     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); |     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); | ||||||
|     c.IncludeXmlComments(xmlPath); |     options.IncludeXmlComments(xmlPath); | ||||||
|  |  | ||||||
|  |     OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Name = "Bearer", | ||||||
|  |         BearerFormat = "JWT", | ||||||
|  |         Scheme = "bearer", | ||||||
|  |         Description = "Specify the authorization token.", | ||||||
|  |         In = ParameterLocation.Header, | ||||||
|  |         Type = SecuritySchemeType.Http, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityDefinition("jwt_auth", securityDefinition); | ||||||
|  |  | ||||||
|  |     // Make sure swagger UI requires a Bearer token specified | ||||||
|  |     OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Reference = new OpenApiReference() | ||||||
|  |         { | ||||||
|  |             Id = "jwt_auth", | ||||||
|  |             Type = ReferenceType.SecurityScheme | ||||||
|  |         } | ||||||
|  |     }; | ||||||
|  |     OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement() | ||||||
|  |     { | ||||||
|  |         {securityScheme, new string[] { }}, | ||||||
|  |     }; | ||||||
|  |     options.AddSecurityRequirement(securityRequirements); | ||||||
| }); | }); | ||||||
|  |  | ||||||
| builder.Services.AddDbContext<QuestionDbContext>(option => | builder.Services.AddDbContext<QuestionDbContext>(option => | ||||||
| { | { | ||||||
|     option.UseInMemoryDatabase("Questions"); |     option.UseInMemoryDatabase("Questions"); | ||||||
| @ -43,7 +93,7 @@ if (app.Environment.IsDevelopment()) | |||||||
|         questionProvider.SeedData(); |         questionProvider.SeedData(); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
|  |  | ||||||
| app.MapControllers(); | app.MapControllers(); | ||||||
|  | |||||||
| @ -31,8 +31,7 @@ namespace DamageAssesment.Api.Questions.Providers | |||||||
|                 questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" }); |                 questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" }); | ||||||
|                 questionDbContext.SaveChanges(); |                 questionDbContext.SaveChanges(); | ||||||
|             } |             } | ||||||
|  |             if (!questionDbContext.QuestionsTranslations.Any()) | ||||||
|             if (!questionDbContext.QuestionCategories.Any()) |  | ||||||
|             { |             { | ||||||
|                 questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" }); |                 questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" }); | ||||||
|                 questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" }); |                 questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" }); | ||||||
| @ -335,17 +334,71 @@ namespace DamageAssesment.Api.Questions.Providers | |||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 logger?.LogInformation("Query Question"); |                 logger?.LogInformation("Query Question"); | ||||||
|  |                 var result = InsertQuestion(Question); | ||||||
|  |                 return (true, result, null); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         private Models.MultiLanguage InsertQuestion(Models.Question Question) | ||||||
|  |         { | ||||||
|             var dbquestion = mapper.Map<Models.Question, Db.Question>(Question); |             var dbquestion = mapper.Map<Models.Question, Db.Question>(Question); | ||||||
|             var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions); |             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); |             questionDbContext.Questions.Add(dbquestion); | ||||||
|  |             questionDbContext.SaveChanges(); | ||||||
|             dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id); |             dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id); | ||||||
|             questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation); |             questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation); | ||||||
|             questionDbContext.SaveChanges(); |             questionDbContext.SaveChanges(); | ||||||
|             Question.Id = dbquestion.Id; |             Question.Id = dbquestion.Id; | ||||||
|             var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion); |             var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion); | ||||||
|             result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, "")); |             result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, "")); | ||||||
|                 return (true, result, null); |             return result; | ||||||
|  |         } | ||||||
|  |         public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 List<Models.MultiLanguage> results = new List<MultiLanguage>(); | ||||||
|  |                 logger?.LogInformation("Query Question"); | ||||||
|  |                 foreach (Models.Question Question in Questions) | ||||||
|  |                 { | ||||||
|  |                     results.Add(InsertQuestion(Question)); | ||||||
|  |                 } | ||||||
|  |                 return (true, results, null); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |        | ||||||
|  |         public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId, List<Models.Question> Questions) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 var questions=await questionDbContext.Questions.AsNoTracking().Where(a=>a.SurveyId == surveyId).ToListAsync(); | ||||||
|  |                 if (questions != null) | ||||||
|  |                 { | ||||||
|  |                     List<int> questionids=questions.Select(a=>a.Id).ToList(); | ||||||
|  |                     var questiontrans = await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x => questionids.Contains(x.QuestionId)).ToListAsync(); | ||||||
|  |                     if (questiontrans != null) | ||||||
|  |                         questionDbContext.QuestionsTranslations.RemoveRange(questiontrans); | ||||||
|  |                     questionDbContext.Questions.RemoveRange(questions); | ||||||
|  |                     questionDbContext.SaveChanges(); | ||||||
|  |                 } | ||||||
|  |                 List<Models.MultiLanguage> results = new List<MultiLanguage>(); | ||||||
|  |                 logger?.LogInformation("Query Question"); | ||||||
|  |                 foreach (Models.Question Question in Questions) | ||||||
|  |                 { | ||||||
|  |                     Question.SurveyId = surveyId; | ||||||
|  |                     results.Add(InsertQuestion(Question)); | ||||||
|  |                 } | ||||||
|  |                 return (true, results, null); | ||||||
|             } |             } | ||||||
|             catch (Exception ex) |             catch (Exception ex) | ||||||
|             { |             { | ||||||
| @ -386,8 +439,11 @@ namespace DamageAssesment.Api.Questions.Providers | |||||||
|  |  | ||||||
|                 if (question != null) |                 if (question != null) | ||||||
|                 { |                 { | ||||||
|  |                     var questiontrans=await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x=>x.QuestionId== id).ToListAsync(); | ||||||
|                     var result = mapper.Map<Db.Question, Models.MultiLanguage>(question); |                     var result = mapper.Map<Db.Question, Models.MultiLanguage>(question); | ||||||
|                     result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, "")); |                     result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, "")); | ||||||
|  |                     if(questiontrans!=null) | ||||||
|  |                         questionDbContext.QuestionsTranslations.RemoveRange(questiontrans); | ||||||
|                     questionDbContext.Questions.Remove(question); |                     questionDbContext.Questions.Remove(question); | ||||||
|                     questionDbContext.SaveChanges(); |                     questionDbContext.SaveChanges(); | ||||||
|                     return (true, result, $"QuestionID {id} deleted Successfuly"); |                     return (true, result, $"QuestionID {id} deleted Successfuly"); | ||||||
|  | |||||||
| @ -75,8 +75,19 @@ namespace DamageAssesment.Api.Questions.Test | |||||||
|             return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1}; |             return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1}; | ||||||
|  |  | ||||||
|         } |         } | ||||||
|  |         public static async Task<List<Questions.Models.Question>> getInputQuestionsData() | ||||||
|     |         { | ||||||
|  |             Models.QuestionsTranslation QuestionsTranslation = new Models.QuestionsTranslation() | ||||||
|  |             { | ||||||
|  |                 Language = "en", | ||||||
|  |                 QuestionText = "Sample question" | ||||||
|  |             }; | ||||||
|  |             List<Models.QuestionsTranslation> QuestionsTranslations = new List<Models.QuestionsTranslation>(); | ||||||
|  |             List<Models.Question> Questions = new List<Models.Question>(); | ||||||
|  |             QuestionsTranslations.Add(QuestionsTranslation); | ||||||
|  |             Questions.Models.Question question = new Questions.Models.Question() { Id = 1, Questions = QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; | ||||||
|  |               Questions.Add(question); | ||||||
|  |             return Questions; | ||||||
|  |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -110,6 +110,33 @@ namespace DamageAssesment.Api.Questions.Test | |||||||
|  |  | ||||||
|             Assert.Equal(400, result.StatusCode); |             Assert.Equal(400, result.StatusCode); | ||||||
|         } |         } | ||||||
|  |         [Fact(DisplayName = "Post Questions - Ok case")] | ||||||
|  |         public async Task PostQuestionsAsync_ShouldReturnStatusCode200() | ||||||
|  |         { | ||||||
|  |             var mockQuestionService = new Mock<IQuestionsProvider>(); | ||||||
|  |             var mockResponse = await MockData.getOkResponse(); | ||||||
|  |             var mockInputQuestion = await MockData.getInputQuestionsData(); | ||||||
|  |             mockQuestionService.Setup(service => service.PostQuestionsAsync(mockInputQuestion)).ReturnsAsync(mockResponse); | ||||||
|  |  | ||||||
|  |             var QuestionProvider = new QuestionsController(mockQuestionService.Object); | ||||||
|  |             var result = (OkObjectResult)await QuestionProvider.CreateQuestions(mockInputQuestion); | ||||||
|  |  | ||||||
|  |             Assert.Equal(200, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "Post Questions - BadRequest case")] | ||||||
|  |         public async Task PostQuestionsAsync_ShouldReturnStatusCode400() | ||||||
|  |         { | ||||||
|  |             var mockQuestionService = new Mock<IQuestionsProvider>(); | ||||||
|  |             var mockInputQuestion = await MockData.getInputQuestionData(); | ||||||
|  |             var mockResponse = await MockData.getBadRequestResponse(); | ||||||
|  |             mockQuestionService.Setup(service => service.UpdateQuestionAsync(mockInputQuestion)).ReturnsAsync(mockResponse); | ||||||
|  |  | ||||||
|  |             var QuestionProvider = new QuestionsController(mockQuestionService.Object); | ||||||
|  |             var result = (BadRequestObjectResult)await QuestionProvider.UpdateQuestion(mockInputQuestion); | ||||||
|  |  | ||||||
|  |             Assert.Equal(400, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|         [Fact(DisplayName = "Put Question - Ok case")] |         [Fact(DisplayName = "Put Question - Ok case")] | ||||||
|         public async Task PutQuestionAsync_ShouldReturnStatusCode200() |         public async Task PutQuestionAsync_ShouldReturnStatusCode200() | ||||||
|  | |||||||
| @ -25,17 +25,16 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getOkResponse(mockRequestObject); |             var mockResponse = await MockData.getOkResponse(mockRequestObject); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1); |             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1); | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         [Fact(DisplayName = "Get Responses - BadRequest case")] |         [Fact(DisplayName = "Get Responses - BadRequest case")] | ||||||
|         public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode204() |         public async Task GetSurveyResponsesAsync_ShouldReturnStatusCode204() | ||||||
|         { |         { | ||||||
|             var mockResponse = await MockData.getResponse(); |             var mockResponse = await MockData.getResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1); |             var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1); | ||||||
|             Assert.Equal(400, result.StatusCode); |             Assert.Equal(400, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -46,7 +45,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getOkResponse(); |             var mockResponse = await MockData.getOkResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1); |             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1); | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -56,7 +55,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|         { |         { | ||||||
|             var mockResponse = await MockData.getResponse(); |             var mockResponse = await MockData.getResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1); |             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1); | ||||||
|             Assert.Equal(204, result.StatusCode); |             Assert.Equal(204, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -70,7 +69,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getOkResponse(); |             var mockResponse = await MockData.getOkResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1); |             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1); | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -80,7 +79,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|         { |         { | ||||||
|             var mockResponse = await MockData.getResponse(); |             var mockResponse = await MockData.getResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1); |             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1); | ||||||
|             Assert.Equal(204, result.StatusCode); |             Assert.Equal(204, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -91,7 +90,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getOkResponse(); |             var mockResponse = await MockData.getOkResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1); |             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1); | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -101,7 +100,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|         { |         { | ||||||
|             var mockResponse = await MockData.getResponse(); |             var mockResponse = await MockData.getResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1); |             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1); | ||||||
|             Assert.Equal(204, result.StatusCode); |             Assert.Equal(204, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -113,7 +112,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getOkResponse(); |             var mockResponse = await MockData.getOkResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1); |             var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1); | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -123,7 +122,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|         { |         { | ||||||
|             var mockResponse = await MockData.getResponse(); |             var mockResponse = await MockData.getResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1); |             var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1); | ||||||
|             Assert.Equal(204, result.StatusCode); |             Assert.Equal(204, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -134,7 +133,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getOkResponse(); |             var mockResponse = await MockData.getOkResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1); |             var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1); | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -144,7 +143,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|         { |         { | ||||||
|             var mockResponse = await MockData.getResponse(); |             var mockResponse = await MockData.getResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1); |             var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1); | ||||||
|             Assert.Equal(204, result.StatusCode); |             Assert.Equal(204, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -155,7 +154,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getOkResponse(); |             var mockResponse = await MockData.getOkResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1); |             var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1); | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -165,7 +164,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|         { |         { | ||||||
|             var mockResponse = await MockData.getResponse(); |             var mockResponse = await MockData.getResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseProvider = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1); |             var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1); | ||||||
|             Assert.Equal(204, result.StatusCode); |             Assert.Equal(204, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -177,7 +176,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getOkResponse(mockRequestObject); |             var mockResponse = await MockData.getOkResponse(mockRequestObject); | ||||||
|             mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (OkObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject); |             var result = (OkObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject); | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -188,7 +187,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getResponse(); |             var mockResponse = await MockData.getResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (BadRequestObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject); |             var result = (BadRequestObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject); | ||||||
|             Assert.Equal(400, result.StatusCode); |             Assert.Equal(400, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -199,7 +198,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getOkResponse(mockRequestObject); |             var mockResponse = await MockData.getOkResponse(mockRequestObject); | ||||||
|             mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (OkObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject); |             var result = (OkObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject); | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -210,7 +209,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getResponse(); |             var mockResponse = await MockData.getResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse); ; |             mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse); ; | ||||||
|             var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (BadRequestObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject); |             var result = (BadRequestObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject); | ||||||
|             Assert.Equal(400, result.StatusCode); |             Assert.Equal(400, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -221,7 +220,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); |             SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject(); | ||||||
|             var mockResponse = await MockData.getOkResponse(mockRequestObject); |             var mockResponse = await MockData.getOkResponse(mockRequestObject); | ||||||
|             mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse); |             mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse); | ||||||
|             var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (OkObjectResult)await surveyResponseController.DeleteSurveyResponseAsync(1); |             var result = (OkObjectResult)await surveyResponseController.DeleteSurveyResponseAsync(1); | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -231,7 +230,7 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|         { |         { | ||||||
|             var mockResponse = await MockData.getResponse(); |             var mockResponse = await MockData.getResponse(); | ||||||
|             mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse); ; |             mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse); ; | ||||||
|             var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); |             var surveyResponseController = new ResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object); | ||||||
|             var result = (NotFoundResult)await surveyResponseController.DeleteSurveyResponseAsync(1); |             var result = (NotFoundResult)await surveyResponseController.DeleteSurveyResponseAsync(1); | ||||||
|             Assert.Equal(404, result.StatusCode); |             Assert.Equal(404, result.StatusCode); | ||||||
|         } |         } | ||||||
|  | |||||||
| @ -1,16 +1,17 @@ | |||||||
| using DamageAssesment.Api.Responses.Interfaces; | using DamageAssesment.Api.Responses.Interfaces; | ||||||
| using DamageAssesment.Api.Responses.Models; | using DamageAssesment.Api.Responses.Models; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
| 
 | 
 | ||||||
| namespace DamageAssesment.Api.Responses.Controllers | namespace DamageAssesment.Api.Responses.Controllers | ||||||
| { | { | ||||||
|     [ApiController] |     [ApiController] | ||||||
|     public class SurveyResponsesController : ControllerBase |     public class ResponsesController : ControllerBase | ||||||
|     { |     { | ||||||
|         private readonly ISurveysResponse surveyResponseProvider; |         private readonly ISurveysResponse surveyResponseProvider; | ||||||
|         private readonly IExcelExportService excelExportService; |         private readonly IExcelExportService excelExportService; | ||||||
| 
 | 
 | ||||||
|         public SurveyResponsesController(ISurveysResponse surveyResponseProvider, IExcelExportService excelExportService) |         public ResponsesController(ISurveysResponse surveyResponseProvider, IExcelExportService excelExportService) | ||||||
|         { |         { | ||||||
|             this.surveyResponseProvider = surveyResponseProvider; |             this.surveyResponseProvider = surveyResponseProvider; | ||||||
|             this.excelExportService = excelExportService; |             this.excelExportService = excelExportService; | ||||||
| @ -19,6 +20,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// GET request for retrieving survey responses. |         /// GET request for retrieving survey responses. | ||||||
|         /// </summary> |         /// </summary> | ||||||
| 
 | 
 | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("responses/{employeeid:int}")] |         [Route("responses/{employeeid:int}")] | ||||||
|         [Route("responses")] |         [Route("responses")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -38,6 +40,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// GET request for retrieving survey responses by survey ID. |         /// GET request for retrieving survey responses by survey ID. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("responses/bysurvey/{surveyid:int}/{employeeid:int}")] |         [Route("responses/bysurvey/{surveyid:int}/{employeeid:int}")] | ||||||
|         [Route("responses/bysurvey/{surveyid:int}")] |         [Route("responses/bysurvey/{surveyid:int}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -56,6 +59,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// <param name="surveyid">The ID of the survey for which responses are to be retrieved.</param> |         /// <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> |         /// <param name="locationid">The ID of the location for which responses are to be retrieved.</param> | ||||||
| 
 | 
 | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("responses/{surveyid:int}/{locationid:int}/{employeeid:int}")] |         [Route("responses/{surveyid:int}/{locationid:int}/{employeeid:int}")] | ||||||
|         [Route("responses/{surveyid:int}/{locationid:int}")] |         [Route("responses/{surveyid:int}/{locationid:int}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -75,6 +79,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// <param name="questionId">The ID of the question 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> |         /// <param name="answer">The answer for which responses are to be retrieved.</param> | ||||||
| 
 | 
 | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}/{employeeid:int}")] |         [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}/{employeeid:int}")] | ||||||
|         [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}")] |         [Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -93,6 +98,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// </summary> |         /// </summary> | ||||||
|         /// <param name="surveyId">The ID of the survey for which answers are to be retrieved.</param> |         /// <param name="surveyId">The ID of the survey for which answers are to be retrieved.</param> | ||||||
| 
 | 
 | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("responses/byregion/{surveyid:int}")] |         [Route("responses/byregion/{surveyid:int}")] | ||||||
|         [Route("responses/byregion/{surveyid:int}/{employeeid}")] |         [Route("responses/byregion/{surveyid:int}/{employeeid}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -109,6 +115,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// GET request for retrieving survey responses by survey ID and maintenance center. |         /// GET request for retrieving survey responses by survey ID and maintenance center. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|         /// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param> |         /// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param> | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("responses/bymaintenancecenter/{surveyid:int}/{employeeid:int}")] |         [Route("responses/bymaintenancecenter/{surveyid:int}/{employeeid:int}")] | ||||||
|         [Route("responses/bymaintenancecenter/{surveyid:int}")] |         [Route("responses/bymaintenancecenter/{surveyid:int}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -126,6 +133,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// </summary> |         /// </summary> | ||||||
|         /// <param name="responseId">The ID of the survey response to be retrieved.</param> |         /// <param name="responseId">The ID of the survey response to be retrieved.</param> | ||||||
| 
 | 
 | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [HttpGet("responses/{id}")] |         [HttpGet("responses/{id}")] | ||||||
|         public async Task<ActionResult> GetSurveyResponseByIdAsync(int id) |         public async Task<ActionResult> GetSurveyResponseByIdAsync(int id) | ||||||
|         { |         { | ||||||
| @ -142,6 +150,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// </summary> |         /// </summary> | ||||||
|         /// <param name="surveyResponse">The survey response object to be created.</param> |         /// <param name="surveyResponse">The survey response object to be created.</param> | ||||||
| 
 | 
 | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [HttpPost("responses")] |         [HttpPost("responses")] | ||||||
|         public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse) |         public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse) | ||||||
|         { |         { | ||||||
| @ -158,6 +167,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// <param name="Id">The ID of the survey response to be updated.</param> |         /// <param name="Id">The ID of the survey response to be updated.</param> | ||||||
|         /// <param name="surveyResponse">The updated survey response object.</param> |         /// <param name="surveyResponse">The updated survey response object.</param> | ||||||
| 
 | 
 | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [HttpPut("responses/{id}")] |         [HttpPut("responses/{id}")] | ||||||
|         public async Task<ActionResult> PutSurveyResponseAsync(int id, Models.SurveyResponse surveyResponse) |         public async Task<ActionResult> PutSurveyResponseAsync(int id, Models.SurveyResponse surveyResponse) | ||||||
|         { |         { | ||||||
| @ -175,6 +185,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// DELETE request for deleting an existing survey response. |         /// DELETE request for deleting an existing survey response. | ||||||
|         /// </summary> |         /// </summary> | ||||||
| 
 | 
 | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [HttpDelete("responses/{id}")] |         [HttpDelete("responses/{id}")] | ||||||
|         public async Task<ActionResult> DeleteSurveyResponseAsync(int id) |         public async Task<ActionResult> DeleteSurveyResponseAsync(int id) | ||||||
|         { |         { | ||||||
| @ -190,6 +201,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// </summary> |         /// </summary> | ||||||
|         /// <param name="request">The answers to be submitted for the survey.</param> |         /// <param name="request">The answers to be submitted for the survey.</param> | ||||||
| 
 | 
 | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [HttpPost("responses/answers")] |         [HttpPost("responses/answers")] | ||||||
|         public async Task<ActionResult> PostSurveyAnswersAsync(Request request) |         public async Task<ActionResult> PostSurveyAnswersAsync(Request request) | ||||||
|         { |         { | ||||||
| @ -203,6 +215,8 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get All active surveys . |         /// Get All active surveys . | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  | 
 | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("responses/surveys/active")] |         [Route("responses/surveys/active")] | ||||||
|         [Route("responses/surveys/active/{language:alpha}")] |         [Route("responses/surveys/active/{language:alpha}")] | ||||||
|         [Route("responses/surveys/active/{employeeid:int}")] |         [Route("responses/surveys/active/{employeeid:int}")] | ||||||
| @ -220,6 +234,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Export all survey response data based on survey id. |         /// Export all survey response data based on survey id. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [Route("responses/surveys/export/{surveyid}")] |         [Route("responses/surveys/export/{surveyid}")] | ||||||
|         public async Task<ActionResult> GetExcelSurveysAsync(int surveyid, string language, bool IsAdmin = false) |         public async Task<ActionResult> GetExcelSurveysAsync(int surveyid, string language, bool IsAdmin = false) | ||||||
| @ -250,6 +265,7 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get all historical surveys . |         /// Get all historical surveys . | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("responses/surveys/historic")] |         [Route("responses/surveys/historic")] | ||||||
|         [Route("responses/surveys/historic/{language:alpha}")] |         [Route("responses/surveys/historic/{language:alpha}")] | ||||||
|         [Route("responses/surveys/historic/{employeeid:int}")] |         [Route("responses/surveys/historic/{employeeid:int}")] | ||||||
| @ -4,9 +4,9 @@ namespace DamageAssesment.Api.Responses.Interfaces | |||||||
| { | { | ||||||
|     public interface IAnswerServiceProvider |     public interface IAnswerServiceProvider | ||||||
|     { |     { | ||||||
|         Task<List<Answer>> getAnswersAsync(); |         Task<List<Answer>> getAnswersAsync(string token); | ||||||
|         Task<List<Models.Answer>> GetAnswersByResponseIdAsync(int responseId); |         Task<List<Models.Answer>> GetAnswersByResponseIdAsync(int responseId, string token); | ||||||
|  |  | ||||||
|         Task<Models.Answer> PostAnswersAsync(Models.Answer answer); |         Task<Models.Answer> PostAnswersAsync(Models.Answer answer, string token); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -4,7 +4,7 @@ namespace DamageAssesment.Api.Responses.Interfaces | |||||||
| { | { | ||||||
|     public interface IAttachmentServiceProvider |     public interface IAttachmentServiceProvider | ||||||
|     { |     { | ||||||
|         Task<List<Attachment>> getAttachmentsAsync(); |         Task<List<Attachment>> getAttachmentsAsync(string token); | ||||||
|         Task<IEnumerable<Attachment>> PostAttachmentsAsync(Models.AttachmentInfo attachmentInfo); |         Task<IEnumerable<Attachment>> PostAttachmentsAsync(Models.AttachmentInfo attachmentInfo, string token); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,10 +1,10 @@ | |||||||
| using DamageAssesment.Api.Responses.Models; | using DamageAssesment.Api.Responses.Models; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Responses.Interfaces | namespace DamageAssesment.Api.Responses.Interfaces | ||||||
| { | { | ||||||
|     public interface IEmployeeServiceProvider |     public interface IEmployeeServiceProvider | ||||||
|     { |     { | ||||||
|         Task<List<Employee>> getEmployeesAsync(); |         Task<List<Employee>> getEmployeesAsync(string token); | ||||||
|         Task<Employee> getEmployeeAsync(int employeeId); |         Task<Employee> getEmployeeAsync(int employeeId, string token); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,9 +1,9 @@ | |||||||
| using DamageAssesment.Api.Responses.Models; | using DamageAssesment.Api.Responses.Models; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Responses.Interfaces | namespace DamageAssesment.Api.Responses.Interfaces | ||||||
| { | { | ||||||
|     public interface IHttpUtil |     public interface IHttpUtil | ||||||
|     { |     { | ||||||
|         Task<string> SendAsync(HttpMethod method, string url, string JsonInput); |         Task<string> SendAsync(HttpMethod method, string url, string JsonInput, string token); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -4,6 +4,6 @@ namespace DamageAssesment.Api.Responses.Interfaces | |||||||
| { | { | ||||||
|     public interface ILocationServiceProvider |     public interface ILocationServiceProvider | ||||||
|     { |     { | ||||||
|         Task<List<Location>> getLocationsAsync(); |         Task<List<Location>> getLocationsAsync(string token); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -4,9 +4,9 @@ namespace DamageAssesment.Api.Responses.Interfaces | |||||||
| { | { | ||||||
|     public interface IQuestionServiceProvider |     public interface IQuestionServiceProvider | ||||||
|     { |     { | ||||||
|         Task<List<Question>> getQuestionsAsync(string language); |         Task<List<Question>> getQuestionsAsync(string language,string token); | ||||||
|         Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId); |         Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId, string token); | ||||||
|         Task<Question> getQuestionsAsync(int questionId); |         Task<Question> getQuestionsAsync(int questionId, string token); | ||||||
|         Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language); |         Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language, string token); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -4,6 +4,6 @@ namespace DamageAssesment.Api.Responses.Interfaces | |||||||
| { | { | ||||||
|     public interface IRegionServiceProvider |     public interface IRegionServiceProvider | ||||||
|     { |     { | ||||||
|         Task<List<Region>> getRegionsAsync(); |         Task<List<Region>> getRegionsAsync(string token); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -4,7 +4,7 @@ namespace DamageAssesment.Api.Responses.Interfaces | |||||||
| { | { | ||||||
|     public interface ISurveyServiceProvider |     public interface ISurveyServiceProvider | ||||||
|     { |     { | ||||||
|         Task<List<Survey>> getSurveysAsync(string language); |         Task<List<Survey>> getSurveysAsync(string language,string token); | ||||||
|         Task<Survey> getSurveyAsync(int surveyId); |         Task<Survey> getSurveyAsync(int surveyId,string token); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -11,6 +11,6 @@ namespace DamageAssesment.Api.Responses.Models | |||||||
|         public string OfficePhoneNumber { get; set; } |         public string OfficePhoneNumber { get; set; } | ||||||
|         public string Email { get; set; } |         public string Email { get; set; } | ||||||
|         public bool IsActive { get; set; } |         public bool IsActive { get; set; } | ||||||
|         public string? PreferredLanguage { get; set; } |         public string PreferredLanguage { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -5,6 +5,10 @@ using DamageAssesment.Api.Responses.Providers; | |||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| using Polly; | using Polly; | ||||||
| using System.Reflection; | using System.Reflection; | ||||||
|  | using Microsoft.OpenApi.Models; | ||||||
|  | using Microsoft.AspNetCore.Authentication.JwtBearer; | ||||||
|  | using Microsoft.IdentityModel.Tokens; | ||||||
|  | using System.Text; | ||||||
|  |  | ||||||
| var builder = WebApplication.CreateBuilder(args); | var builder = WebApplication.CreateBuilder(args); | ||||||
| const int maxApiCallRetries = 3; | const int maxApiCallRetries = 3; | ||||||
| @ -14,6 +18,24 @@ const int intervalForCircuitBraker = 5; //5 seconds | |||||||
|  |  | ||||||
|  |  | ||||||
| // Add services to the container. | // 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.AddControllers(); | ||||||
| // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | ||||||
| @ -26,6 +48,7 @@ builder.Services.AddScoped<IQuestionServiceProvider, QuestionServiceProvider>(); | |||||||
| builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>(); | builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>(); | ||||||
| builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>(); | builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>(); | ||||||
| builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>(); | builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>(); | ||||||
|  | builder.Services.AddHttpContextAccessor(); | ||||||
| builder.Services.AddScoped<IExcelExportService, ExcelExportService>(); | builder.Services.AddScoped<IExcelExportService, ExcelExportService>(); | ||||||
|  |  | ||||||
| builder.Services.AddHttpClient<IHttpUtil, HttpUtil>(). | builder.Services.AddHttpClient<IHttpUtil, HttpUtil>(). | ||||||
| @ -36,12 +59,40 @@ builder.Services.AddHttpClient<IHttpUtil, HttpUtil>(). | |||||||
| builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); | builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); | ||||||
| builder.Services.AddEndpointsApiExplorer(); | builder.Services.AddEndpointsApiExplorer(); | ||||||
| //builder.Services.AddSwaggerGen(); | //builder.Services.AddSwaggerGen(); | ||||||
| builder.Services.AddSwaggerGen(c => |  | ||||||
|  | builder.Services.AddSwaggerGen(options => | ||||||
| { | { | ||||||
|     // Include XML comments from your assembly |     // Include XML comments from your assembly | ||||||
|     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; |     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; | ||||||
|     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); |     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); | ||||||
|     c.IncludeXmlComments(xmlPath); |     options.IncludeXmlComments(xmlPath); | ||||||
|  |  | ||||||
|  |     OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Name = "Bearer", | ||||||
|  |         BearerFormat = "JWT", | ||||||
|  |         Scheme = "bearer", | ||||||
|  |         Description = "Specify the authorization token.", | ||||||
|  |         In = ParameterLocation.Header, | ||||||
|  |         Type = SecuritySchemeType.Http, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityDefinition("jwt_auth", securityDefinition); | ||||||
|  |  | ||||||
|  |     // Make sure swagger UI requires a Bearer token specified | ||||||
|  |     OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Reference = new OpenApiReference() | ||||||
|  |         { | ||||||
|  |             Id = "jwt_auth", | ||||||
|  |             Type = ReferenceType.SecurityScheme | ||||||
|  |         } | ||||||
|  |     }; | ||||||
|  |     OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement() | ||||||
|  |     { | ||||||
|  |         {securityScheme, new string[] { }}, | ||||||
|  |     }; | ||||||
|  |     options.AddSecurityRequirement(securityRequirements); | ||||||
| }); | }); | ||||||
| builder.Services.AddDbContext<SurveyResponseDbContext>(option => | builder.Services.AddDbContext<SurveyResponseDbContext>(option => | ||||||
| { | { | ||||||
| @ -56,6 +107,7 @@ if (app.Environment.IsDevelopment()) | |||||||
|     app.UseSwaggerUI(); |     app.UseSwaggerUI(); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
|  |  | ||||||
| app.MapControllers(); | app.MapControllers(); | ||||||
|  | |||||||
| @ -9,7 +9,7 @@ | |||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "profiles": { |   "profiles": { | ||||||
|     "DamageAssesment.Api.SurveyResponses": { |     "DamageAssesment.Api.Responses": { | ||||||
|       "commandName": "Project", |       "commandName": "Project", | ||||||
|       "dotnetRunMessages": true, |       "dotnetRunMessages": true, | ||||||
|       "launchBrowser": true, |       "launchBrowser": true, | ||||||
|  | |||||||
| @ -2,6 +2,7 @@ | |||||||
| using DamageAssesment.Api.Responses.Db; | using DamageAssesment.Api.Responses.Db; | ||||||
| using DamageAssesment.Api.Responses.Interfaces; | using DamageAssesment.Api.Responses.Interfaces; | ||||||
| using DamageAssesment.Api.Responses.Models; | using DamageAssesment.Api.Responses.Models; | ||||||
|  | using DamageAssesment.Api.Responses.Services; | ||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
| using Microsoft.EntityFrameworkCore.Metadata.Internal; | using Microsoft.EntityFrameworkCore.Metadata.Internal; | ||||||
| using System.Reflection; | using System.Reflection; | ||||||
| @ -21,8 +22,10 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|         private readonly IQuestionServiceProvider questionServiceProvider; |         private readonly IQuestionServiceProvider questionServiceProvider; | ||||||
|         private readonly ISurveyServiceProvider surveyServiceProvider; |         private readonly ISurveyServiceProvider surveyServiceProvider; | ||||||
|         private readonly IMapper mapper; |         private readonly IMapper mapper; | ||||||
|  |         private readonly IHttpContextAccessor httpContextAccessor; | ||||||
|  |         private string token; | ||||||
|  |  | ||||||
|         public SurveyResponsesProvider(SurveyResponseDbContext surveyResponseDbContext, ILogger<SurveyResponsesProvider> logger, IAnswerServiceProvider answerServiceProvider, IRegionServiceProvider regionServiceProvider, ILocationServiceProvider locationServiceProvider, IEmployeeServiceProvider employeeServiceProvider, IAttachmentServiceProvider attachmentServiceProvider, IQuestionServiceProvider questionServiceProvider, ISurveyServiceProvider surveyServiceProvider, IMapper mapper) |         public SurveyResponsesProvider(SurveyResponseDbContext surveyResponseDbContext, ILogger<SurveyResponsesProvider> logger, IAnswerServiceProvider answerServiceProvider, IRegionServiceProvider regionServiceProvider, ILocationServiceProvider locationServiceProvider, IEmployeeServiceProvider employeeServiceProvider, IAttachmentServiceProvider attachmentServiceProvider, IQuestionServiceProvider questionServiceProvider, ISurveyServiceProvider surveyServiceProvider, IMapper mapper, IHttpContextAccessor httpContextAccessor) | ||||||
|         { |         { | ||||||
|             this.surveyResponseDbContext = surveyResponseDbContext; |             this.surveyResponseDbContext = surveyResponseDbContext; | ||||||
|             this.logger = logger; |             this.logger = logger; | ||||||
| @ -33,8 +36,20 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|             this.attachmentServiceProvider = attachmentServiceProvider; |             this.attachmentServiceProvider = attachmentServiceProvider; | ||||||
|             this.questionServiceProvider = questionServiceProvider; |             this.questionServiceProvider = questionServiceProvider; | ||||||
|             this.surveyServiceProvider = surveyServiceProvider; |             this.surveyServiceProvider = surveyServiceProvider; | ||||||
|  |             this.httpContextAccessor = httpContextAccessor; | ||||||
|             this.mapper = mapper; |             this.mapper = mapper; | ||||||
|             SeedData(); |             SeedData(); | ||||||
|  |  | ||||||
|  |             token = httpContextAccessor.HttpContext.Request.Headers.Authorization; | ||||||
|  |             if (token != null) | ||||||
|  |             { | ||||||
|  |                 token = token.Replace("Bearer ", string.Empty); | ||||||
|  |             } | ||||||
|  |             else | ||||||
|  |             { | ||||||
|  |                 token = ""; | ||||||
|  |             } | ||||||
|  |             // seedData(); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public void SeedData() |         public void SeedData() | ||||||
| @ -56,16 +71,20 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 logger?.LogInformation("Querying to get SurveyResponse object from DB"); |                 logger?.LogInformation("Querying to get SurveyResponse object from DB"); | ||||||
|                 IQueryable<Db.SurveyResponse> listSurveyResponse = null; |                 List<Db.SurveyResponse> listSurveyResponse = null; | ||||||
|                 if (employeeid == 0) |                 if (employeeid == 0) | ||||||
|                 { |                 { | ||||||
|                     listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId); |                     listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId).ToList(); | ||||||
|                 } |                 } | ||||||
|                 else |                 else | ||||||
|                 { |                 { | ||||||
|                     listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid); |                     listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid).ToList(); | ||||||
|                 } |                 } | ||||||
|  |                 listSurveyResponse = listSurveyResponse | ||||||
|  |                .OrderByDescending(obj => obj.Id) | ||||||
|  |                .GroupBy(obj => new { obj.SurveyId,  obj.LocationId })//obj.EmployeeId, | ||||||
|  |                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups | ||||||
|  |                .ToList(); | ||||||
|                 if (listSurveyResponse.Any()) |                 if (listSurveyResponse.Any()) | ||||||
|                 { |                 { | ||||||
|                     var answers = await getAnswersByRegionAndSurveyIdAsync(listSurveyResponse); |                     var answers = await getAnswersByRegionAndSurveyIdAsync(listSurveyResponse); | ||||||
| @ -120,7 +139,7 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|             { |             { | ||||||
|                 logger?.LogInformation("Querying to get SurveyResponse object from DB"); |                 logger?.LogInformation("Querying to get SurveyResponse object from DB"); | ||||||
|                 //get all the survey that already taken by the employee |                 //get all the survey that already taken by the employee | ||||||
|                 var surveys = await surveyServiceProvider.getSurveysAsync(language); |                 var surveys = await surveyServiceProvider.getSurveysAsync(language,token); | ||||||
|                 surveys = surveys.Where(s => s.IsEnabled == true && s.Status == SurveyStatus.ACTIVE.ToString()).ToList(); |                 surveys = surveys.Where(s => s.IsEnabled == true && s.Status == SurveyStatus.ACTIVE.ToString()).ToList(); | ||||||
|                 if (employeeid == null || employeeid == 0) |                 if (employeeid == null || employeeid == 0) | ||||||
|                     return (true, surveys, null); |                     return (true, surveys, null); | ||||||
| @ -141,7 +160,7 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|             { |             { | ||||||
|                 logger?.LogInformation("Querying to get SurveyResponse object from DB"); |                 logger?.LogInformation("Querying to get SurveyResponse object from DB"); | ||||||
|  |  | ||||||
|                 var surveys = await surveyServiceProvider.getSurveysAsync(language); |                 var surveys = await surveyServiceProvider.getSurveysAsync(language, token); | ||||||
|                 // returning only historic data: end date is less than current date. |                 // returning only historic data: end date is less than current date. | ||||||
|                 surveys = surveys.Where(s => s.Status == SurveyStatus.INACTIVE.ToString()).ToList(); |                 surveys = surveys.Where(s => s.Status == SurveyStatus.INACTIVE.ToString()).ToList(); | ||||||
|                 if (employeeid == null || employeeid == 0) |                 if (employeeid == null || employeeid == 0) | ||||||
| @ -166,7 +185,7 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 logger?.LogInformation("Querying to get Survey object from microservice"); |                 logger?.LogInformation("Querying to get Survey object from microservice"); | ||||||
|                 var survey = await surveyServiceProvider.getSurveyAsync(surveyId); |                 var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token); | ||||||
|  |  | ||||||
|                 if (survey != null) |                 if (survey != null) | ||||||
|                 { |                 { | ||||||
| @ -197,7 +216,7 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 logger?.LogInformation("Querying to get Survey object from microservice"); |                 logger?.LogInformation("Querying to get Survey object from microservice"); | ||||||
|                 var survey = await surveyServiceProvider.getSurveyAsync(surveyId); |                 var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token); | ||||||
|  |  | ||||||
|                 if (survey != null) |                 if (survey != null) | ||||||
|                 { |                 { | ||||||
| @ -228,7 +247,7 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 logger?.LogInformation("Querying to get Survey object from microservice"); |                 logger?.LogInformation("Querying to get Survey object from microservice"); | ||||||
|                 var survey = await surveyServiceProvider.getSurveyAsync(surveyId); |                 var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token); | ||||||
|  |  | ||||||
|                 if (survey != null) |                 if (survey != null) | ||||||
|                 { |                 { | ||||||
| @ -259,8 +278,8 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 logger?.LogInformation("Querying to get Survey object from microservice"); |                 logger?.LogInformation("Querying to get Survey object from microservice"); | ||||||
|                 var survey = await surveyServiceProvider.getSurveyAsync(surveyId); |                 var survey = await surveyServiceProvider.getSurveyAsync(surveyId, token); | ||||||
|                 var question = await questionServiceProvider.getQuestionsAsync(questionId); |                 var question = await questionServiceProvider.getQuestionsAsync(questionId, token); | ||||||
|                 bool IsCorrectAnswer = answer.ToLower().Equals("yes") || answer.ToLower().Equals("no") ? true : false; |                 bool IsCorrectAnswer = answer.ToLower().Equals("yes") || answer.ToLower().Equals("no") ? true : false; | ||||||
|  |  | ||||||
|  |  | ||||||
| @ -417,11 +436,11 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|         } |         } | ||||||
|  |  | ||||||
|         //Method to get Answers by region with surveyId as input parameter |         //Method to get Answers by region with surveyId as input parameter | ||||||
|         private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(IQueryable<Db.SurveyResponse> surveyResponses) |         private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(List<Db.SurveyResponse> surveyResponses) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 var answersList = await answerServiceProvider.getAnswersAsync(); |                 var answersList = await answerServiceProvider.getAnswersAsync(token); | ||||||
|                 if (answersList == null || !answersList.Any()) |                 if (answersList == null || !answersList.Any()) | ||||||
|                     return null; |                     return null; | ||||||
|  |  | ||||||
| @ -444,8 +463,8 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                 if (surveyAnswers == null || !surveyAnswers.Any()) |                 if (surveyAnswers == null || !surveyAnswers.Any()) | ||||||
|                     return null; |                     return null; | ||||||
|  |  | ||||||
|                 var regions = await regionServiceProvider.getRegionsAsync(); |                 var regions = await regionServiceProvider.getRegionsAsync(token); | ||||||
|                 var locations = await locationServiceProvider.getLocationsAsync(); |                 var locations = await locationServiceProvider.getLocationsAsync(token); | ||||||
|  |  | ||||||
|                 if (regions == null || !regions.Any() || locations == null || !locations.Any()) |                 if (regions == null || !regions.Any() || locations == null || !locations.Any()) | ||||||
|                     return null; |                     return null; | ||||||
| @ -507,11 +526,11 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId); |                 var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId, token); | ||||||
|                 var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id); |                 var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id, token); | ||||||
|                 var allQuestions = await questionServiceProvider.getQuestionsAsync(null); |                 var allQuestions = await questionServiceProvider.getQuestionsAsync(null,token); | ||||||
|                 var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId); |                 var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId); | ||||||
|                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(); |                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(token); | ||||||
|  |  | ||||||
|                 var result = new |                 var result = new | ||||||
|                 { |                 { | ||||||
| @ -556,24 +575,26 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                 if (employeeid == 0) |                 if (employeeid == 0) | ||||||
|                 { |                 { | ||||||
|                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync(); |                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync(); | ||||||
|                     employees = await employeeServiceProvider.getEmployeesAsync(); |                     employees = await employeeServiceProvider.getEmployeesAsync(token); | ||||||
|                 } |                 } | ||||||
|                 else |                 else | ||||||
|                 { |                 { | ||||||
|                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync(); |                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync(); | ||||||
|                     employee = await employeeServiceProvider.getEmployeeAsync(employeeid); |                     employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token); | ||||||
|                 } |                 } | ||||||
|  |                 surveyResonses = surveyResonses | ||||||
|  |                 .OrderByDescending(obj => obj.Id) | ||||||
|  |                 .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//obj.EmployeeId, | ||||||
|  |                 .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups | ||||||
|  |                 .ToList(); | ||||||
|  |  | ||||||
|                 var answers = await answerServiceProvider.getAnswersAsync(); |                 var answers = await answerServiceProvider.getAnswersAsync(token); | ||||||
|                 var questions = await questionServiceProvider.getQuestionsAsync(null); |                 var questions = await questionServiceProvider.getQuestionsAsync(null, token); | ||||||
|                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q; |                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q; | ||||||
|  |  | ||||||
|                 //var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId); |                 //var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId); | ||||||
|  |  | ||||||
|                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(); |                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(token); | ||||||
|  |  | ||||||
|                 if (employeeid == 0) |  | ||||||
|                 { |  | ||||||
|                 var result = from r in surveyResonses |                 var result = from r in surveyResonses | ||||||
|                              select new |                              select new | ||||||
|                              { |                              { | ||||||
| @ -601,41 +622,6 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                              }; |                              }; | ||||||
|                 return result; |                 return result; | ||||||
|             } |             } | ||||||
|                 else |  | ||||||
|                 { |  | ||||||
|                     object _employee = new { }; |  | ||||||
|                     if (employee != null) |  | ||||||
|                     { |  | ||||||
|                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber }; |  | ||||||
|                     } |  | ||||||
|                     var result = from r in surveyResonses |  | ||||||
|                                  select new |  | ||||||
|                                  { |  | ||||||
|                                      r.Id, |  | ||||||
|                                      r.SurveyId, |  | ||||||
|                                      r.LocationId, |  | ||||||
|                                      r.EmployeeId, |  | ||||||
|                                      r.ClientDevice, |  | ||||||
|                                      r.KeyAnswerResult, |  | ||||||
|                                      r.Longitute, |  | ||||||
|                                      r.Latitude, |  | ||||||
|                                      Employee = _employee, |  | ||||||
|                                      answers = from ans in answers |  | ||||||
|                                                where ans.SurveyResponseId == r.Id |  | ||||||
|                                                select new |  | ||||||
|                                                { |  | ||||||
|                                                    ans.Id, |  | ||||||
|                                                    ans.QuestionId, |  | ||||||
|                                                    ans.AnswerText, |  | ||||||
|                                                    ans.Comment, |  | ||||||
|                                                    Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(), |  | ||||||
|                                                    Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI } |  | ||||||
|                                                } |  | ||||||
|                                  }; |  | ||||||
|  |  | ||||||
|                     return result; |  | ||||||
|                 } |  | ||||||
|             } |  | ||||||
|             catch (Exception ex) |             catch (Exception ex) | ||||||
|             { |             { | ||||||
|                 logger?.LogError($"Exception Found : {ex.Message} - Ref: SurveyResponsesProvider.getSurveyResponseBySurveyIdAsync()"); |                 logger?.LogError($"Exception Found : {ex.Message} - Ref: SurveyResponsesProvider.getSurveyResponseBySurveyIdAsync()"); | ||||||
| @ -656,12 +642,12 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                 if (employeeid == 0) |                 if (employeeid == 0) | ||||||
|                 { |                 { | ||||||
|                     surveyResonses = await surveyResponseDbContext.SurveyResponses.ToListAsync(); |                     surveyResonses = await surveyResponseDbContext.SurveyResponses.ToListAsync(); | ||||||
|                     employees = await employeeServiceProvider.getEmployeesAsync(); |                     employees = await employeeServiceProvider.getEmployeesAsync(token); | ||||||
|                 } |                 } | ||||||
|                 else |                 else | ||||||
|                 { |                 { | ||||||
|                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).ToListAsync(); |                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).ToListAsync(); | ||||||
|                     employee = await employeeServiceProvider.getEmployeeAsync(employeeid); |                     employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token); | ||||||
|  |  | ||||||
|                     if (employee != null) |                     if (employee != null) | ||||||
|                     { |                     { | ||||||
| @ -670,9 +656,9 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                 } |                 } | ||||||
|  |  | ||||||
|  |  | ||||||
|                 var answers = await answerServiceProvider.getAnswersAsync(); |                 var answers = await answerServiceProvider.getAnswersAsync(token); | ||||||
|                 var questions = await questionServiceProvider.getQuestionsAsync(null); |                 var questions = await questionServiceProvider.getQuestionsAsync(null,token); | ||||||
|                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(); |                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(token); | ||||||
|  |  | ||||||
|                 var result = from r in surveyResonses |                 var result = from r in surveyResonses | ||||||
|                              select new |                              select new | ||||||
| @ -699,8 +685,6 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                                            } |                                            } | ||||||
|                              }; |                              }; | ||||||
|                 return result; |                 return result; | ||||||
|  |  | ||||||
|  |  | ||||||
|             } |             } | ||||||
|             catch (Exception ex) |             catch (Exception ex) | ||||||
|             { |             { | ||||||
| @ -716,12 +700,12 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                 if (string.IsNullOrEmpty(language)) language = "en"; |                 if (string.IsNullOrEmpty(language)) language = "en"; | ||||||
|                 List<Db.SurveyResponse> surveyResonses; |                 List<Db.SurveyResponse> surveyResonses; | ||||||
|                 surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(a => a.SurveyId == surveyId).ToListAsync(); |                 surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(a => a.SurveyId == surveyId).ToListAsync(); | ||||||
|                 var answers = await answerServiceProvider.getAnswersAsync(); |                 var answers = await answerServiceProvider.getAnswersAsync(token); | ||||||
|                 var Locations = await locationServiceProvider.getLocationsAsync(); |                 var Locations = await locationServiceProvider.getLocationsAsync(token); | ||||||
|                 var regions = await regionServiceProvider.getRegionsAsync(); |                 var regions = await regionServiceProvider.getRegionsAsync(token); | ||||||
|                 var questions = await questionServiceProvider.getQuestionsAsync(language); |                 var questions = await questionServiceProvider.getQuestionsAsync(language, token); | ||||||
|                 var categories = await questionServiceProvider.GetQuestionCategoriesAsync(language); |                 var categories = await questionServiceProvider.GetQuestionCategoriesAsync(language, token); | ||||||
|                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(); |                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(token); | ||||||
|                 List<object> questionLists = new List<object>(); |                 List<object> questionLists = new List<object>(); | ||||||
|                 var allques = from res in surveyResonses |                 var allques = from res in surveyResonses | ||||||
|                               join loc in Locations on res.LocationId equals loc.Id |                               join loc in Locations on res.LocationId equals loc.Id | ||||||
| @ -853,8 +837,8 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                 { |                 { | ||||||
|                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync(); |                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync(); | ||||||
|                 } |                 } | ||||||
|                 var answers = await answerServiceProvider.getAnswersAsync(); |                 var answers = await answerServiceProvider.getAnswersAsync(token); | ||||||
|                 var locations = await locationServiceProvider.getLocationsAsync(); |                 var locations = await locationServiceProvider.getLocationsAsync(token); | ||||||
|                 var maintenanceCenters = locations.DistinctBy(m => m.MaintenanceCenter); |                 var maintenanceCenters = locations.DistinctBy(m => m.MaintenanceCenter); | ||||||
|  |  | ||||||
|                 //get all the answers for the particular survey |                 //get all the answers for the particular survey | ||||||
| @ -920,23 +904,27 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                 if (employeeid == 0) |                 if (employeeid == 0) | ||||||
|                 { |                 { | ||||||
|                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.LocationId == locationId).ToListAsync(); |                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.LocationId == locationId).ToListAsync(); | ||||||
|                     employees = await employeeServiceProvider.getEmployeesAsync(); |                     employees = await employeeServiceProvider.getEmployeesAsync(token); | ||||||
|                 } |                 } | ||||||
|                 else |                 else | ||||||
|                 { |                 { | ||||||
|                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid && x.LocationId == locationId).ToListAsync(); |                     surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid && x.LocationId == locationId).ToListAsync(); | ||||||
|                     employee = await employeeServiceProvider.getEmployeeAsync(employeeid); |                     employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token); | ||||||
|  |  | ||||||
|                     if (employee != null) |                     if (employee != null) | ||||||
|                     { |                     { | ||||||
|                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber }; |                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber }; | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|  |                 surveyResonses = surveyResonses | ||||||
|                 var answers = await answerServiceProvider.getAnswersAsync(); |                 .OrderByDescending(obj => obj.Id) | ||||||
|                 var questions = await questionServiceProvider.getQuestionsAsync(null); |                 .GroupBy(obj => new { obj.SurveyId,  obj.LocationId }) //obj.EmployeeId, | ||||||
|  |                 .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups | ||||||
|  |                 .ToList(); | ||||||
|  |                 var answers = await answerServiceProvider.getAnswersAsync(token); | ||||||
|  |                 var questions = await questionServiceProvider.getQuestionsAsync(null,token); | ||||||
|                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q; |                 var surveyQuestions = from q in questions where q.SurveyId == surveyId select q; | ||||||
|                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(); |                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(token); | ||||||
|  |  | ||||||
|                 var result = from r in surveyResonses |                 var result = from r in surveyResonses | ||||||
|                              select new |                              select new | ||||||
| @ -949,7 +937,7 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                                  r.KeyAnswerResult, |                                  r.KeyAnswerResult, | ||||||
|                                  r.Longitute, |                                  r.Longitute, | ||||||
|                                  r.Latitude, |                                  r.Latitude, | ||||||
|                                  Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(), |                                  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(), | ||||||
|                                  answers = from ans in answers |                                  answers = from ans in answers | ||||||
|                                            where ans.SurveyResponseId == r.Id |                                            where ans.SurveyResponseId == r.Id | ||||||
|  |  | ||||||
| @ -964,7 +952,6 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                                            } |                                            } | ||||||
|                              }; |                              }; | ||||||
|                 return result; |                 return result; | ||||||
|  |  | ||||||
|             } |             } | ||||||
|             catch (Exception ex) |             catch (Exception ex) | ||||||
|             { |             { | ||||||
| @ -987,23 +974,27 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                 if (employeeid == 0) |                 if (employeeid == 0) | ||||||
|                 { |                 { | ||||||
|                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync(); |                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync(); | ||||||
|                     employees = await employeeServiceProvider.getEmployeesAsync(); |                     employees = await employeeServiceProvider.getEmployeesAsync(token); | ||||||
|                 } |                 } | ||||||
|                 else |                 else | ||||||
|                 { |                 { | ||||||
|                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id && x.EmployeeId == employeeid).ToListAsync(); |                     surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id && x.EmployeeId == employeeid).ToListAsync(); | ||||||
|                     employee = await employeeServiceProvider.getEmployeeAsync(employeeid); |                     employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token); | ||||||
|  |  | ||||||
|                     if (employee != null) |                     if (employee != null) | ||||||
|                     { |                     { | ||||||
|                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber }; |                         _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber }; | ||||||
|                     } |                     } | ||||||
|                 } |                 } | ||||||
|  |                 surveyResponses = surveyResponses | ||||||
|  |                 .OrderByDescending(obj => obj.Id) | ||||||
|  |                 .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//, obj.EmployeeId | ||||||
|  |                 .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups | ||||||
|  |                 .ToList(); | ||||||
|                 //var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync(); |                 //var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync(); | ||||||
|                 // var employees = await employeeServiceProvider.getEmployeesAsync(); |                 // var employees = await employeeServiceProvider.getEmployeesAsync(); | ||||||
|                 var answers = await answerServiceProvider.getAnswersAsync(); |                 var answers = await answerServiceProvider.getAnswersAsync(token); | ||||||
|                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(); |                 var attachments = await attachmentServiceProvider.getAttachmentsAsync(token); | ||||||
|  |  | ||||||
|                 var result = from r in surveyResponses |                 var result = from r in surveyResponses | ||||||
|                              select new |                              select new | ||||||
| @ -1016,7 +1007,7 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|                                  r.KeyAnswerResult, |                                  r.KeyAnswerResult, | ||||||
|                                  r.Longitute, |                                  r.Longitute, | ||||||
|                                  r.Latitude, |                                  r.Latitude, | ||||||
|                                  Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(), |                                  Employee = (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(), | ||||||
|                                  answers = from ans in answers |                                  answers = from ans in answers | ||||||
|                                            where ans.SurveyResponseId == r.Id |                                            where ans.SurveyResponseId == r.Id | ||||||
|                                            && ans.QuestionId == question.Id |                                            && ans.QuestionId == question.Id | ||||||
| @ -1046,12 +1037,12 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|         { |         { | ||||||
|             if (answerRequest != null) |             if (answerRequest != null) | ||||||
|             { |             { | ||||||
|                 var answer = await answerServiceProvider.PostAnswersAsync(new Models.Answer { QuestionId = answerRequest.QuestionId, AnswerText = answerRequest.AnswerText, Comment = answerRequest.Comment, SurveyResponseId = surveyResponseId }); |                 var answer = await answerServiceProvider.PostAnswersAsync(new Models.Answer { QuestionId = answerRequest.QuestionId, AnswerText = answerRequest.AnswerText, Comment = answerRequest.Comment, SurveyResponseId = surveyResponseId }, token); | ||||||
|                 if (answer != null) |                 if (answer != null) | ||||||
|                 { |                 { | ||||||
|                     List<AnswerInfo> listAnswerInfo = new List<AnswerInfo>(); |                     List<AnswerInfo> listAnswerInfo = new List<AnswerInfo>(); | ||||||
|                     listAnswerInfo.Add(new AnswerInfo { AnswerId = answer.Id, postedFiles = answerRequest.PostedFiles }); |                     listAnswerInfo.Add(new AnswerInfo { AnswerId = answer.Id, postedFiles = answerRequest.PostedFiles }); | ||||||
|                     var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo }); |                     var attachments = attachmentServiceProvider.PostAttachmentsAsync(new AttachmentInfo { ResponseId = surveyResponseId, Answers = listAnswerInfo }, token); | ||||||
|  |  | ||||||
|                     string message = $"Answer for question {answerRequest.QuestionId} saved to the database"; |                     string message = $"Answer for question {answerRequest.QuestionId} saved to the database"; | ||||||
|                     logger?.LogInformation(message); |                     logger?.LogInformation(message); | ||||||
| @ -1072,7 +1063,6 @@ namespace DamageAssesment.Api.Responses.Providers | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|         public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.Request request) |         public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Models.Request request) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|  | |||||||
| @ -1,5 +1,6 @@ | |||||||
| using DamageAssesment.Api.Responses.Interfaces; | using DamageAssesment.Api.Responses.Interfaces; | ||||||
| using DamageAssesment.Api.Responses.Models; | using DamageAssesment.Api.Responses.Models; | ||||||
|  | using Microsoft.Extensions.Primitives; | ||||||
| using Newtonsoft.Json; | using Newtonsoft.Json; | ||||||
|  |  | ||||||
|  |  | ||||||
| @ -10,11 +11,11 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|         public AnswerServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<AnswerServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Answer"), configuration.GetValue<string>("EndPointSettings:AnswerUrlBase")) |         public AnswerServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<AnswerServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Answer"), configuration.GetValue<string>("EndPointSettings:AnswerUrlBase")) | ||||||
|         { |         { | ||||||
|         } |         } | ||||||
|         public async Task<List<Answer>> getAnswersAsync() |         public async Task<List<Answer>> getAnswersAsync(string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token); | ||||||
|                 var answers = JsonConvert.DeserializeObject<List<Answer>>(responseJsonString); |                 var answers = JsonConvert.DeserializeObject<List<Answer>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (answers == null || !answers.Any()) |                 if (answers == null || !answers.Any()) | ||||||
| @ -28,12 +29,12 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<List<Answer>> GetAnswersByResponseIdAsync(int responseId) |         public async Task<List<Answer>> GetAnswersByResponseIdAsync(int responseId, string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:AnswerByResponse"), responseId); |                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:AnswerByResponse"), responseId); | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token); | ||||||
|                 var answers = JsonConvert.DeserializeObject<List<Answer>>(responseJsonString); |                 var answers = JsonConvert.DeserializeObject<List<Answer>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (answers == null || !answers.Any()) |                 if (answers == null || !answers.Any()) | ||||||
| @ -47,12 +48,12 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<Answer> PostAnswersAsync(Answer answer) |         public async Task<Answer> PostAnswersAsync(Answer answer, string token ) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 var requestJsonString = JsonConvert.SerializeObject(answer); |                 var requestJsonString = JsonConvert.SerializeObject(answer); | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString, token); | ||||||
|                 var answers = JsonConvert.DeserializeObject<Answer>(responseJsonString); |                 var answers = JsonConvert.DeserializeObject<Answer>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (answers == null) |                 if (answers == null) | ||||||
|  | |||||||
| @ -10,11 +10,11 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|         { |         { | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<List<Attachment>> getAttachmentsAsync() |         public async Task<List<Attachment>> getAttachmentsAsync(string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token); | ||||||
|                 var attachments = JsonConvert.DeserializeObject<List<Attachment>>(responseJsonString); |                 var attachments = JsonConvert.DeserializeObject<List<Attachment>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (attachments == null || !attachments.Any()) |                 if (attachments == null || !attachments.Any()) | ||||||
| @ -28,12 +28,12 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<IEnumerable<Attachment>> PostAttachmentsAsync(AttachmentInfo attachmentInfo) |         public async Task<IEnumerable<Attachment>> PostAttachmentsAsync(AttachmentInfo attachmentInfo, string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 var requestJsonString = JsonConvert.SerializeObject(attachmentInfo); |                 var requestJsonString = JsonConvert.SerializeObject(attachmentInfo); | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Post, url, requestJsonString, token); | ||||||
|                 var attachments = JsonConvert.DeserializeObject<IEnumerable<Attachment>>(responseJsonString); |                 var attachments = JsonConvert.DeserializeObject<IEnumerable<Attachment>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (attachments == null) |                 if (attachments == null) | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| using DamageAssesment.Api.Responses.Interfaces; | using DamageAssesment.Api.Responses.Interfaces; | ||||||
| using DamageAssesment.Api.Responses.Models; | using DamageAssesment.Api.Responses.Models; | ||||||
| using Microsoft.AspNetCore.Mvc.Routing; | using Microsoft.AspNetCore.Mvc.Routing; | ||||||
| using Newtonsoft.Json; | using Newtonsoft.Json; | ||||||
| @ -11,11 +11,11 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|         { |         { | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<List<Employee>> getEmployeesAsync() |         public async Task<List<Employee>> getEmployeesAsync(string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token); | ||||||
|                 var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString); |                 var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (employees == null || !employees.Any()) |                 if (employees == null || !employees.Any()) | ||||||
| @ -29,12 +29,12 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<Employee> getEmployeeAsync(int employeeId) |         public async Task<Employee> getEmployeeAsync(int employeeId, string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:EmployeeById"), employeeId); |                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:EmployeeById"), employeeId); | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token); | ||||||
|                 var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString); |                 var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (employee == null) |                 if (employee == null) | ||||||
|  | |||||||
| @ -1,4 +1,5 @@ | |||||||
| using DamageAssesment.Api.Responses.Interfaces; | using DamageAssesment.Api.Responses.Interfaces; | ||||||
|  | using DamageAssesment.Api.Responses.Models; | ||||||
| using System.Net.Http.Headers; | using System.Net.Http.Headers; | ||||||
| using System.Text; | using System.Text; | ||||||
|  |  | ||||||
| @ -14,20 +15,18 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|             this.httpClient = httpClient; |             this.httpClient = httpClient; | ||||||
|             this.logger = logger; |             this.logger = logger; | ||||||
|         } |         } | ||||||
|         public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput) |         public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput, string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 var request = new HttpRequestMessage(method, url); |                 var request = new HttpRequestMessage(method, url); | ||||||
|                 request.Headers.Accept.Clear(); |                 request.Headers.Accept.Clear(); | ||||||
|                 request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); |                 request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); | ||||||
|  |                 request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token); | ||||||
|                 //request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token); |  | ||||||
|                 if (method == HttpMethod.Post) |                 if (method == HttpMethod.Post) | ||||||
|                 { |                 { | ||||||
|                     request.Content = new StringContent(JsonInput, Encoding.UTF8, "application/json"); |                     request.Content = new StringContent(JsonInput, Encoding.UTF8, "application/json"); | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
|                 var response = await httpClient.SendAsync(request, CancellationToken.None); |                 var response = await httpClient.SendAsync(request, CancellationToken.None); | ||||||
|                 response.EnsureSuccessStatusCode(); |                 response.EnsureSuccessStatusCode(); | ||||||
|                 var responseString = await response.Content.ReadAsStringAsync(); |                 var responseString = await response.Content.ReadAsStringAsync(); | ||||||
|  | |||||||
| @ -10,11 +10,11 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|         { |         { | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<List<Location>> getLocationsAsync() |         public async Task<List<Location>> getLocationsAsync(string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token); | ||||||
|                 var locations = JsonConvert.DeserializeObject<List<Location>>(responseJsonString); |                 var locations = JsonConvert.DeserializeObject<List<Location>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (locations == null || !locations.Any()) |                 if (locations == null || !locations.Any()) | ||||||
|  | |||||||
| @ -1,6 +1,7 @@ | |||||||
| using DamageAssesment.Api.Responses.Interfaces; | using DamageAssesment.Api.Responses.Interfaces; | ||||||
| using DamageAssesment.Api.Responses.Models; | using DamageAssesment.Api.Responses.Models; | ||||||
| using Newtonsoft.Json; | using Newtonsoft.Json; | ||||||
|  | using OfficeOpenXml.FormulaParsing.LexicalAnalysis; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Responses.Services | namespace DamageAssesment.Api.Responses.Services | ||||||
| { | { | ||||||
| @ -10,13 +11,13 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|         { |         { | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<List<Question>> getQuestionsAsync(string language) |         public async Task<List<Question>> getQuestionsAsync(string language,string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 if (!string.IsNullOrEmpty(language)) |                 if (!string.IsNullOrEmpty(language)) | ||||||
|                     url = url + "/" + language; |                     url = url + "/" + language; | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token); | ||||||
|                 var questions = JsonConvert.DeserializeObject<List<Question>>(responseJsonString); |                 var questions = JsonConvert.DeserializeObject<List<Question>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (questions == null || !questions.Any()) |                 if (questions == null || !questions.Any()) | ||||||
| @ -29,7 +30,7 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|                 return new List<Question>(); |                 return new List<Question>(); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|         public async Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language) |         public async Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language,string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
| @ -37,7 +38,7 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|  |  | ||||||
|                 if (!string.IsNullOrEmpty(language)) |                 if (!string.IsNullOrEmpty(language)) | ||||||
|                     url = url + "/" + language; |                     url = url + "/" + language; | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token); | ||||||
|                 var questions = JsonConvert.DeserializeObject<List<QuestionCategory>>(responseJsonString); |                 var questions = JsonConvert.DeserializeObject<List<QuestionCategory>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (questions == null || !questions.Any()) |                 if (questions == null || !questions.Any()) | ||||||
| @ -50,13 +51,12 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|                 return new List<QuestionCategory>(); |                 return new List<QuestionCategory>(); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |         public async Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId, string token) | ||||||
|         public async Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId) |  | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:SurveyQuestion"), surveyId); |                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:SurveyQuestion"), surveyId); | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token); | ||||||
|                 var questions = JsonConvert.DeserializeObject<List<SurveyQuestions>>(responseJsonString); |                 var questions = JsonConvert.DeserializeObject<List<SurveyQuestions>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (questions == null || !questions.Any()) |                 if (questions == null || !questions.Any()) | ||||||
| @ -71,12 +71,12 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|         } |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|         public async Task<Question> getQuestionsAsync(int questionId) |         public async Task<Question> getQuestionsAsync(int questionId, string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:QuestionById"), questionId); |                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:QuestionById"), questionId); | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token); | ||||||
|                 var question = JsonConvert.DeserializeObject<Question>(responseJsonString); |                 var question = JsonConvert.DeserializeObject<Question>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (question == null) |                 if (question == null) | ||||||
|  | |||||||
| @ -9,11 +9,11 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|         public RegionServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<RegionServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Region"), configuration.GetValue<string>("EndPointSettings:LocationUrlBase")) |         public RegionServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<RegionServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Region"), configuration.GetValue<string>("EndPointSettings:LocationUrlBase")) | ||||||
|         { |         { | ||||||
|         } |         } | ||||||
|         public async Task<List<Region>> getRegionsAsync() |         public async Task<List<Region>> getRegionsAsync(string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token); | ||||||
|                 var regions = JsonConvert.DeserializeObject<List<Region>>(responseJsonString); |                 var regions = JsonConvert.DeserializeObject<List<Region>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (regions == null || !regions.Any()) |                 if (regions == null || !regions.Any()) | ||||||
|  | |||||||
| @ -10,13 +10,13 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|         { |         { | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<List<Survey>> getSurveysAsync(string language) |         public async Task<List<Survey>> getSurveysAsync(string language, string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 if (!string.IsNullOrEmpty(language)) |                 if (!string.IsNullOrEmpty(language)) | ||||||
|                     url = url + "/" + language; |                     url = url + "/" + language; | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token); | ||||||
|                 var surveys = JsonConvert.DeserializeObject<List<Survey>>(responseJsonString); |                 var surveys = JsonConvert.DeserializeObject<List<Survey>>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (surveys == null || !surveys.Any()) |                 if (surveys == null || !surveys.Any()) | ||||||
| @ -30,12 +30,12 @@ namespace DamageAssesment.Api.Responses.Services | |||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<Survey> getSurveyAsync(int surveyId) |         public async Task<Survey> getSurveyAsync(int surveyId, string token) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:SurveyById"), surveyId); |                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:SurveyById"), surveyId); | ||||||
|                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null); |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null, token); | ||||||
|                 var survey = JsonConvert.DeserializeObject<Survey>(responseJsonString); |                 var survey = JsonConvert.DeserializeObject<Survey>(responseJsonString); | ||||||
|  |  | ||||||
|                 if (survey == null) |                 if (survey == null) | ||||||
|  | |||||||
| @ -1,4 +1,5 @@ | |||||||
| using DamageAssesment.Api.Surveys.Interfaces; | using DamageAssesment.Api.Surveys.Interfaces; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
| using Microsoft.AspNetCore.Mvc; | using Microsoft.AspNetCore.Mvc; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Surveys.Controllers | namespace DamageAssesment.Api.Surveys.Controllers | ||||||
| @ -15,6 +16,7 @@ namespace DamageAssesment.Api.Surveys.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// GET request for retrieving surveys. |         /// GET request for retrieving surveys. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles ="admin,survey,user,report")] | ||||||
|         [Route("surveys")] |         [Route("surveys")] | ||||||
|         [Route("surveys/{language:alpha}")] |         [Route("surveys/{language:alpha}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -31,6 +33,7 @@ namespace DamageAssesment.Api.Surveys.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// GET request for retrieving surveys by ID. |         /// GET request for retrieving surveys by ID. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [Route("surveys/{id:int}")] |         [Route("surveys/{id:int}")] | ||||||
|         [Route("surveys/{id:int}/{language:alpha}")] |         [Route("surveys/{id:int}/{language:alpha}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
| @ -46,6 +49,7 @@ namespace DamageAssesment.Api.Surveys.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// POST request for creating a new survey. |         /// POST request for creating a new survey. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|         [HttpPost("surveys")] |         [HttpPost("surveys")] | ||||||
|         public async Task<ActionResult> PostSurveysAsync(Models.Survey survey) |         public async Task<ActionResult> PostSurveysAsync(Models.Survey survey) | ||||||
|         { |         { | ||||||
| @ -59,6 +63,8 @@ namespace DamageAssesment.Api.Surveys.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// PUT request for updating an existing survey (surveyId,Updated Survey data). |         /// PUT request for updating an existing survey (surveyId,Updated Survey data). | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |  | ||||||
|  |         [Authorize(Roles = "admin,survey")] | ||||||
|         [HttpPut("surveys/{id}")] |         [HttpPut("surveys/{id}")] | ||||||
|         public async Task<ActionResult> PutSurveysAsync(int id, Models.Survey survey) |         public async Task<ActionResult> PutSurveysAsync(int id, Models.Survey survey) | ||||||
|         { |         { | ||||||
| @ -76,6 +82,7 @@ namespace DamageAssesment.Api.Surveys.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// DELETE request for deleting a survey by ID. |         /// DELETE request for deleting a survey by ID. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,survey")] | ||||||
|         [HttpDelete("surveys/{id}")] |         [HttpDelete("surveys/{id}")] | ||||||
|         public async Task<ActionResult> DeleteSurveysAsync(int id) |         public async Task<ActionResult> DeleteSurveysAsync(int id) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore; | |||||||
| using Microsoft.IdentityModel.Tokens; | using Microsoft.IdentityModel.Tokens; | ||||||
| using System.Text; | using System.Text; | ||||||
| using System.Reflection; | using System.Reflection; | ||||||
|  | using Microsoft.OpenApi.Models; | ||||||
|  |  | ||||||
| var builder = WebApplication.CreateBuilder(args); | var builder = WebApplication.CreateBuilder(args); | ||||||
|  |  | ||||||
| @ -34,14 +35,44 @@ builder.Services.AddControllers(); | |||||||
| builder.Services.AddScoped<ISurveyProvider, SurveysProvider>(); | builder.Services.AddScoped<ISurveyProvider, SurveysProvider>(); | ||||||
| builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); | builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); | ||||||
| builder.Services.AddEndpointsApiExplorer(); | builder.Services.AddEndpointsApiExplorer(); | ||||||
| //builder.Services.AddSwaggerGen(); |  | ||||||
| builder.Services.AddSwaggerGen(c => | builder.Services.AddSwaggerGen(options => | ||||||
| { | { | ||||||
|     // Include XML comments from your assembly |     // Include XML comments from your assembly | ||||||
|     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; |     var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; | ||||||
|     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); |     var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); | ||||||
|     c.IncludeXmlComments(xmlPath); |     options.IncludeXmlComments(xmlPath); | ||||||
|  |  | ||||||
|  |     OpenApiSecurityScheme securityDefinition = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Name = "Bearer", | ||||||
|  |         BearerFormat = "JWT", | ||||||
|  |         Scheme = "bearer", | ||||||
|  |         Description = "Specify the authorization token.", | ||||||
|  |         In = ParameterLocation.Header, | ||||||
|  |         Type = SecuritySchemeType.Http, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityDefinition("jwt_auth", securityDefinition); | ||||||
|  |  | ||||||
|  |     // Make sure swagger UI requires a Bearer token specified | ||||||
|  |     OpenApiSecurityScheme securityScheme = new OpenApiSecurityScheme() | ||||||
|  |     { | ||||||
|  |         Reference = new OpenApiReference() | ||||||
|  |         { | ||||||
|  |             Id = "jwt_auth", | ||||||
|  |             Type = ReferenceType.SecurityScheme | ||||||
|  |         } | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     OpenApiSecurityRequirement securityRequirements = new OpenApiSecurityRequirement() | ||||||
|  |     { | ||||||
|  |         {securityScheme, new string[] { }}, | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     options.AddSecurityRequirement(securityRequirements); | ||||||
| }); | }); | ||||||
|  |  | ||||||
| builder.Services.AddDbContext<SurveysDbContext>(option => | builder.Services.AddDbContext<SurveysDbContext>(option => | ||||||
| { | { | ||||||
|     option.UseInMemoryDatabase("Surveys"); |     option.UseInMemoryDatabase("Surveys"); | ||||||
|  | |||||||
| @ -179,6 +179,11 @@ namespace DamageAssesment.Api.Surveys.Providers | |||||||
|             { |             { | ||||||
|                 if (survey != null) |                 if (survey != null) | ||||||
|                 { |                 { | ||||||
|  |                     if (survey.StartDate != null && survey.EndDate != null) | ||||||
|  |                     { | ||||||
|  |                         if(survey.StartDate.Value>survey.EndDate.Value) | ||||||
|  |                             return (false, null, $"Survey start date should be less than enddate"); | ||||||
|  |                     } | ||||||
|                     survey.CreatedDate = DateTime.Now; |                     survey.CreatedDate = DateTime.Now; | ||||||
|                     Db.Survey _survey = mapper.Map<Models.Survey, Db.Survey>(survey); |                     Db.Survey _survey = mapper.Map<Models.Survey, Db.Survey>(survey); | ||||||
|  |  | ||||||
| @ -215,6 +220,11 @@ namespace DamageAssesment.Api.Surveys.Providers | |||||||
|             { |             { | ||||||
|                 if (survey != null) |                 if (survey != null) | ||||||
|                 { |                 { | ||||||
|  |                     if (survey.StartDate != null && survey.EndDate != null) | ||||||
|  |                     { | ||||||
|  |                         if (survey.StartDate.Value > survey.EndDate.Value) | ||||||
|  |                             return (false, null, $"Survey start date should be less than enddate"); | ||||||
|  |                     } | ||||||
|                     var _survey = await surveyDbContext.Surveys.AsNoTracking().Where(s => s.Id == Id).SingleOrDefaultAsync(); |                     var _survey = await surveyDbContext.Surveys.AsNoTracking().Where(s => s.Id == Id).SingleOrDefaultAsync(); | ||||||
|  |  | ||||||
|                     if (_survey != null) |                     if (_survey != null) | ||||||
|  | |||||||
| @ -0,0 +1,30 @@ | |||||||
|  | <Project Sdk="Microsoft.NET.Sdk"> | ||||||
|  |  | ||||||
|  |   <PropertyGroup> | ||||||
|  |     <TargetFramework>net6.0</TargetFramework> | ||||||
|  |     <ImplicitUsings>enable</ImplicitUsings> | ||||||
|  |     <Nullable>enable</Nullable> | ||||||
|  |  | ||||||
|  |     <IsPackable>false</IsPackable> | ||||||
|  |     <IsTestProject>true</IsTestProject> | ||||||
|  |   </PropertyGroup> | ||||||
|  |  | ||||||
|  |   <ItemGroup> | ||||||
|  |     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" /> | ||||||
|  |     <PackageReference Include="Moq" Version="4.18.4" /> | ||||||
|  |     <PackageReference Include="xunit" Version="2.4.2" /> | ||||||
|  |     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |     </PackageReference> | ||||||
|  |     <PackageReference Include="coverlet.collector" Version="3.1.2"> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |     </PackageReference> | ||||||
|  |   </ItemGroup> | ||||||
|  |  | ||||||
|  |   <ItemGroup> | ||||||
|  |     <ProjectReference Include="..\DamageAssesment.Api.UsersAccess\DamageAssesment.Api.UsersAccess.csproj" /> | ||||||
|  |   </ItemGroup> | ||||||
|  |  | ||||||
|  | </Project> | ||||||
| @ -0,0 +1,44 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Models; | ||||||
|  | using System; | ||||||
|  | using System.Collections.Generic; | ||||||
|  | using System.Linq; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  | using Xunit.Sdk; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Test | ||||||
|  | { | ||||||
|  |     public class MockData | ||||||
|  |     { | ||||||
|  |         public static async Task<(bool, Models.TokenResponse, string)> getTokenResponse(bool status, string message) | ||||||
|  |         { | ||||||
|  |             return (status, new Models.TokenResponse { jwttoken = "1234", refreshtoken = "12345" }, message); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task<(bool, List<User>, string)> getUsers(bool status, string message) | ||||||
|  |         { | ||||||
|  |             List<User> users = new List<User>(); | ||||||
|  |             users.Add(new User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now }); | ||||||
|  |             users.Add(new User { Id = 2, EmployeeCode = "Emp2", EmployeeId = 2, RoleId = 1, IsActive = true, CreateDate = DateTime.Now }); | ||||||
|  |             users.Add(new User { Id = 3, EmployeeCode = "Emp3", EmployeeId = 3, RoleId = 1, IsActive = true, CreateDate = DateTime.Now }); | ||||||
|  |             return (status, users, message); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task<(bool, User, string)> getUser(bool status, string message) | ||||||
|  |         { | ||||||
|  |             User user = getUsers(status, message).Result.Item2.FirstOrDefault(); | ||||||
|  |             return (status, user, message); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public static async Task<(bool, List<Role>, string)> getRoles(bool status, string message) | ||||||
|  |         { | ||||||
|  |             List<Role> roles = new List<Role>(); | ||||||
|  |             roles.Add(new Role { Id = 1, Name = "Role 1" }); | ||||||
|  |             roles.Add(new Role { Id = 2, Name = "Role 2" }); | ||||||
|  |             roles.Add(new Role { Id = 3, Name = "Role 3" }); | ||||||
|  |  | ||||||
|  |             return (status, roles, message); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,194 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Controllers; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Interfaces; | ||||||
|  | using Microsoft.AspNetCore.Mvc; | ||||||
|  | using Moq; | ||||||
|  | using Xunit; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Test | ||||||
|  | { | ||||||
|  |     public class UsersAccessTest | ||||||
|  |     { | ||||||
|  |         private Mock<IUsersAccessProvider> mockService; | ||||||
|  |  | ||||||
|  |         public UsersAccessTest() | ||||||
|  |         { | ||||||
|  |             mockService = new Mock<IUsersAccessProvider>(); | ||||||
|  |         } | ||||||
|  |         [Fact(DisplayName = "Get Token - Ok case")] | ||||||
|  |         public async Task GetTokenAsync_ShouldReturnStatusCode200() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getTokenResponse(true,null); | ||||||
|  |             mockService.Setup(service => service.AuthenticateAsync("Emp1")).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (OkObjectResult)await controller.AuthenticateAsync("Emp1"); | ||||||
|  |             Assert.Equal(200, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "Get Token - Unauthorized case")] | ||||||
|  |         public async Task GetTokenAsync_ShouldReturnStatusCode401() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getTokenResponse(false, null); | ||||||
|  |             mockService.Setup(service => service.AuthenticateAsync("Emp1")).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (UnauthorizedObjectResult)await controller.AuthenticateAsync("Emp1"); | ||||||
|  |             Assert.Equal(401, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "RefreshToken - Ok case")] | ||||||
|  |         public async Task RefreshTokenAsync_ShouldReturnStatusCode200() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getTokenResponse(true, null); | ||||||
|  |             mockService.Setup(service => service.RefreshTokenAsync(null)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (OkObjectResult)await controller.RefreshTokenAsync(null); | ||||||
|  |             Assert.Equal(200, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "RefreshToken - Unauthorized case")] | ||||||
|  |         public async Task RefreshTokenAsync_ShouldReturnStatusCode401() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getTokenResponse(false, null); | ||||||
|  |             mockService.Setup(service => service.RefreshTokenAsync(null)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (UnauthorizedObjectResult)await controller.RefreshTokenAsync(null); | ||||||
|  |             Assert.Equal(401, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "GetUsers - Ok case")] | ||||||
|  |         public async Task GetUsersAsync_ShouldReturnStatusCode200() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUsers(true, null); | ||||||
|  |             mockService.Setup(service => service.GetUsersAsync()).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (OkObjectResult)await controller.GetUsersAsync(); | ||||||
|  |             Assert.Equal(200, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "GetUsers - NoContent case")] | ||||||
|  |         public async Task GetUsersAsync_ShouldReturnStatusCode204() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUsers(false, null); | ||||||
|  |             mockService.Setup(service => service.GetUsersAsync()).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (NoContentResult)await controller.GetUsersAsync(); | ||||||
|  |             Assert.Equal(204, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "GetUser - Ok case")] | ||||||
|  |         public async Task GetUserAsync_ShouldReturnStatusCode200() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUser(true, null); | ||||||
|  |             mockService.Setup(service => service.GetUsersAsync(1)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (OkObjectResult)await controller.GetUsersAsync(1); | ||||||
|  |             Assert.Equal(200, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "GetUser - NotFound case")] | ||||||
|  |         public async Task GetUserAsync_ShouldReturnStatusCode204() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUser(false, null); | ||||||
|  |             mockService.Setup(service => service.GetUsersAsync(1)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (NotFoundResult)await controller.GetUsersAsync(1); | ||||||
|  |             Assert.Equal(404, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "GetRoles - Ok case")] | ||||||
|  |         public async Task GetRolesAsync_ShouldReturnStatusCode200() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getRoles(true, null); | ||||||
|  |             mockService.Setup(service => service.GetRolesAsync()).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (OkObjectResult)await controller.GetRolesAsync(); | ||||||
|  |             Assert.Equal(200, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "GetRoles - NoContent case")] | ||||||
|  |         public async Task GetRolesAsync_ShouldReturnStatusCode204() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getRoles(false, null); | ||||||
|  |             mockService.Setup(service => service.GetRolesAsync()).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (NoContentResult)await controller.GetRolesAsync(); | ||||||
|  |             Assert.Equal(204, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "PostUser - Ok case")] | ||||||
|  |         public async Task PostUserAsync_ShouldReturnStatusCode200() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUser(true, null); | ||||||
|  |             var user = new Models.User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now }; | ||||||
|  |             mockService.Setup(service => service.PostUserAsync(user)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (OkObjectResult)await controller.PostUserAsync(user); | ||||||
|  |             Assert.Equal(200, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "PostUser - Bad Request case")] | ||||||
|  |         public async Task PostUserAsync_ShouldReturnStatusCode400() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUser(false, null); | ||||||
|  |             var user = new Models.User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now }; | ||||||
|  |             mockService.Setup(service => service.PostUserAsync(user)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (BadRequestObjectResult)await controller.PostUserAsync(user); | ||||||
|  |             Assert.Equal(400, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "PutUser - Ok case")] | ||||||
|  |         public async Task PutUserAsync_ShouldReturnStatusCode200() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUser(true, null); | ||||||
|  |             var user = new Models.User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now }; | ||||||
|  |             mockService.Setup(service => service.PutUserAsync(1,user)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (OkObjectResult)await controller.PutUserAsync(1,user); | ||||||
|  |             Assert.Equal(200, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "PutUser - BadRequest case")] | ||||||
|  |         public async Task PutUserAsync_ShouldReturnStatusCode400() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUser(false, null); | ||||||
|  |             var user = new Models.User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now }; | ||||||
|  |             mockService.Setup(service => service.PutUserAsync(1,user)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (BadRequestObjectResult)await controller.PutUserAsync(1,user); | ||||||
|  |             Assert.Equal(400, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "PutUser - Not Found case")] | ||||||
|  |         public async Task PutUserAsync_ShouldReturnStatusCode404() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUser(false, "Not Found"); | ||||||
|  |             var user = new Models.User { Id = 1, EmployeeCode = "Emp1", EmployeeId = 1, RoleId = 1, IsActive = true, CreateDate = DateTime.Now }; | ||||||
|  |             mockService.Setup(service => service.PutUserAsync(1, user)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (NotFoundObjectResult)await controller.PutUserAsync(1,user); | ||||||
|  |             Assert.Equal(404, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "DeleteUser - Ok case")] | ||||||
|  |         public async Task DeleteUserAsync_ShouldReturnStatusCode200() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUser(true, null); | ||||||
|  |                     mockService.Setup(service => service.DeleteUserAsync(1)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (OkObjectResult)await controller.DeleteUserAsync(1); | ||||||
|  |             Assert.Equal(200, result.StatusCode); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Fact(DisplayName = "DeleteUser - Not Found case")] | ||||||
|  |         public async Task DeleteUserAsync_ShouldReturnStatusCode404() | ||||||
|  |         { | ||||||
|  |             var response = await MockData.getUser(false, "Not Found"); | ||||||
|  |             mockService.Setup(service => service.DeleteUserAsync(1)).ReturnsAsync(response); | ||||||
|  |             var controller = new UsersAccessController(mockService.Object); | ||||||
|  |             var result = (NotFoundResult)await controller.DeleteUserAsync(1); | ||||||
|  |             Assert.Equal(404, result.StatusCode); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,127 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Interfaces; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Models; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
|  | using Microsoft.AspNetCore.Mvc; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Controllers | ||||||
|  | { | ||||||
|  |     [ApiController] | ||||||
|  |     public class UsersAccessController : ControllerBase | ||||||
|  |     { | ||||||
|  |         private IUsersAccessProvider userAccessProvider; | ||||||
|  |  | ||||||
|  |         public UsersAccessController(IUsersAccessProvider userAccessProvider) | ||||||
|  |         { | ||||||
|  |             this.userAccessProvider = userAccessProvider; | ||||||
|  |         } | ||||||
|  |         [HttpPost("dadeschooltoken")] | ||||||
|  |         public async Task<ActionResult> DadeSchoolAuthenticateAsync(string username, string password) | ||||||
|  |         { | ||||||
|  |             var result = await userAccessProvider.DadeSchoolAuthenticateAsync(username, password); | ||||||
|  |             if (result.IsSuccess) | ||||||
|  |             { | ||||||
|  |                 return Ok(result.TokenResponse); | ||||||
|  |             } | ||||||
|  |             return Unauthorized(result.ErrorMessage); | ||||||
|  |         } | ||||||
|  |         [Authorize(Policy = "Dadeschools")] | ||||||
|  |         [HttpPost("token/{employecode}")] | ||||||
|  |         public async Task<ActionResult> AuthenticateAsync(string employecode) | ||||||
|  |         { | ||||||
|  |               var result = await userAccessProvider.AuthenticateAsync(employecode); | ||||||
|  |               if (result.IsSuccess) | ||||||
|  |               { | ||||||
|  |                   return Ok(result.TokenResponse); | ||||||
|  |               } | ||||||
|  |               return Unauthorized(result.ErrorMessage); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Authorize(Policy = "Dadeschools")] | ||||||
|  |         [HttpPost("refreshtoken")] | ||||||
|  |         public async Task<ActionResult> RefreshTokenAsync(TokenResponse tokenResponse) | ||||||
|  |         { | ||||||
|  |             var result = await userAccessProvider.RefreshTokenAsync(tokenResponse); | ||||||
|  |             if (result.IsSuccess) | ||||||
|  |             { | ||||||
|  |                 return Ok(result.TokenResponse); | ||||||
|  |             } | ||||||
|  |             return Unauthorized(result.ErrorMessage); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Authorize(Policy = "DamageApp", Roles ="admin")] | ||||||
|  |         [HttpGet("users")] | ||||||
|  |         public async Task<ActionResult> GetUsersAsync() | ||||||
|  |         { | ||||||
|  |             var result = await userAccessProvider.GetUsersAsync(); | ||||||
|  |             if (result.IsSuccess) | ||||||
|  |             { | ||||||
|  |                 return Ok(result.Users); | ||||||
|  |             } | ||||||
|  |             return NoContent(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Authorize(Policy = "DamageApp", Roles = "admin")] | ||||||
|  |         [HttpGet("users/{Id}")] | ||||||
|  |         public async Task<ActionResult> GetUsersAsync(int Id) | ||||||
|  |         { | ||||||
|  |             var result = await userAccessProvider.GetUsersAsync(Id); | ||||||
|  |             if (result.IsSuccess) | ||||||
|  |             { | ||||||
|  |                 return Ok(result.User); | ||||||
|  |             } | ||||||
|  |             return NotFound(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Authorize(Policy = "DamageApp", Roles = "admin")] | ||||||
|  |         [HttpGet("roles")] | ||||||
|  |         public async Task<ActionResult> GetRolesAsync() | ||||||
|  |         { | ||||||
|  |             var result = await userAccessProvider.GetRolesAsync(); | ||||||
|  |             if (result.IsSuccess) | ||||||
|  |             { | ||||||
|  |                 return Ok(result.Roles); | ||||||
|  |             } | ||||||
|  |             return NoContent(); | ||||||
|  |         } | ||||||
|  |         [Authorize(Policy = "DamageApp", Roles = "admin")] | ||||||
|  |         [HttpPost("users")] | ||||||
|  |         public async Task<ActionResult> PostUserAsync(User user) | ||||||
|  |         { | ||||||
|  |             var result = await userAccessProvider.PostUserAsync(user); | ||||||
|  |             if (result.IsSuccess) | ||||||
|  |             { | ||||||
|  |                 return Ok(result.User); | ||||||
|  |             } | ||||||
|  |             return BadRequest(result.ErrorMessage); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Authorize(Policy = "DamageApp", Roles = "admin")] | ||||||
|  |         [HttpPut("users/{Id}")] | ||||||
|  |         public async Task<ActionResult> PutUserAsync(int Id, User user) | ||||||
|  |         { | ||||||
|  |             var result = await userAccessProvider.PutUserAsync(Id, user); | ||||||
|  |             if (result.IsSuccess) | ||||||
|  |             { | ||||||
|  |                 return Ok(result.User); | ||||||
|  |             } | ||||||
|  |             if (result.ErrorMessage == "Not Found") | ||||||
|  |                 return NotFound(result.ErrorMessage); | ||||||
|  |  | ||||||
|  |             return BadRequest(result.ErrorMessage); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         [Authorize(Policy = "DamageApp", Roles = "admin")] | ||||||
|  |         [HttpDelete("users/{Id}")] | ||||||
|  |         public async Task<ActionResult> DeleteUserAsync(int Id) | ||||||
|  |         { | ||||||
|  |             var result = await userAccessProvider.DeleteUserAsync(Id); | ||||||
|  |             if (result.IsSuccess) | ||||||
|  |             { | ||||||
|  |                 return Ok(result.User); | ||||||
|  |             } | ||||||
|  |             return NotFound(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,23 @@ | |||||||
|  | <Project Sdk="Microsoft.NET.Sdk.Web"> | ||||||
|  |  | ||||||
|  |   <PropertyGroup> | ||||||
|  |     <TargetFramework>net6.0</TargetFramework> | ||||||
|  |     <Nullable>enable</Nullable> | ||||||
|  |     <ImplicitUsings>enable</ImplicitUsings> | ||||||
|  |     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS> | ||||||
|  |     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath> | ||||||
|  |   </PropertyGroup> | ||||||
|  |  | ||||||
|  |   <ItemGroup> | ||||||
|  |     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> | ||||||
|  |     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" /> | ||||||
|  |     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> | ||||||
|  |     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.10" /> | ||||||
|  |     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" /> | ||||||
|  |     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> | ||||||
|  |     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> | ||||||
|  |   </ItemGroup> | ||||||
|  |  | ||||||
|  | </Project> | ||||||
| @ -0,0 +1,21 @@ | |||||||
|  | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  | using System.Text.Json.Serialization; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Db | ||||||
|  | { | ||||||
|  |     public class Role | ||||||
|  |     { | ||||||
|  |         [Key] | ||||||
|  |         public int Id { get; set; } | ||||||
|  |  | ||||||
|  |         [StringLength(100)] | ||||||
|  |         [Required] | ||||||
|  |         public string Name { get; set; } | ||||||
|  |  | ||||||
|  |         // add a status field | ||||||
|  |  | ||||||
|  |         [StringLength(100)] | ||||||
|  |         public string? Description { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,17 @@ | |||||||
|  | using Microsoft.EntityFrameworkCore.Metadata.Internal; | ||||||
|  | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Db | ||||||
|  | { | ||||||
|  |     public  class Token | ||||||
|  |     { | ||||||
|  |         [Key] | ||||||
|  |         public int Id { get; set; } | ||||||
|  |         [Required] | ||||||
|  |         [ForeignKey("User")] | ||||||
|  |         public int UserId { get; set; } | ||||||
|  |         public string? RefreshToken { get; set; } | ||||||
|  |         public bool? IsActive { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,31 @@ | |||||||
|  | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  | using System.Text.Json.Serialization; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Db | ||||||
|  | { | ||||||
|  |     public class User | ||||||
|  |     { | ||||||
|  |         [Key] | ||||||
|  |         public int Id { get; set; } | ||||||
|  |  | ||||||
|  |         [ForeignKey("Employee")] | ||||||
|  |         public int EmployeeId { get; set; } | ||||||
|  |  | ||||||
|  |         [Required] | ||||||
|  |         [StringLength(50)] | ||||||
|  |         public string EmployeeCode { get; set; } | ||||||
|  |  | ||||||
|  |         [ForeignKey("Role")] | ||||||
|  |         [Required] | ||||||
|  |         public int RoleId { get; set; } | ||||||
|  |         [Required] | ||||||
|  |         public bool IsActive { get; set; } = true; | ||||||
|  |  | ||||||
|  |         [Required] | ||||||
|  |         public DateTime CreateDate { get; set; } = DateTime.Now; | ||||||
|  |  | ||||||
|  |         public DateTime? UpdateDate { get; set; } | ||||||
|  |  | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,32 @@ | |||||||
|  | using Microsoft.EntityFrameworkCore; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Db | ||||||
|  | { | ||||||
|  |     public class UsersAccessDbContext : DbContext | ||||||
|  |     { | ||||||
|  |         public DbSet<Db.User> Users { get; set; } | ||||||
|  |         public DbSet<Db.Role> Roles { get; set; } | ||||||
|  |         public DbSet<Db.Token> Tokens { get; set; } | ||||||
|  |         public UsersAccessDbContext(DbContextOptions options) : base(options) | ||||||
|  |         { | ||||||
|  |  | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         protected override void OnModelCreating(ModelBuilder modelBuilder) | ||||||
|  |         { | ||||||
|  |             base.OnModelCreating(modelBuilder); | ||||||
|  |  | ||||||
|  |             modelBuilder.Entity<User>() | ||||||
|  |                 .Property(item => item.Id) | ||||||
|  |                 .ValueGeneratedOnAdd(); | ||||||
|  |  | ||||||
|  |             modelBuilder.Entity<Role>() | ||||||
|  |             .Property(item => item.Id) | ||||||
|  |             .ValueGeneratedOnAdd(); | ||||||
|  |  | ||||||
|  |             modelBuilder.Entity<Token>() | ||||||
|  |             .Property(item => item.Id) | ||||||
|  |             .ValueGeneratedOnAdd(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,10 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Models; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Interfaces | ||||||
|  | { | ||||||
|  |     public interface IEmployeeServiceProvider | ||||||
|  |     { | ||||||
|  |         Task<List<Employee>> getEmployeesAsync(string token); | ||||||
|  |         Task<Employee> getEmployeeAsync(int employeeId, string token); | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,9 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Models; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Interfaces  | ||||||
|  | {  | ||||||
|  |     public interface IHttpUtil | ||||||
|  |     { | ||||||
|  |         Task<string> SendAsync(HttpMethod method, string url, string JsonInput, string token); | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,12 @@ | |||||||
|  | namespace DamageAssesment.Api.UsersAccess.Interfaces | ||||||
|  | { | ||||||
|  |     public interface IRoleProvider | ||||||
|  |     { | ||||||
|  |        Task<(bool IsSuccess, IEnumerable< Models.Role> Roles, string ErrorMessage)> GetRolesAsync(); | ||||||
|  |        Task<(bool IsSuccess, Models.Role Roles, string ErrorMessage)> GetRolesAsync(int Id); | ||||||
|  |        Task<(bool IsSuccess, Models.Role Role, string ErrorMessage)> PostRoleAsync(Models.Role Role); | ||||||
|  |        Task<(bool IsSuccess, Models.Role Role, string ErrorMessage)> PutRoleAsync(int Id,Models.Role Role); | ||||||
|  |        Task<(bool IsSuccess, Models.Role Role, string ErrorMessage)> DeleteRoleAsync(int Id); | ||||||
|  |  | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,11 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Models; | ||||||
|  | using System.Security.Claims; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Interfaces | ||||||
|  | { | ||||||
|  |     public interface ITokenServiceProvider | ||||||
|  |     { | ||||||
|  |         Task<string> GenerateToken(Models.User user); | ||||||
|  |         Task<TokenResponse> TokenAuthenticate(Models.User user, Claim[] claims); | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,18 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Models; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Interfaces | ||||||
|  | { | ||||||
|  |     public interface IUsersAccessProvider | ||||||
|  |     { | ||||||
|  |        public Task<(bool IsSuccess, IEnumerable<object> Users, string ErrorMessage)> GetUsersAsync(); | ||||||
|  |         public Task<(bool IsSuccess, object User, string ErrorMessage)> GetUsersAsync(int Id); | ||||||
|  |         public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PostUserAsync(Models.User User); | ||||||
|  |         public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PutUserAsync(int Id,Models.User User); | ||||||
|  |         public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> DeleteUserAsync(int Id); | ||||||
|  |         public Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync(); | ||||||
|  |         public  Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employeCode); | ||||||
|  |         public Task<(bool IsSuccess, Models.DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password); | ||||||
|  |         public Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)>RefreshTokenAsync(TokenResponse tokenResponse); | ||||||
|  |         public void seedData(); | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,10 @@ | |||||||
|  | namespace DamageAssesment.Api.UsersAccess.Models | ||||||
|  | { | ||||||
|  |     public class DadeSchoolToken | ||||||
|  |     { | ||||||
|  |         public string access_token { get; set; } | ||||||
|  |         public int expires_in { get; set; } | ||||||
|  |         public string token_type { get; set; } | ||||||
|  |         public string scope { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,14 @@ | |||||||
|  | namespace DamageAssesment.Api.UsersAccess.Models | ||||||
|  | { | ||||||
|  |     public class Employee | ||||||
|  |     { | ||||||
|  |         public int Id { get; set; } | ||||||
|  |         public string EmployeeCode { get; set; } | ||||||
|  |         public string Name { get; set; } | ||||||
|  |         public DateTime BirthDate { get; set; } | ||||||
|  |         public string OfficePhoneNumber { get; set; } | ||||||
|  |         public string Email { get; set; } | ||||||
|  |         public bool IsActive { get; set; } | ||||||
|  |         public string PreferredLanguage { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,9 @@ | |||||||
|  | using System.ComponentModel.DataAnnotations; | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Models | ||||||
|  | { | ||||||
|  |  | ||||||
|  |     public class JwtSettings | ||||||
|  |     { | ||||||
|  |         public string securitykey { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,8 @@ | |||||||
|  | namespace DamageAssesment.Api.UsersAccess.Models | ||||||
|  | { | ||||||
|  |     public class Role {  | ||||||
|  |         public int Id { get; set; } | ||||||
|  |         public string Name { get; set; } | ||||||
|  |         public string Description { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,10 @@ | |||||||
|  | namespace DamageAssesment.Api.UsersAccess.Models | ||||||
|  | { | ||||||
|  |     public  class Token | ||||||
|  |     {  | ||||||
|  |         public string Id { get; set; } | ||||||
|  |         public int UserId { get; set; }  | ||||||
|  |         public string RefreshToken { get; set; } | ||||||
|  |         public bool IsActive { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,8 @@ | |||||||
|  | namespace DamageAssesment.Api.UsersAccess.Models | ||||||
|  | { | ||||||
|  |     public class TokenResponse | ||||||
|  |     { | ||||||
|  |         public string? jwttoken { get; set; } | ||||||
|  |         public string? refreshtoken { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,13 @@ | |||||||
|  | namespace DamageAssesment.Api.UsersAccess.Models | ||||||
|  | { | ||||||
|  |     public class User | ||||||
|  |     { | ||||||
|  |         public int Id { get; set; } | ||||||
|  |         public int EmployeeId { get; set; } | ||||||
|  |         public string EmployeeCode { get; set; } | ||||||
|  |         public int RoleId { get; set; } | ||||||
|  |         public bool IsActive { get; set; } | ||||||
|  |         public DateTime CreateDate { get; set; } | ||||||
|  |         public DateTime UpdateDate { get; set; } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,5 @@ | |||||||
|  | public class UserCredentials | ||||||
|  | { | ||||||
|  |     public string username { get; set; } | ||||||
|  |    // public string? password { get; set; } | ||||||
|  | } | ||||||
| @ -0,0 +1,14 @@ | |||||||
|  | namespace DamageAssesment.Api.UsersAccess.Profiles | ||||||
|  | { | ||||||
|  |     public class UsersAccessProfile : AutoMapper.Profile | ||||||
|  |     { | ||||||
|  |         public UsersAccessProfile() | ||||||
|  |         { | ||||||
|  |             CreateMap<Db.User, Models.User>(); | ||||||
|  |             CreateMap<Models.User, Db.User>(); | ||||||
|  |  | ||||||
|  |             CreateMap<Db.Role, Models.Role>(); | ||||||
|  |             CreateMap<Models.Role, Db.Role>(); | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
							
								
								
									
										147
									
								
								DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										147
									
								
								DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,147 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Db; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Interfaces; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Providers; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Models; | ||||||
|  | using Microsoft.EntityFrameworkCore; | ||||||
|  | using Microsoft.IdentityModel.Tokens; | ||||||
|  | using System.Text; | ||||||
|  | using Polly; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Services; | ||||||
|  | using Microsoft.OpenApi.Models; | ||||||
|  | using System.Reflection; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
|  |  | ||||||
|  | const int maxApiCallRetries = 3; | ||||||
|  | const int intervalToRetry = 2; //2 seconds | ||||||
|  | const int maxRetryForCircuitBraker = 5; | ||||||
|  | const int intervalForCircuitBraker = 5; //5 seconds | ||||||
|  |  | ||||||
|  | var builder = WebApplication.CreateBuilder(args); | ||||||
|  |  | ||||||
|  | // Add services to the container. | ||||||
|  | var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey"); | ||||||
|  |  | ||||||
|  |  | ||||||
|  | builder.Services.AddAuthentication(). | ||||||
|  |     AddJwtBearer("DamageApp", 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 | ||||||
|  |     }; | ||||||
|  | }).AddJwtBearer("Dadeschools", options => | ||||||
|  | { | ||||||
|  |     options.Authority = builder.Configuration["Dadeschools:Authority"]; | ||||||
|  |     options.TokenValidationParameters.ValidTypes = new[] { "at+jwt" }; | ||||||
|  |     options.TokenValidationParameters.ValidateAudience = false; | ||||||
|  | }); | ||||||
|  |  | ||||||
|  |  | ||||||
|  | builder.Services.AddAuthorization(options => | ||||||
|  | { | ||||||
|  |     var DamageAppPolicy = new AuthorizationPolicyBuilder() | ||||||
|  |         .RequireAuthenticatedUser() | ||||||
|  |         .AddAuthenticationSchemes("DamageApp") | ||||||
|  |         .Build(); | ||||||
|  |     var DadeschoolsPolicy = new AuthorizationPolicyBuilder() | ||||||
|  |         .RequireAuthenticatedUser() | ||||||
|  |         .AddAuthenticationSchemes("Dadeschools") | ||||||
|  |         .Build(); | ||||||
|  |     var allPolicy = new AuthorizationPolicyBuilder() | ||||||
|  |         .RequireAuthenticatedUser() | ||||||
|  |         .AddAuthenticationSchemes("DamageApp", "Dadeschools") | ||||||
|  |         .Build(); | ||||||
|  |     options.AddPolicy("DamageApp", DamageAppPolicy); | ||||||
|  |     options.AddPolicy("Dadeschools", DadeschoolsPolicy); | ||||||
|  |     options.AddPolicy("AllPolicies", allPolicy); | ||||||
|  |     options.DefaultPolicy = options.GetPolicy("DamageApp")!; | ||||||
|  | }); | ||||||
|  |  | ||||||
|  | var _jwtsettings = builder.Configuration.GetSection("JwtSettings"); | ||||||
|  | builder.Services.Configure<JwtSettings>(_jwtsettings); | ||||||
|  | builder.Services.AddHttpContextAccessor(); | ||||||
|  |  | ||||||
|  | builder.Services.AddControllers(); | ||||||
|  | // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle | ||||||
|  | builder.Services.AddScoped<IUsersAccessProvider, UsersAccessProvider>(); | ||||||
|  | builder.Services.AddScoped<ITokenServiceProvider, TokenServiceProvider>(); | ||||||
|  | builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>(); | ||||||
|  |  | ||||||
|  | builder.Services.AddHttpClient<IHttpUtil, HttpUtil>(). | ||||||
|  |     AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))). | ||||||
|  |     AddTransientHttpErrorPolicy(policy => policy.CircuitBreakerAsync(maxRetryForCircuitBraker, TimeSpan.FromSeconds(intervalForCircuitBraker))); | ||||||
|  |  | ||||||
|  | builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); | ||||||
|  | builder.Services.AddEndpointsApiExplorer(); | ||||||
|  | //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<UsersAccessDbContext>(option => | ||||||
|  | { | ||||||
|  |     option.UseInMemoryDatabase("UsersAccess"); | ||||||
|  | }); | ||||||
|  | var app = builder.Build(); | ||||||
|  |  | ||||||
|  | // Configure the HTTP request pipeline. | ||||||
|  | if (app.Environment.IsDevelopment()) | ||||||
|  | { | ||||||
|  |     app.UseSwagger(); | ||||||
|  |     app.UseSwaggerUI(); | ||||||
|  |  | ||||||
|  |     using (var serviceScope = app.Services.CreateScope()) | ||||||
|  |     { | ||||||
|  |         var services = serviceScope.ServiceProvider; | ||||||
|  |         var usersAccessProvider = services.GetRequiredService<IUsersAccessProvider>(); | ||||||
|  |         usersAccessProvider.seedData(); | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | app.UseAuthentication(); | ||||||
|  | app.UseAuthorization(); | ||||||
|  |  | ||||||
|  | app.MapControllers(); | ||||||
|  | app.Run(); | ||||||
| @ -0,0 +1,37 @@ | |||||||
|  | { | ||||||
|  |   "profiles": { | ||||||
|  |     "DamageAssesment.Api.Users": { | ||||||
|  |       "commandName": "Project", | ||||||
|  |       "launchBrowser": true, | ||||||
|  |       "launchUrl": "swagger", | ||||||
|  |       "environmentVariables": { | ||||||
|  |         "ASPNETCORE_ENVIRONMENT": "Development" | ||||||
|  |       }, | ||||||
|  |       "dotnetRunMessages": true, | ||||||
|  |       "applicationUrl": "http://localhost:5027" | ||||||
|  |     }, | ||||||
|  |     "IIS Express": { | ||||||
|  |       "commandName": "IISExpress", | ||||||
|  |       "launchBrowser": true, | ||||||
|  |       "launchUrl": "swagger", | ||||||
|  |       "environmentVariables": { | ||||||
|  |         "ASPNETCORE_ENVIRONMENT": "Development" | ||||||
|  |       } | ||||||
|  |     }, | ||||||
|  |     "Docker": { | ||||||
|  |       "commandName": "Docker", | ||||||
|  |       "launchBrowser": true, | ||||||
|  |       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger", | ||||||
|  |       "publishAllPorts": true | ||||||
|  |     } | ||||||
|  |   }, | ||||||
|  |   "$schema": "https://json.schemastore.org/launchsettings.json", | ||||||
|  |   "iisSettings": { | ||||||
|  |     "windowsAuthentication": false, | ||||||
|  |     "anonymousAuthentication": true, | ||||||
|  |     "iisExpress": { | ||||||
|  |       "applicationUrl": "http://localhost:28382", | ||||||
|  |       "sslPort": 0 | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  | } | ||||||
| @ -0,0 +1,381 @@ | |||||||
|  | using AutoMapper; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Db; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Interfaces; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Models; | ||||||
|  | using Microsoft.AspNetCore.Http; | ||||||
|  | using Microsoft.EntityFrameworkCore; | ||||||
|  | using Microsoft.Extensions.Options; | ||||||
|  | using Microsoft.IdentityModel.Tokens; | ||||||
|  | using Newtonsoft.Json; | ||||||
|  | using Newtonsoft.Json.Linq; | ||||||
|  | using System.Data; | ||||||
|  | using System.IdentityModel.Tokens.Jwt; | ||||||
|  | using System.Security.Claims; | ||||||
|  | using System.Text; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Providers | ||||||
|  | { | ||||||
|  |     public class UsersAccessProvider : IUsersAccessProvider | ||||||
|  |     { | ||||||
|  |         private readonly UsersAccessDbContext userAccessDbContext; | ||||||
|  |         private readonly ILogger<UsersAccessProvider> logger; | ||||||
|  |         private readonly IMapper mapper; | ||||||
|  |         private readonly IEmployeeServiceProvider employeeServiceProvider; | ||||||
|  |         private readonly JwtSettings jwtSettings; | ||||||
|  |         private readonly ITokenServiceProvider tokenServiceProvider; | ||||||
|  |         private readonly IConfiguration configuration; | ||||||
|  |         private readonly IHttpContextAccessor httpContextAccessor; | ||||||
|  |  | ||||||
|  |         public UsersAccessProvider(IConfiguration configuration,IOptions<JwtSettings> options, ITokenServiceProvider tokenServiceProvider, IHttpContextAccessor httpContextAccessor, UsersAccessDbContext userAccessDbContext, IEmployeeServiceProvider employeeServiceProvider, ILogger<UsersAccessProvider> logger, IMapper mapper) | ||||||
|  |         { | ||||||
|  |             this.userAccessDbContext = userAccessDbContext; | ||||||
|  |             this.employeeServiceProvider = employeeServiceProvider; | ||||||
|  |             this.logger = logger; | ||||||
|  |             this.mapper = mapper; | ||||||
|  |             jwtSettings = options.Value; | ||||||
|  |             this.tokenServiceProvider = tokenServiceProvider; | ||||||
|  |             this.httpContextAccessor = httpContextAccessor; | ||||||
|  |             this.configuration = configuration; | ||||||
|  |             seedData(); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public void seedData() | ||||||
|  |         { | ||||||
|  |             if (!userAccessDbContext.Users.Any()) | ||||||
|  |             { | ||||||
|  |                 userAccessDbContext.Users.Add(new Db.User { Id = 1, EmployeeId = 1, EmployeeCode = "Emp1", RoleId = 1, IsActive = true, CreateDate = DateTime.Now }); | ||||||
|  |                 userAccessDbContext.Users.Add(new Db.User { Id = 2, EmployeeId = 2, EmployeeCode = "Emp2", RoleId = 2, IsActive = true, CreateDate = DateTime.Now }); | ||||||
|  |                 userAccessDbContext.Users.Add(new Db.User { Id = 3, EmployeeId = 3, EmployeeCode = "Emp3", RoleId = 3, IsActive = true, CreateDate = DateTime.Now }); | ||||||
|  |                 userAccessDbContext.SaveChanges(); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             if (!userAccessDbContext.Roles.Any()) | ||||||
|  |             { | ||||||
|  |                 userAccessDbContext.Roles.Add(new Db.Role { Id = 1, Name = "admin", Description ="Administrator role have full access" }); | ||||||
|  |                 userAccessDbContext.Roles.Add(new Db.Role { Id = 2, Name = "user", Description =" User role"}); | ||||||
|  |                 userAccessDbContext.Roles.Add(new Db.Role { Id = 3, Name = "survey", Description ="Survey role" }); | ||||||
|  |                 userAccessDbContext.Roles.Add(new Db.Role { Id = 4, Name = "report", Description ="Report role"}); | ||||||
|  |                 userAccessDbContext.Roles.Add(new Db.Role { Id = 5, Name = "document", Description ="Document role" }); | ||||||
|  |                 userAccessDbContext.SaveChanges(); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         private string GetToken() | ||||||
|  |         { | ||||||
|  |             string token = httpContextAccessor.HttpContext.Request.Headers.Authorization; | ||||||
|  |             if (token != null) | ||||||
|  |             { | ||||||
|  |                 token = token.Replace("Bearer ", string.Empty); | ||||||
|  |             } | ||||||
|  |             else | ||||||
|  |             { | ||||||
|  |                 token = ""; | ||||||
|  |             } | ||||||
|  |             return token; | ||||||
|  |         } | ||||||
|  |         public async Task<(bool IsSuccess, IEnumerable<object> Users, string ErrorMessage)> GetUsersAsync() | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 logger?.LogInformation("Gell all Users from DB"); | ||||||
|  |                 var users = await userAccessDbContext.Users.ToListAsync(); | ||||||
|  |                 List<object> userslist= new List<object>(); | ||||||
|  |                 if (users != null) | ||||||
|  |                 { | ||||||
|  |                     var employees = await employeeServiceProvider.getEmployeesAsync( GetToken()); | ||||||
|  |                     var roles = await userAccessDbContext.Roles.ToListAsync(); | ||||||
|  |                     foreach (Db.User user in users) | ||||||
|  |                     { | ||||||
|  |                         var employee = employees.SingleOrDefault(a=>a.Id==user.EmployeeId); | ||||||
|  |                         var role = roles.SingleOrDefault(s => s.Id == user.RoleId); | ||||||
|  |                         userslist.Add(new | ||||||
|  |                         { | ||||||
|  |                             Id = user.Id, | ||||||
|  |                             EmployeeId = user.EmployeeId, | ||||||
|  |                             EmployeeCode = user.EmployeeCode, | ||||||
|  |                             EmployeeName = (employee != null) ? employee.Name : null, | ||||||
|  |                             RoleId = user.RoleId, | ||||||
|  |                             RoleName = (role != null) ? role.Name : null | ||||||
|  |                         }); | ||||||
|  |                     } | ||||||
|  |                     logger?.LogInformation($"{users.Count} Items(s) found"); | ||||||
|  |                    // var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users); | ||||||
|  |                     return (true, userslist, null); | ||||||
|  |                 } | ||||||
|  |                 return (false, null, "Not found"); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         public async Task<(bool IsSuccess, object User, string ErrorMessage)> GetUsersAsync(int Id) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 logger?.LogInformation("Querying Users table"); | ||||||
|  |                  | ||||||
|  |                 var user = await userAccessDbContext.Users.SingleOrDefaultAsync(s => s.Id == Id); | ||||||
|  |                 if (user != null) | ||||||
|  |                 { | ||||||
|  |                     var employee = await employeeServiceProvider.getEmployeeAsync(user.EmployeeId,GetToken()); | ||||||
|  |                     var role = await userAccessDbContext.Roles.SingleOrDefaultAsync(s => s.Id == user.RoleId); | ||||||
|  |                     var data = new | ||||||
|  |                     { | ||||||
|  |                         Id = user.Id, | ||||||
|  |                         EmployeeId = user.EmployeeId, | ||||||
|  |                         EmployeeCode=user.EmployeeCode, | ||||||
|  |                         EmployeeName = (employee != null) ? employee.Name : null, | ||||||
|  |                         RoleId = user.RoleId, | ||||||
|  |                         RoleName = (role!=null)?role.Name:null | ||||||
|  |                     }; | ||||||
|  |                     logger?.LogInformation($"User Id: {Id} found"); | ||||||
|  |                     var result = mapper.Map<Db.User, Models.User>(user); | ||||||
|  |                     return (true, data, null); | ||||||
|  |                 } | ||||||
|  |                 return (false, null, "Not found"); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PostUserAsync(Models.User user) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 if (user != null) | ||||||
|  |                 { | ||||||
|  |                     var _user = mapper.Map<Models.User, Db.User>(user); | ||||||
|  |                     userAccessDbContext.Users.Add(_user); | ||||||
|  |                     user.Id = _user.Id; | ||||||
|  |                     await userAccessDbContext.SaveChangesAsync(); | ||||||
|  |                     return (true, user, "Successful"); | ||||||
|  |                 } | ||||||
|  |                 else | ||||||
|  |                 { | ||||||
|  |                     logger?.LogInformation($"null object cannot be added"); | ||||||
|  |                     return (false, null, $"null object cannot be added"); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PutUserAsync(int Id, Models.User user) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 if (user != null) | ||||||
|  |                 { | ||||||
|  |                     var _user = await userAccessDbContext.Users.AsNoTracking().Where(s => s.Id == Id).SingleOrDefaultAsync(); | ||||||
|  |  | ||||||
|  |                     if (_user != null) | ||||||
|  |                     { | ||||||
|  |                         int count = userAccessDbContext.Users.Where(u => u.Id != user.Id).Count(); | ||||||
|  |                         if (count == 0) | ||||||
|  |                         { | ||||||
|  |                             await userAccessDbContext.SaveChangesAsync(); | ||||||
|  |                             logger?.LogInformation($"Employee Id:  {user.EmployeeId} updated successfuly"); | ||||||
|  |                             return (true, mapper.Map<Db.User, Models.User>(_user), $"Employee Id:  {_user.EmployeeId} updated successfuly"); | ||||||
|  |                         } | ||||||
|  |                         else | ||||||
|  |                         { | ||||||
|  |                             logger?.LogInformation($"Employee Id:  {user.EmployeeId} is already exist"); | ||||||
|  |                             return (false, null, $"Employee Id:  {user.EmployeeId} is already exist"); | ||||||
|  |                         } | ||||||
|  |                     } | ||||||
|  |                     else | ||||||
|  |                     { | ||||||
|  |                         logger?.LogInformation($"User Id : {Id} Not found"); | ||||||
|  |                         return (false, null, "Not Found"); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 else | ||||||
|  |                 { | ||||||
|  |                     logger?.LogInformation($"User Id: {Id} Bad Request"); | ||||||
|  |                     return (false, null, "Bad request"); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<(bool IsSuccess, Models.User User, string ErrorMessage)> DeleteUserAsync(int Id) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 var user = await userAccessDbContext.Users.Where(x => x.Id == Id).SingleOrDefaultAsync(); | ||||||
|  |  | ||||||
|  |                 if (user != null) | ||||||
|  |                 { | ||||||
|  |                     userAccessDbContext.Users.Remove(user); | ||||||
|  |                     await userAccessDbContext.SaveChangesAsync(); | ||||||
|  |                     logger?.LogInformation($"User Id: {Id} deleted Successfuly"); | ||||||
|  |                     return (true, mapper.Map<Db.User, Models.User>(user), $"User Id: {Id} deleted Successfuly"); | ||||||
|  |                 } | ||||||
|  |                 else | ||||||
|  |                 { | ||||||
|  |                     logger?.LogInformation($"User Id : {Id} Not found"); | ||||||
|  |                     return (false, null, "Not Found"); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employecode) | ||||||
|  |         { | ||||||
|  |            | ||||||
|  |             if (employecode != null) | ||||||
|  |               { | ||||||
|  |                 //implementation for dadeschools authentication | ||||||
|  |                 // var employees = await employeeServiceProvider.getEmployeesAsync(); | ||||||
|  |                 // var employee = employees.Where(e=> e.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault(); | ||||||
|  |                 var user = userAccessDbContext.Users.Where(x => x.IsActive == true && x.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault(); | ||||||
|  |         | ||||||
|  |                           if (user != null) | ||||||
|  |                           { | ||||||
|  |  | ||||||
|  |                               var r = await GetRolesAsync(); | ||||||
|  |                               var role = r.Roles.Where(x => x.Id == user.RoleId).SingleOrDefault(); | ||||||
|  |  | ||||||
|  |                               var authClaims = new List<Claim> { | ||||||
|  |                                new Claim(ClaimTypes.Name, user.EmployeeCode), | ||||||
|  |                                new Claim(ClaimTypes.Role, role.Name), | ||||||
|  |                                new Claim(JwtRegisteredClaimNames.Jti,Guid.NewGuid().ToString()) | ||||||
|  |  | ||||||
|  |                               }; | ||||||
|  |  | ||||||
|  |                               /// Generate Token | ||||||
|  |                               var tokenhandler = new JwtSecurityTokenHandler(); | ||||||
|  |                               var tokenkey = Encoding.UTF8.GetBytes(jwtSettings.securitykey); | ||||||
|  |                               var tokendesc = new SecurityTokenDescriptor | ||||||
|  |                               { | ||||||
|  |                                   Audience = "", | ||||||
|  |                                   NotBefore = DateTime.Now, | ||||||
|  |                                   Subject = new ClaimsIdentity(authClaims), | ||||||
|  |                                   Expires = DateTime.Now.AddMinutes(30), | ||||||
|  |                                   SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(tokenkey), SecurityAlgorithms.HmacSha256) | ||||||
|  |                               }; | ||||||
|  |                               var token = tokenhandler.CreateToken(tokendesc); | ||||||
|  |                               string finaltoken = tokenhandler.WriteToken(token); | ||||||
|  |  | ||||||
|  |                               var response = new TokenResponse() { jwttoken = finaltoken, refreshtoken = await tokenServiceProvider.GenerateToken(mapper.Map<Db.User,Models.User>(user)) }; | ||||||
|  |                               return (true, response, "Authentication success and token issued."); | ||||||
|  |                           } | ||||||
|  |                           else | ||||||
|  |                           { | ||||||
|  |                               return (false, null, "user inactive or not exist."); | ||||||
|  |                           } | ||||||
|  |                   } | ||||||
|  |  | ||||||
|  |               else | ||||||
|  |               { | ||||||
|  |                   return (false, null, "Credentials are required to authenticate."); | ||||||
|  |               } | ||||||
|  |         } | ||||||
|  |         public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 var client = new HttpClient(); | ||||||
|  |                 var request = new HttpRequestMessage(HttpMethod.Post, configuration.GetValue<string>("Dadeschools:TokenUrl")); | ||||||
|  |                 var collection = new List<KeyValuePair<string, string>>(); | ||||||
|  |                 collection.Add(new("client_id", configuration.GetValue<string>("Dadeschools:TokenClientId"))); | ||||||
|  |                 collection.Add(new("client_secret", configuration.GetValue<string>("Dadeschools:TokenClientSecret"))); | ||||||
|  |                 collection.Add(new("scope", configuration.GetValue<string>("Dadeschools:scope"))); | ||||||
|  |                 collection.Add(new("grant_type", configuration.GetValue<string>("Dadeschools:grant_type"))); | ||||||
|  |                 collection.Add(new("username", username)); | ||||||
|  |                 collection.Add(new("password", password)); | ||||||
|  |                 var content = new FormUrlEncodedContent(collection); | ||||||
|  |                 request.Content = content; | ||||||
|  |                 var response = await client.SendAsync(request); | ||||||
|  |                 var responseString = await response.Content.ReadAsStringAsync(); | ||||||
|  |                 if (response.IsSuccessStatusCode) | ||||||
|  |                 { | ||||||
|  |                     return (true, JsonConvert.DeserializeObject<DadeSchoolToken>(responseString), ""); | ||||||
|  |                 } | ||||||
|  |                 return (false, null, responseString); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |         } | ||||||
|  |         public async Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync() | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 logger?.LogInformation("Gell all Roles from DB"); | ||||||
|  |                 var roles = await userAccessDbContext.Roles.ToListAsync(); | ||||||
|  |                 if (roles != null) | ||||||
|  |                 { | ||||||
|  |                     logger?.LogInformation($"{roles.Count} Items(s) found"); | ||||||
|  |                     var result = mapper.Map<IEnumerable<Db.Role>, IEnumerable<Models.Role>>(roles); | ||||||
|  |                     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.TokenResponse TokenResponse, string ErrorMessage)> RefreshTokenAsync(TokenResponse tokenResponse) | ||||||
|  |         { | ||||||
|  |             //Generate token | ||||||
|  |             var tokenhandler = new JwtSecurityTokenHandler(); | ||||||
|  |             var tokenkey = Encoding.UTF8.GetBytes(this.jwtSettings.securitykey); | ||||||
|  |             SecurityToken securityToken; | ||||||
|  |             var principal = tokenhandler.ValidateToken(tokenResponse.jwttoken, new TokenValidationParameters | ||||||
|  |             { | ||||||
|  |                 ValidateIssuerSigningKey = true, | ||||||
|  |                 IssuerSigningKey = new SymmetricSecurityKey(tokenkey), | ||||||
|  |                 ValidateIssuer = false, | ||||||
|  |                 ValidateAudience = false, | ||||||
|  |  | ||||||
|  |             }, out securityToken); | ||||||
|  |  | ||||||
|  |             var token = securityToken as JwtSecurityToken; | ||||||
|  |             if (token != null && !token.Header.Alg.Equals(SecurityAlgorithms.HmacSha256)) | ||||||
|  |             { | ||||||
|  |                 return (false, null, "Unauthorized"); | ||||||
|  |             } | ||||||
|  |             var username = principal.Identity?.Name; | ||||||
|  |  | ||||||
|  |             var tokens = await userAccessDbContext.Tokens.ToListAsync(); | ||||||
|  |             var users = await userAccessDbContext.Users.ToListAsync(); | ||||||
|  |  | ||||||
|  |             var user = (from u in users | ||||||
|  |                         join t in tokens | ||||||
|  |                         on u.Id equals t.UserId | ||||||
|  |                         where u.EmployeeId == 1 | ||||||
|  |                         && t.RefreshToken == tokenResponse.refreshtoken | ||||||
|  |                         select u).FirstOrDefault(); | ||||||
|  |  | ||||||
|  |             if (user == null) | ||||||
|  |                 return (false, null, "Invalid Token Response object provided"); | ||||||
|  |  | ||||||
|  |             var _user = mapper.Map<Db.User, Models.User>(user); | ||||||
|  |             var response = tokenServiceProvider.TokenAuthenticate(_user, principal.Claims.ToArray()).Result; | ||||||
|  |             return (true, response, "Token authenticated and refreshed."); | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,50 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Interfaces; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Models; | ||||||
|  | using Newtonsoft.Json; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Services | ||||||
|  | { | ||||||
|  |     public class EmployeeServiceProvider : ServiceProviderBase, IEmployeeServiceProvider | ||||||
|  |     { | ||||||
|  |         public EmployeeServiceProvider(IConfiguration configuration, IHttpUtil httpUtil, ILogger<EmployeeServiceProvider> logger) : base(configuration, httpUtil, logger, configuration.GetValue<string>("RessourceSettings:Employee"), configuration.GetValue<string>("EndPointSettings:EmployeeUrlBase")) | ||||||
|  |         { | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<List<Employee>> getEmployeesAsync(string token) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token); | ||||||
|  |                 var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString); | ||||||
|  |  | ||||||
|  |                 if (employees == null || !employees.Any()) | ||||||
|  |                     return new List<Employee>(); | ||||||
|  |                 else return employees; | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError($"Exception Found : {ex.Message} - Ref: EmployeeServiceProvider.getEmployeesAsync()"); | ||||||
|  |                 return new List<Employee>(); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<Employee> getEmployeeAsync(int employeeId, string token) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:EmployeeById"), employeeId); | ||||||
|  |                 var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token); | ||||||
|  |                 var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString); | ||||||
|  |  | ||||||
|  |                 if (employee == null) | ||||||
|  |                     return null; | ||||||
|  |                 else return employee; | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError($"Exception Found : {ex.Message} - Ref: EmployeeServiceProvider.getEmployeeAsync()"); | ||||||
|  |                 return null; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,42 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Interfaces; | ||||||
|  | using System.Net.Http.Headers; | ||||||
|  | using System.Text; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Services | ||||||
|  | { | ||||||
|  |     public class HttpUtil : IHttpUtil | ||||||
|  |     { | ||||||
|  |         private readonly HttpClient httpClient; | ||||||
|  |         private readonly ILogger<HttpUtil> logger; | ||||||
|  |  | ||||||
|  |         public HttpUtil(HttpClient httpClient, ILogger<HttpUtil> logger) | ||||||
|  |         { | ||||||
|  |             this.httpClient = httpClient; | ||||||
|  |             this.logger = logger; | ||||||
|  |         } | ||||||
|  |         public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput,string token) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 var request = new HttpRequestMessage(method, url); | ||||||
|  |                 request.Headers.Accept.Clear(); | ||||||
|  |                 request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json")); | ||||||
|  |  | ||||||
|  |                 request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token); | ||||||
|  |                 if (method == HttpMethod.Post) | ||||||
|  |                 { | ||||||
|  |                     request.Content = new StringContent(JsonInput, Encoding.UTF8, "application/json"); | ||||||
|  |                 } | ||||||
|  |                 var response = await httpClient.SendAsync(request, CancellationToken.None); | ||||||
|  |                 response.EnsureSuccessStatusCode(); | ||||||
|  |                 var responseString = await response.Content.ReadAsStringAsync(); | ||||||
|  |                 return responseString; | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError($"Exception Message : {ex.Message} - Ref: HttpUtil.SendAsync()"); | ||||||
|  |                 return null; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,25 @@ | |||||||
|  | using DamageAssesment.Api.UsersAccess.Interfaces; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Services | ||||||
|  | { | ||||||
|  |     public class ServiceProviderBase | ||||||
|  |     { | ||||||
|  |         protected readonly IConfiguration configuration; | ||||||
|  |         protected readonly IHttpUtil httpUtil; | ||||||
|  |         protected readonly ILogger<ServiceProviderBase> logger; | ||||||
|  |         protected string ressource; | ||||||
|  |         protected string urlBase; | ||||||
|  |         protected string url; | ||||||
|  |  | ||||||
|  |  | ||||||
|  |         public ServiceProviderBase(IConfiguration configuration, IHttpUtil httpUtil, ILogger<ServiceProviderBase> logger, string ressource, string urlBase) | ||||||
|  |         { | ||||||
|  |             this.configuration = configuration; | ||||||
|  |             this.httpUtil = httpUtil; | ||||||
|  |             this.logger = logger; | ||||||
|  |             this.ressource = ressource; | ||||||
|  |             this.urlBase = urlBase; | ||||||
|  |             url = urlBase + ressource; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,59 @@ | |||||||
|  | using System.IdentityModel.Tokens.Jwt; | ||||||
|  | using System.Security.Claims; | ||||||
|  | using System.Security.Cryptography; | ||||||
|  | using System.Text; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Db; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Interfaces; | ||||||
|  | using DamageAssesment.Api.UsersAccess.Models; | ||||||
|  | using Microsoft.EntityFrameworkCore; | ||||||
|  | using Microsoft.Extensions.Options; | ||||||
|  | using Microsoft.IdentityModel.Tokens; | ||||||
|  |  | ||||||
|  | namespace DamageAssesment.Api.UsersAccess.Services | ||||||
|  | { | ||||||
|  |     public class TokenServiceProvider : ITokenServiceProvider | ||||||
|  |     { | ||||||
|  |         private readonly UsersAccessDbContext usersAccessDbContext; | ||||||
|  |         private readonly JwtSettings jwtSettings; | ||||||
|  |         public TokenServiceProvider(IOptions<JwtSettings> options, UsersAccessDbContext usersAccessDbContext) | ||||||
|  |         { | ||||||
|  |             this.usersAccessDbContext = usersAccessDbContext; | ||||||
|  |             this.jwtSettings = options.Value; | ||||||
|  |         } | ||||||
|  |         public async Task<string> GenerateToken(Models.User user) | ||||||
|  |         { | ||||||
|  |             var randomnumber = new byte[32]; | ||||||
|  |             using (var ramdomnumbergenerator = RandomNumberGenerator.Create()) | ||||||
|  |             { | ||||||
|  |                 ramdomnumbergenerator.GetBytes(randomnumber); | ||||||
|  |                 string refreshtoken = Convert.ToBase64String(randomnumber); | ||||||
|  |                 var token = await usersAccessDbContext.Tokens.FirstOrDefaultAsync(item => item.UserId == user.Id); | ||||||
|  |                 if (token != null) | ||||||
|  |                 { | ||||||
|  |                     token.RefreshToken = refreshtoken; | ||||||
|  |                 } | ||||||
|  |                 else | ||||||
|  |                 { | ||||||
|  |                     usersAccessDbContext.Tokens.Add(new Db.Token() | ||||||
|  |                     { | ||||||
|  |                         UserId = user.Id, | ||||||
|  |                         RefreshToken = refreshtoken, | ||||||
|  |                         IsActive = true | ||||||
|  |                     }); | ||||||
|  |                 } | ||||||
|  |                 await usersAccessDbContext.SaveChangesAsync(); | ||||||
|  |  | ||||||
|  |                 return refreshtoken; | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<TokenResponse> TokenAuthenticate(Models.User user, Claim[] claims) | ||||||
|  |         { | ||||||
|  |             var token = new JwtSecurityToken(claims: claims, expires: DateTime.Now.AddSeconds(20), | ||||||
|  |               signingCredentials: new SigningCredentials(new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtSettings.securitykey)), SecurityAlgorithms.HmacSha256) | ||||||
|  |             ); | ||||||
|  |             var jwttoken = new JwtSecurityTokenHandler().WriteToken(token); | ||||||
|  |             return new TokenResponse() { jwttoken = jwttoken, refreshtoken = await GenerateToken(user) }; | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -0,0 +1,8 @@ | |||||||
|  | { | ||||||
|  |   "Logging": { | ||||||
|  |     "LogLevel": { | ||||||
|  |       "Default": "Information", | ||||||
|  |       "Microsoft.AspNetCore": "Warning" | ||||||
|  |     } | ||||||
|  |   } | ||||||
|  | } | ||||||
| @ -0,0 +1,40 @@ | |||||||
|  | { | ||||||
|  |   "JwtSettings": { | ||||||
|  |     "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk=" | ||||||
|  |   }, | ||||||
|  |   "Logging": { | ||||||
|  |     "LogLevel": { | ||||||
|  |       "Default": "Information", | ||||||
|  |       "Microsoft.AspNetCore": "Warning" | ||||||
|  |     } | ||||||
|  |   }, | ||||||
|  |   "EndPointSettings": { | ||||||
|  |     "EmployeeUrlBase": "http://localhost:5135" | ||||||
|  |   }, | ||||||
|  |   "RessourceSettings": { | ||||||
|  |     "Employee": "/Employees", | ||||||
|  |     "EmployeeById": "/Employees/{0}" | ||||||
|  |   }, | ||||||
|  |   "AllowedHosts": "*", | ||||||
|  |   "Dadeschools": { | ||||||
|  |     "Authority": "https://dev-graph.dadeschools.net", | ||||||
|  |     "TokenUrl": "https://dev-graph.dadeschools.net/connect/token", | ||||||
|  |     "ClientId": "dmapi", | ||||||
|  |     "ClientSecret": "bfce2c8d-2064-4a02-b19d-7f1d42b16eae", | ||||||
|  |     "TokenClientId": "damage_assessment_postman", | ||||||
|  |     "TokenClientSecret": "e4774164-f018-44c9-b9d2-3a29fc21db3c", | ||||||
|  |     "scope": "openid profile", | ||||||
|  |     "grant_type": "password", | ||||||
|  |     "Name": "Dadeschools Identity Server" | ||||||
|  |   }, | ||||||
|  |   "Scopes": [ | ||||||
|  |     { | ||||||
|  |       "Name": "openid", | ||||||
|  |       "Description": "Request an authentication token on your behalf" | ||||||
|  |     }, | ||||||
|  |     { | ||||||
|  |       "Name": "profile", | ||||||
|  |       "Description": "Read basic information about you such as your date of brith and full name" | ||||||
|  |     } | ||||||
|  |   ] | ||||||
|  | } | ||||||
| @ -41,6 +41,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Respons | |||||||
| EndProject | EndProject | ||||||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses.Test", "DamageAssesment.Api.Responses.Test\DamageAssesment.Api.Responses.Test.csproj", "{26BFCF59-0D24-41C1-9202-D4FFCC52389B}" | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses.Test", "DamageAssesment.Api.Responses.Test\DamageAssesment.Api.Responses.Test.csproj", "{26BFCF59-0D24-41C1-9202-D4FFCC52389B}" | ||||||
| EndProject | EndProject | ||||||
|  | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.UsersAccess", "DamageAssesment.Api.UsersAccess\DamageAssesment.Api.UsersAccess.csproj", "{40240AD6-90D2-4128-BCDF-12C77D1B1B55}" | ||||||
|  | EndProject | ||||||
|  | Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.UsersAccess.Test", "DamageAssesment.Api.UsersAccess.Test\DamageAssesment.Api.UsersAccess.Test.csproj", "{ADAF9385-262C-4A37-A603-A53B77EA515D}" | ||||||
|  | EndProject | ||||||
| Global | Global | ||||||
| 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | 	GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||||||
| 		Debug|Any CPU = Debug|Any CPU | 		Debug|Any CPU = Debug|Any CPU | ||||||
| @ -111,6 +115,14 @@ Global | |||||||
| 		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Debug|Any CPU.Build.0 = Debug|Any CPU | 		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||||
| 		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Release|Any CPU.ActiveCfg = Release|Any CPU | 		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||||
| 		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Release|Any CPU.Build.0 = Release|Any CPU | 		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Release|Any CPU.Build.0 = Release|Any CPU | ||||||
|  | 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||||
|  | 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||||
|  | 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||||
|  | 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Release|Any CPU.Build.0 = Release|Any CPU | ||||||
|  | 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||||||
|  | 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||||||
|  | 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||||||
|  | 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Release|Any CPU.Build.0 = Release|Any CPU | ||||||
| 	EndGlobalSection | 	EndGlobalSection | ||||||
| 	GlobalSection(SolutionProperties) = preSolution | 	GlobalSection(SolutionProperties) = preSolution | ||||||
| 		HideSolutionNode = FALSE | 		HideSolutionNode = FALSE | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	