forked from MDCPS/DamageAssessment_Backend
		
	Compare commits
	
		
			83 Commits
		
	
	
		
			dev
			...
			Token-Serv
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 947ee16281 | |||
| 2a2418c85e | |||
| 9353d6ab2c | |||
| 5644762e00 | |||
| 1b638d9367 | |||
| 073fbac743 | |||
| 5eb9314e96 | |||
| 34b4adf0bf | |||
| 4b863687d3 | |||
| 735a5ee62c | |||
| eb28885f00 | |||
| 6d3f5dd5b8 | |||
| 2baf4b9dad | |||
| 4f478585cf | |||
| 556dc5e4e7 | |||
| 01bfa9c4b5 | |||
| 6bdbcb8e57 | |||
| 2a73324ff7 | |||
| 9b8e8ffad2 | |||
| dd5351665e | |||
| ff4e8de3f3 | |||
| c014739fc0 | |||
| 70d0043e25 | |||
| ff3847ecae | |||
| 7baff934ab | |||
| 28de758da0 | |||
| bb87f1c8e0 | |||
| 52869afc3f | |||
| 71b8031577 | |||
| 4936e3e6f1 | |||
| 30b8d1ff9f | |||
| 79beaf55fa | |||
| 8c12477763 | |||
| cc9ce4dbe5 | |||
| 3cd0c5f39e | |||
| 334c327559 | |||
| 87fa29d9d4 | |||
| 2ab8f37489 | |||
| 500582020b | |||
| ede178042f | |||
| 6575c2f219 | |||
| 69584e6c91 | |||
| 1cbd6893d8 | |||
| 79a3073bea | |||
| bdde55b3e5 | |||
| cd982d160a | |||
| 9b88029a09 | |||
| 3b9e13ad35 | |||
| dca119758a | |||
| 8285588db9 | |||
| fc166e65c9 | |||
| ae6b306290 | |||
| d3a751a6ad | |||
| 2182b9a6b3 | |||
| e2bed66428 | |||
| 8624eeeb97 | |||
| 16d45d6632 | |||
| c77e0452c4 | |||
| 6ad5bb1572 | |||
| 8e0a7df68b | |||
| cb3c7f8f6a | |||
| 01ccd97528 | |||
| 26b360e0a9 | |||
| 360a58c026 | |||
| 26e79432e2 | |||
| 11c6fc0dc9 | |||
| 99633d8dda | |||
| 8e3f6674c6 | |||
| 885fdeb117 | |||
| 14956057cd | |||
| fa3e3bbd99 | |||
| 340ba6fa6d | |||
| 46794057c4 | |||
| 71d4b524e7 | |||
| c7a2dc5910 | |||
| 643bc0c76a | |||
| d0023114a3 | |||
| 465bf4b081 | |||
| e04bccfffd | |||
| 0544c7397d | |||
| 9c536a1c52 | |||
| 48be1a74c9 | |||
| eb07c31ff6 | 
							
								
								
									
										
											BIN
										
									
								
								.vs/Backend-API-Services/v17/.wsuo
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								.vs/Backend-API-Services/v17/.wsuo
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										7
									
								
								.vs/VSWorkspaceState.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								.vs/VSWorkspaceState.json
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,7 @@ | |||||||
|  | { | ||||||
|  |   "ExpandedNodes": [ | ||||||
|  |     "" | ||||||
|  |   ], | ||||||
|  |   "SelectedNode": "\\DamageAssesment.sln", | ||||||
|  |   "PreviewInSolutionExplorer": false | ||||||
|  | } | ||||||
							
								
								
									
										1
									
								
								DamageAssesmentApi/.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								DamageAssesmentApi/.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -396,3 +396,4 @@ FodyWeavers.xsd | |||||||
|  |  | ||||||
| # JetBrains Rider | # JetBrains Rider | ||||||
| *.sln.iml | *.sln.iml | ||||||
|  | **/migrations/ | ||||||
| @ -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) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -13,7 +13,12 @@ | |||||||
|     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> |     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> | ||||||
|     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> |     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" /> | ||||||
|     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" /> |     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" /> | ||||||
|     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> |     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Answers.Db | namespace DamageAssesment.Api.Answers.Db | ||||||
| { | { | ||||||
|  |     [Table("Answers")] | ||||||
|     public class Answer |     public class Answer | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -1,13 +1,19 @@ | |||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | using Microsoft.Extensions.Configuration; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Answers.Db | namespace DamageAssesment.Api.Answers.Db | ||||||
| { | { | ||||||
|     public class AnswerDbContext:DbContext |     public class AnswerDbContext:DbContext | ||||||
|     { |     { | ||||||
|  |         private IConfiguration _Configuration { get; set; } | ||||||
|         public AnswerDbContext(DbContextOptions options):base(options)  |         public AnswerDbContext(DbContextOptions options,IConfiguration configuration):base(options)  | ||||||
|         { |         { | ||||||
|              |             _Configuration= configuration; | ||||||
|  |         } | ||||||
|  |         protected override void OnConfiguring(DbContextOptionsBuilder options) | ||||||
|  |         { | ||||||
|  |             // connect to sql server with connection string from app settings | ||||||
|  |             options.UseSqlServer(_Configuration.GetConnectionString("AnswerConnection")); | ||||||
|         } |         } | ||||||
|         public DbSet<Db.Answer> Answers { get; set; } |         public DbSet<Db.Answer> Answers { get; set; } | ||||||
|         protected override void OnModelCreating(ModelBuilder modelBuilder) |         protected override void OnModelCreating(ModelBuilder modelBuilder) | ||||||
|  | |||||||
| @ -1,29 +1,83 @@ | |||||||
| 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); | ||||||
|  | builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => { | ||||||
|  |     build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin(); | ||||||
|  | })); | ||||||
|  |  | ||||||
|  | var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey"); | ||||||
|  | builder.Services.AddAuthentication(item => | ||||||
|  | { | ||||||
|  |     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; | ||||||
|  |     item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; | ||||||
|  | }).AddJwtBearer(item => | ||||||
|  | { | ||||||
|  |     item.RequireHttpsMetadata = true; | ||||||
|  |     item.SaveToken = true; | ||||||
|  |     item.TokenValidationParameters = new TokenValidationParameters() | ||||||
|  |     { | ||||||
|  |         ValidateIssuerSigningKey = true, | ||||||
|  |         IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)), | ||||||
|  |         ValidateIssuer = false, | ||||||
|  |         ValidateAudience = false, | ||||||
|  |         ClockSkew = TimeSpan.Zero | ||||||
|  |     }; | ||||||
|  | }); | ||||||
| // Add services to the container. | // 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 | ||||||
| builder.Services.AddDbContext<AnswerDbContext>(option => | builder.Services.AddDbContext<AnswerDbContext>(option => | ||||||
| { | { | ||||||
|     option.UseInMemoryDatabase("Answers"); |     option.UseSqlServer("AnswerConnection"); | ||||||
| }); | }); | ||||||
|  |  | ||||||
| var app = builder.Build(); | var app = builder.Build(); | ||||||
| @ -35,7 +89,8 @@ if (app.Environment.IsDevelopment()) | |||||||
|     app.UseSwagger(); |     app.UseSwagger(); | ||||||
|     app.UseSwaggerUI(); |     app.UseSwaggerUI(); | ||||||
| } | } | ||||||
|  | app.UseCors("DamageAppCorsPolicy"); | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
|  |  | ||||||
| app.MapControllers(); | app.MapControllers(); | ||||||
|  | |||||||
| @ -198,13 +198,12 @@ namespace DamageAssesment.Api.Answers.Providers | |||||||
|         { |         { | ||||||
|             if (!answerDbContext.Answers.Any()) |             if (!answerDbContext.Answers.Any()) | ||||||
|             { |             { | ||||||
|                 answerDbContext.Answers.Add(new Db.Answer() { Id = 1, AnswerText = "Yes", Comment = "Comment test 4", QuestionId = 1, SurveyResponseId = 1 }); |                 answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 }); | ||||||
|                 answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 }); |                 answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 }); | ||||||
|                 // Uncomment the lines below to add more initial data if needed |                 //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 }); | ||||||
|                 //answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 }); |                 //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 }); | ||||||
|                 //answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 }); |                 //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 }); | ||||||
|                 //answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 }); |                 //answerDbContext.Answers.Add(new Db.Answer() {  AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 }); | ||||||
|                 //answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 }); |  | ||||||
|                 answerDbContext.SaveChanges(); |                 answerDbContext.SaveChanges(); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  | |||||||
| @ -8,5 +8,10 @@ | |||||||
|       "Microsoft.AspNetCore": "Warning" |       "Microsoft.AspNetCore": "Warning" | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "AllowedHosts": "*" |   "AllowedHosts": "*", | ||||||
|  |   "ConnectionStrings": { | ||||||
|  |     //"AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;" | ||||||
|  |     "AnswerConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;" | ||||||
|  |  | ||||||
|  |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -80,7 +80,7 @@ namespace DamageAssesment.Api.Attachments.Test | |||||||
|             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse); |             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse); | ||||||
|  |  | ||||||
|             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object); |             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object); | ||||||
|             var result = (NoContentResult) await AttachmentProvider.UploadAttachmentAsync(AttachmentResponse); |             var result = (NoContentResult)await AttachmentProvider.UploadAttachmentAsync(AttachmentResponse); | ||||||
|  |  | ||||||
|             Assert.Equal(204, result.StatusCode); |             Assert.Equal(204, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -95,8 +95,8 @@ namespace DamageAssesment.Api.Attachments.Test | |||||||
|             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse); |             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse); | ||||||
|  |  | ||||||
|             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object); |             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object); | ||||||
|             AttachmentInfo attachmentInfo=new AttachmentInfo(); |             AttachmentInfo attachmentInfo = new AttachmentInfo(); | ||||||
|             var result = (BadRequestObjectResult) await AttachmentProvider.UploadAttachmentAsync(attachmentInfo); |             var result = (BadRequestObjectResult)await AttachmentProvider.UploadAttachmentAsync(attachmentInfo); | ||||||
|  |  | ||||||
|             Assert.Equal(400, result.StatusCode); |             Assert.Equal(400, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -112,7 +112,7 @@ namespace DamageAssesment.Api.Attachments.Test | |||||||
|             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse); |             mockAttachmentService.Setup(service => service.PostAttachmentAsync(mockInputAttachment)).ReturnsAsync(mockResponse); | ||||||
|  |  | ||||||
|             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object); |             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object); | ||||||
|             var result = (NoContentResult) await AttachmentProvider.UpdateAttachmentAsync(AttachmentResponse); |             var result = (NoContentResult)await AttachmentProvider.UpdateAttachmentAsync(AttachmentResponse); | ||||||
|  |  | ||||||
|             Assert.Equal(204, result.StatusCode); |             Assert.Equal(204, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -128,7 +128,7 @@ namespace DamageAssesment.Api.Attachments.Test | |||||||
|  |  | ||||||
|             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object); |             var AttachmentProvider = new AttachmentsController(mockAttachmentService.Object, mockUploadService.Object); | ||||||
|             AttachmentInfo attachmentInfo = new AttachmentInfo(); |             AttachmentInfo attachmentInfo = new AttachmentInfo(); | ||||||
|             var result = (BadRequestObjectResult) await AttachmentProvider.UpdateAttachmentAsync(attachmentInfo); |             var result = (BadRequestObjectResult)await AttachmentProvider.UpdateAttachmentAsync(attachmentInfo); | ||||||
|  |  | ||||||
|             Assert.Equal(400, result.StatusCode); |             Assert.Equal(400, result.StatusCode); | ||||||
|         } |         } | ||||||
|  | |||||||
| @ -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; | ||||||
| @ -12,16 +13,17 @@ namespace DamageAssesment.Api.Attachments.Controllers | |||||||
|     { |     { | ||||||
|         private IAttachmentsProvider AttachmentProvider; |         private IAttachmentsProvider AttachmentProvider; | ||||||
|         private IUploadService UploadService; |         private IUploadService UploadService; | ||||||
|  |         private IAzureBlobService azureBlobService; | ||||||
|  |  | ||||||
|         public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService uploadService) |         public AttachmentsController(IAttachmentsProvider AttachmentsProvider, IUploadService UploadService) | ||||||
|         { |         { | ||||||
|             this.AttachmentProvider = AttachmentsProvider; |             this.AttachmentProvider = AttachmentsProvider; | ||||||
|             this.UploadService = uploadService;   |             this.UploadService = UploadService; | ||||||
|         } |         } | ||||||
|         /// <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 +39,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 +83,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) | ||||||
|         { |         { | ||||||
| @ -89,7 +92,7 @@ namespace DamageAssesment.Api.Attachments.Controllers | |||||||
|                 if (attachmentInfo.Answers.Count > 0) |                 if (attachmentInfo.Answers.Count > 0) | ||||||
|                 { |                 { | ||||||
|                     var Attachments =  await this.AttachmentProvider.GetAttachmentCounter(); |                     var Attachments =  await this.AttachmentProvider.GetAttachmentCounter(); | ||||||
|                     List<Models.Attachment> attachments = UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers); |                     List<Models.Attachment> attachments =  UploadService.UploadAttachment(attachmentInfo.ResponseId, Attachments.counter, attachmentInfo.Answers); | ||||||
|                     var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments); |                     var result =  await this.AttachmentProvider.PostAttachmentAsync(attachments); | ||||||
|                     if (result.IsSuccess) |                     if (result.IsSuccess) | ||||||
|                     { |                     { | ||||||
| @ -107,7 +110,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) | ||||||
|         { |         { | ||||||
| @ -118,7 +121,7 @@ namespace DamageAssesment.Api.Attachments.Controllers | |||||||
|                     var res =  await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers); |                     var res =  await this.AttachmentProvider.GetAttachmentInfo(attachmentInfo.Answers); | ||||||
|                     if (res.IsSuccess) |                     if (res.IsSuccess) | ||||||
|                     { |                     { | ||||||
|                         List<Models.Attachment> attachments = UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments); |                         List<Models.Attachment> attachments =  UploadService.UpdateAttachments(attachmentInfo.ResponseId, attachmentInfo.Answers, res.Attachments); | ||||||
|                         var result = await this.AttachmentProvider.PutAttachmentAsync(attachments); |                         var result = await this.AttachmentProvider.PutAttachmentAsync(attachments); | ||||||
|                         if (result.IsSuccess) |                         if (result.IsSuccess) | ||||||
|                         { |                         { | ||||||
| @ -136,8 +139,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) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -1 +0,0 @@ | |||||||
| sample |  | ||||||
| @ -14,8 +14,19 @@ | |||||||
|     <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.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.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> | ||||||
|  |     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" /> |     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" /> | ||||||
|     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> |     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Attachments.Db | namespace DamageAssesment.Api.Attachments.Db | ||||||
| { | { | ||||||
|  |     [Table("AnswerAttachments")] | ||||||
|     public class Attachment |     public class Attachment | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -1,11 +1,19 @@ | |||||||
| using Microsoft.EntityFrameworkCore; | using Microsoft.EntityFrameworkCore; | ||||||
|  | using Microsoft.Extensions.Configuration; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Attachments.Db | namespace DamageAssesment.Api.Attachments.Db | ||||||
| { | { | ||||||
|     public class AttachmentsDbContext:DbContext |     public class AttachmentsDbContext:DbContext | ||||||
|     { |     { | ||||||
|         public AttachmentsDbContext(DbContextOptions options) : base(options) |         private IConfiguration _Configuration { get; set; } | ||||||
|  |         public AttachmentsDbContext(DbContextOptions options, IConfiguration configuration) : base(options) | ||||||
|         { |         { | ||||||
|  |             _Configuration = configuration; | ||||||
|  |         } | ||||||
|  |         protected override void OnConfiguring(DbContextOptionsBuilder options) | ||||||
|  |         { | ||||||
|  |             // connect to sql server with connection string from app settings | ||||||
|  |             options.UseSqlServer(_Configuration.GetConnectionString("AttachmentConnection")); | ||||||
|         } |         } | ||||||
|         public DbSet<Db.Attachment> Attachments { get; set; } |         public DbSet<Db.Attachment> Attachments { get; set; } | ||||||
|         protected override void OnModelCreating(ModelBuilder modelBuilder) |         protected override void OnModelCreating(ModelBuilder modelBuilder) | ||||||
|  | |||||||
| @ -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(); | ||||||
|  | |||||||
| @ -1,10 +1,15 @@ | |||||||
| using Azure.Storage.Blobs.Models; | using Azure.Storage.Blobs.Models; | ||||||
|  | using DamageAssesment.Api.Attachments.Models; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Attachments.Interfaces | namespace DamageAssesment.Api.Attachments.Interfaces | ||||||
| { | { | ||||||
|     public interface IAzureBlobService |     public interface IAzureBlobService | ||||||
|     { |     { | ||||||
|         Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files); |         Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files); | ||||||
|         void DeleteFile(string path); |         Task<List<Attachment>> UploadAttachment(int responseId, int answerId, int counter, List<IFormFile> postedFile); | ||||||
|  |         Task<List<Attachment>> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers); | ||||||
|  |         Task<List<Attachment>> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments); | ||||||
|  |         void Deletefile(string path); | ||||||
|  |         void Movefile(string path); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -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,33 +1,88 @@ | |||||||
| 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); | ||||||
|  | builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => { | ||||||
|  |     build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin(); | ||||||
|  | })); | ||||||
|  | var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey"); | ||||||
|  |  | ||||||
|  | builder.Services.AddAuthentication(item => | ||||||
|  | { | ||||||
|  |     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; | ||||||
|  |     item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; | ||||||
|  | }).AddJwtBearer(item => | ||||||
|  | { | ||||||
|  |     item.RequireHttpsMetadata = true; | ||||||
|  |     item.SaveToken = true; | ||||||
|  |     item.TokenValidationParameters = new TokenValidationParameters() | ||||||
|  |     { | ||||||
|  |         ValidateIssuerSigningKey = true, | ||||||
|  |         IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)), | ||||||
|  |         ValidateIssuer = false, | ||||||
|  |         ValidateAudience = false, | ||||||
|  |         ClockSkew = TimeSpan.Zero | ||||||
|  |     }; | ||||||
|  | }); | ||||||
| // Add services to the container. | // 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>(); | ||||||
| builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30 | builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30 | ||||||
| builder.Services.AddDbContext<AttachmentsDbContext>(option => | builder.Services.AddDbContext<AttachmentsDbContext>(option => | ||||||
| { | { | ||||||
|     option.UseInMemoryDatabase("Attachments"); |     option.UseSqlServer("AttachmentConnection"); | ||||||
| }); | }); | ||||||
| builder.Services.Configure<FormOptions>(o => | builder.Services.Configure<FormOptions>(o => | ||||||
| { | { | ||||||
| @ -44,7 +99,8 @@ if (app.Environment.IsDevelopment()) | |||||||
|     app.UseSwagger(); |     app.UseSwagger(); | ||||||
|     app.UseSwaggerUI(); |     app.UseSwaggerUI(); | ||||||
| } | } | ||||||
|  | app.UseCors("DamageAppCorsPolicy"); | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
| app.UseHttpsRedirection(); | app.UseHttpsRedirection(); | ||||||
|  |  | ||||||
|  | |||||||
| @ -14,14 +14,18 @@ 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; | ||||||
|             SeedData(); |             this.httpContextAccessor = httpContextAccessor; | ||||||
|  |             baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}"; | ||||||
|  |             baseUrl = baseUrl + "/attachments/download"; | ||||||
|  |            // SeedData(); | ||||||
|         } |         } | ||||||
|         public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync() |         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() | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -3,6 +3,9 @@ using Azure.Storage.Blobs; | |||||||
| using Azure.Storage.Blobs.Models; | using Azure.Storage.Blobs.Models; | ||||||
| using Azure.Storage.Blobs.Specialized; | using Azure.Storage.Blobs.Specialized; | ||||||
| using DamageAssesment.Api.Attachments.Interfaces; | using DamageAssesment.Api.Attachments.Interfaces; | ||||||
|  | using DamageAssesment.Api.Attachments.Models; | ||||||
|  | using System.Diagnostics.Metrics; | ||||||
|  | using System.Text; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Attachments.Providers | namespace DamageAssesment.Api.Attachments.Providers | ||||||
| { | { | ||||||
| @ -10,11 +13,95 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|     { |     { | ||||||
|         BlobServiceClient _blobClient; |         BlobServiceClient _blobClient; | ||||||
|         BlobContainerClient _containerClient; |         BlobContainerClient _containerClient; | ||||||
|         string azureConnectionString = "<Primary Connection String>"; |         string azureConnectionString; | ||||||
|         public AzureBlobService() |         private string uploadpath = ""; | ||||||
|  |         private string Deletepath = ""; | ||||||
|  |         public AzureBlobService(IConfiguration configuration) | ||||||
|         { |         { | ||||||
|             _blobClient = new BlobServiceClient(azureConnectionString); |             uploadpath = configuration.GetValue<string>("Fileupload:folderpath"); | ||||||
|             _containerClient = _blobClient.GetBlobContainerClient("apiimages"); |             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath"); | ||||||
|  |             _blobClient = new BlobServiceClient(configuration.GetValue<string>("Fileupload:BlobConnectionString")); | ||||||
|  |             _containerClient = _blobClient.GetBlobContainerClient(configuration.GetValue<string>("Fileupload:BlobContainerName")); | ||||||
|  |         } | ||||||
|  |         public async Task<List<Attachment>> UploadAttachment(int responseId, int answerId, int counter, List<IFormFile> postedFile) | ||||||
|  |         { | ||||||
|  |             var pathToSave = Path.Combine(uploadpath, "Response-" + responseId); | ||||||
|  |             String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId); | ||||||
|  |             List<Models.Attachment> attachments = new List<Models.Attachment>(); | ||||||
|  |             foreach (IFormFile item in postedFile) | ||||||
|  |             { | ||||||
|  |  | ||||||
|  |                 counter++; | ||||||
|  |                 var UserfileName = Path.GetFileName(item.FileName); | ||||||
|  |                 var extension = System.IO.Path.GetExtension(UserfileName); | ||||||
|  |                 var fileName = String.Format("Attachment_{0}{1}", counter, extension); | ||||||
|  |                 var stream = item.OpenReadStream(); | ||||||
|  |                 BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName); | ||||||
|  |                 string dbPath = fullDirectoryPath + "/" + fileName; | ||||||
|  |                 var result = await client.UploadAsync(stream, true); | ||||||
|  |                 attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath }); | ||||||
|  |             } | ||||||
|  |             return attachments; | ||||||
|  |         } | ||||||
|  |         public async Task<List<Attachment>> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers) | ||||||
|  |         { | ||||||
|  |             List<Models.Attachment> attachments = new List<Models.Attachment>(); | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 foreach (var item in answers) | ||||||
|  |                 { | ||||||
|  |                     int answerId = item.AnswerId; | ||||||
|  |                     var pathToSave = Path.Combine(uploadpath, "Response-" + responseId); | ||||||
|  |                     String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId); | ||||||
|  |                     foreach (var file in item.postedFiles) | ||||||
|  |                     { | ||||||
|  |                         counter++; | ||||||
|  |  | ||||||
|  |                         var UserfileName = Path.GetFileName(file.FileName); | ||||||
|  |                         var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension); | ||||||
|  |                         byte[] byteArray = Convert.FromBase64String(file.FileContent); | ||||||
|  |                         MemoryStream stream = new MemoryStream(byteArray); | ||||||
|  |                         BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName); | ||||||
|  |                         string dbPath = fullDirectoryPath + "/" + fileName; | ||||||
|  |                         var result = await client.UploadAsync(stream, true); | ||||||
|  |                         attachments.Add(new Models.Attachment { AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath }); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 return attachments; | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 return new List<Models.Attachment>(); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |         } | ||||||
|  |         public async Task<List<Attachment>> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments) | ||||||
|  |         { | ||||||
|  |             List<Models.Attachment> Dbattachments = new List<Models.Attachment>(); | ||||||
|  |             foreach (Models.Attachment searchFile in attachments) | ||||||
|  |             { | ||||||
|  |                 Movefile(searchFile.URI); | ||||||
|  |             } | ||||||
|  |             foreach (var item in answers) | ||||||
|  |             { | ||||||
|  |                 int answerId = item.AnswerId; | ||||||
|  |                 var pathToSave = Path.Combine(uploadpath, "Response-" + responseId); | ||||||
|  |                 String fullDirectoryPath = Path.Combine(pathToSave, "Answer-" + answerId); | ||||||
|  |                 foreach (var file in item.postedFiles) | ||||||
|  |                 { | ||||||
|  |                     Models.Attachment attachment = attachments.Where(a => a.Id == file.AttachmentId).FirstOrDefault(); | ||||||
|  |                     var UserfileName = Path.GetFileName(file.FileName); | ||||||
|  |                     var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension); | ||||||
|  |                     byte[] byteArray = Convert.FromBase64String(file.FileContent); | ||||||
|  |                     MemoryStream stream = new MemoryStream(byteArray); | ||||||
|  |                     BlobClient client = _containerClient.GetBlobClient(fullDirectoryPath + "/" + fileName); | ||||||
|  |                     string dbPath = fullDirectoryPath + "/" + fileName; | ||||||
|  |                     var result = await client.UploadAsync(stream, true); | ||||||
|  |                     Dbattachments.Add(new Models.Attachment { Id = attachment.Id, AnswerId = answerId, ResponseId = responseId, IsDeleted = false, FileName = UserfileName, URI = dbPath }); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             return Dbattachments; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files) |         public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files) | ||||||
| @ -35,10 +122,52 @@ namespace DamageAssesment.Api.Attachments.Providers | |||||||
|  |  | ||||||
|             return azureResponse; |             return azureResponse; | ||||||
|         } |         } | ||||||
|         public void DeleteFile(string url) |         public string getMovefilename(string movefilename) | ||||||
|         { |         { | ||||||
|             var blob = _containerClient.GetBlockBlobClient(url); |             var list = movefilename.Split('.'); | ||||||
|             blob.DeleteIfExists(); |             if (list.Length > 0) | ||||||
|  |                 list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") + "_" + DateTime.Now.ToShortTimeString().Replace("/", "_") + "." + list[list.Length - 1]; | ||||||
|  |             return string.Join("_", list); | ||||||
|  |         } | ||||||
|  |         public void Movefile(string path) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 if (path != "") | ||||||
|  |                 { | ||||||
|  |                     string MovePath = getMovefilename(path.Replace(uploadpath, Deletepath)); | ||||||
|  |                     // Get references to the source and destination blobs | ||||||
|  |                     BlobClient sourceBlobClient = _containerClient.GetBlobClient(path); | ||||||
|  |                     BlobClient destinationBlobClient = _containerClient.GetBlobClient(MovePath); | ||||||
|  |                     // Start the copy operation from the source to the destination | ||||||
|  |                     destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri); | ||||||
|  |  | ||||||
|  |                     // Check if the copy operation completed successfully | ||||||
|  |                     WaitForCopyToComplete(destinationBlobClient); | ||||||
|  |  | ||||||
|  |                     // Delete the source blob after a successful copy | ||||||
|  |                     sourceBlobClient.DeleteIfExists(); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |  | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         static void WaitForCopyToComplete(BlobClient blobClient) | ||||||
|  |         { | ||||||
|  |             BlobProperties properties = blobClient.GetProperties(); | ||||||
|  |  | ||||||
|  |             while (properties.CopyStatus == CopyStatus.Pending) | ||||||
|  |             { | ||||||
|  |                 Task.Delay(TimeSpan.FromSeconds(1)); | ||||||
|  |                 properties = blobClient.GetProperties(); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         public void Deletefile(string url) | ||||||
|  |         { | ||||||
|  |             BlobClient sourceBlobClient = _containerClient.GetBlobClient(url); | ||||||
|  |             sourceBlobClient.DeleteIfExists(); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @ -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)); | ||||||
|  | |||||||
| @ -1,8 +0,0 @@ | |||||||
| { |  | ||||||
|   "Logging": { |  | ||||||
|     "LogLevel": { |  | ||||||
|       "Default": "Information", |  | ||||||
|       "Microsoft.AspNetCore": "Warning" |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
| } |  | ||||||
| @ -11,6 +11,14 @@ | |||||||
|   "AllowedHosts": "*", |   "AllowedHosts": "*", | ||||||
|   "Fileupload": { |   "Fileupload": { | ||||||
|     "folderpath": "DMS_Attachments/Active", |     "folderpath": "DMS_Attachments/Active", | ||||||
|     "Deletepath": "DMS_Attachments/Deleted" |     "Deletepath": "DMS_Attachments/Deleted", | ||||||
|  |     "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net", | ||||||
|  |     "BlobContainerName": "doculinks" | ||||||
|  |   }, | ||||||
|  |   "ConnectionStrings": { | ||||||
|  |     //"AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;" | ||||||
|  |     "AttachmentConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;" | ||||||
|  |  | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |    | ||||||
| @ -44,10 +44,10 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|             var mockDocumentService = new Mock<IDoculinkProvider>(); |             var mockDocumentService = new Mock<IDoculinkProvider>(); | ||||||
|             var mockUploadService = new Mock<IUploadService>(); |             var mockUploadService = new Mock<IUploadService>(); | ||||||
|             var mockResponse = await MockData.getOkResponses(); |             var mockResponse = await MockData.getOkResponses(); | ||||||
|             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en", null)).ReturnsAsync(mockResponse); |             mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", null)).ReturnsAsync(mockResponse); | ||||||
|  |  | ||||||
|             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); |             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); | ||||||
|             var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms","en", null); |             var result = (OkObjectResult)await DocumentProvider.GetDocumentsAsync("forms", "en", null); | ||||||
|  |  | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -97,7 +97,7 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|             var mockDocumentService = new Mock<IDoculinkProvider>(); |             var mockDocumentService = new Mock<IDoculinkProvider>(); | ||||||
|             var mockUploadService = new Mock<IUploadService>(); |             var mockUploadService = new Mock<IUploadService>(); | ||||||
|             var mockResponse = await MockData.getOkResponse(1); |             var mockResponse = await MockData.getOkResponse(1); | ||||||
|             mockDocumentService.Setup(service => service.GetDocumentAsync(1,"forms","en")).ReturnsAsync(mockResponse); |             mockDocumentService.Setup(service => service.GetDocumentAsync(1, "forms", "en")).ReturnsAsync(mockResponse); | ||||||
|  |  | ||||||
|             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); |             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); | ||||||
|             var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1, "forms", "en"); |             var result = (OkObjectResult)await DocumentProvider.GetDocumentAsync(1, "forms", "en"); | ||||||
| @ -154,9 +154,9 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|             var mockResponse = await MockData.getOkResponse(1); |             var mockResponse = await MockData.getOkResponse(1); | ||||||
|             var mockInputDocument = await MockData.getInputDocumentData(); |             var mockInputDocument = await MockData.getInputDocumentData(); | ||||||
|             var DocumentResponse = await MockData.GetDocuLinksInfo(1); |             var DocumentResponse = await MockData.GetDocuLinksInfo(1); | ||||||
|             mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,mockInputDocument)).ReturnsAsync(mockResponse); |             mockDocumentService.Setup(service => service.UpdateDocumentAsync(1, mockInputDocument)).ReturnsAsync(mockResponse); | ||||||
|             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); |             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); | ||||||
|             var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1,DocumentResponse); |             var result = (NotFoundResult)await DocumentProvider.UpdateDocument(1, DocumentResponse); | ||||||
|  |  | ||||||
|             Assert.Equal(404, result.StatusCode); |             Assert.Equal(404, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -168,9 +168,9 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|             var mockUploadService = new Mock<IUploadService>(); |             var mockUploadService = new Mock<IUploadService>(); | ||||||
|             var mockResponse = await MockData.getBadRequestResponse(); |             var mockResponse = await MockData.getBadRequestResponse(); | ||||||
|             var mockInputDocument = await MockData.getInputDocumentData(); |             var mockInputDocument = await MockData.getInputDocumentData(); | ||||||
|             mockDocumentService.Setup(service => service.UpdateDocumentAsync(99,mockInputDocument)).ReturnsAsync(mockResponse); |             mockDocumentService.Setup(service => service.UpdateDocumentAsync(99, mockInputDocument)).ReturnsAsync(mockResponse); | ||||||
|             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); |             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); | ||||||
|             var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99,null); |             var result = (BadRequestObjectResult)await DocumentProvider.UpdateDocument(99, null); | ||||||
|             Assert.Equal(400, result.StatusCode); |             Assert.Equal(400, result.StatusCode); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @ -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 | ||||||
|  |  | ||||||
| @ -235,7 +257,7 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|             var mockDocumentService = new Mock<IDoculinkProvider>(); |             var mockDocumentService = new Mock<IDoculinkProvider>(); | ||||||
|             var mockUploadService = new Mock<IUploadService>(); |             var mockUploadService = new Mock<IUploadService>(); | ||||||
|             var mockResponse = await LinkTypeMockData.getOkResponse(1); |             var mockResponse = await LinkTypeMockData.getOkResponse(1); | ||||||
|             mockDocumentService.Setup(service => service.GetLinkTypeAsync(1,"en")).ReturnsAsync(mockResponse); |             mockDocumentService.Setup(service => service.GetLinkTypeAsync(1, "en")).ReturnsAsync(mockResponse); | ||||||
|             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); |             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); | ||||||
|             var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1, "en"); |             var result = (OkObjectResult)await DocumentProvider.GetLinkTypeAsync(1, "en"); | ||||||
|  |  | ||||||
| @ -290,9 +312,9 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|             var mockUploadService = new Mock<IUploadService>(); |             var mockUploadService = new Mock<IUploadService>(); | ||||||
|             var mockResponse = await LinkTypeMockData.getOkResponse(1); |             var mockResponse = await LinkTypeMockData.getOkResponse(1); | ||||||
|             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1); |             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1); | ||||||
|             mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse); |             mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse); | ||||||
|             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); |             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); | ||||||
|             var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1,mockInputDocument); |             var result = (OkObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument); | ||||||
|  |  | ||||||
|             Assert.Equal(200, result.StatusCode); |             Assert.Equal(200, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -304,9 +326,9 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|             var mockUploadService = new Mock<IUploadService>(); |             var mockUploadService = new Mock<IUploadService>(); | ||||||
|             var mockResponse = await LinkTypeMockData.getNotFoundResponse(); |             var mockResponse = await LinkTypeMockData.getNotFoundResponse(); | ||||||
|             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99); |             var mockInputDocument = await LinkTypeMockData.getInputLinkData(99); | ||||||
|             mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99,mockInputDocument)).ReturnsAsync(mockResponse); |             mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(99, mockInputDocument)).ReturnsAsync(mockResponse); | ||||||
|             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); |             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); | ||||||
|             var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99,mockInputDocument); |             var result = (NotFoundObjectResult)await DocumentProvider.UpdateLinkType(99, mockInputDocument); | ||||||
|  |  | ||||||
|             Assert.Equal(404, result.StatusCode); |             Assert.Equal(404, result.StatusCode); | ||||||
|         } |         } | ||||||
| @ -318,7 +340,7 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|             var mockUploadService = new Mock<IUploadService>(); |             var mockUploadService = new Mock<IUploadService>(); | ||||||
|             var mockResponse = await LinkTypeMockData.getBadRequestResponse(); |             var mockResponse = await LinkTypeMockData.getBadRequestResponse(); | ||||||
|             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1); |             var mockInputDocument = await LinkTypeMockData.getInputLinkData(1); | ||||||
|             mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1,mockInputDocument)).ReturnsAsync(mockResponse); |             mockDocumentService.Setup(service => service.UpdateLinkTypeAsync(1, mockInputDocument)).ReturnsAsync(mockResponse); | ||||||
|             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); |             var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object); | ||||||
|             var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument); |             var result = (BadRequestObjectResult)await DocumentProvider.UpdateLinkType(1, mockInputDocument); | ||||||
|  |  | ||||||
|  | |||||||
| @ -25,14 +25,15 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|                 DocuLinksTranslations.Add(new DoculinkTranslation() |                 DocuLinksTranslations.Add(new DoculinkTranslation() | ||||||
|                 { |                 { | ||||||
|                     Language = "en", |                     Language = "en", | ||||||
|                     title = "tel"+i, |                     title = "tel" + i, | ||||||
|                     description = "Sample"+i |                     description = "Sample" + i | ||||||
|                 }); |                 }); | ||||||
|                 List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>(); |                 List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>(); | ||||||
|                 doclinksAttachments.Add(new DoculinkAttachments() |                 doclinksAttachments.Add(new DoculinkAttachments() | ||||||
|                 { |                 { | ||||||
|                     docName = "",Path="www.google.com", |                     docName = "",Path="www.google.com", | ||||||
|                     IsAttachments=false,CustomOrder=1 |                     Language = "en", | ||||||
|  |                     IsAttachments =false,CustomOrder=1 | ||||||
|                 }); |                 }); | ||||||
|                 list.Add(new DocuLinks.Models.ResDoculink() |                 list.Add(new DocuLinks.Models.ResDoculink() | ||||||
|                 { |                 { | ||||||
| @ -40,10 +41,10 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|                     Id = i, |                     Id = i, | ||||||
|                     linkTypeId = i, |                     linkTypeId = i, | ||||||
|                     IsActive = true, |                     IsActive = true, | ||||||
|                     titles= dicttitle, |                     titles = dicttitle, | ||||||
|                     description=dictdesc, |                     description = dictdesc, | ||||||
|                     CustomOrder=i, |                     CustomOrder = i, | ||||||
|                     doclinksAttachments= doclinksAttachments |                     doclinksAttachments = doclinksAttachments | ||||||
|                 }); |                 }); | ||||||
|             } |             } | ||||||
|            // List<ResDoculinks> doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList(); |            // List<ResDoculinks> doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList(); | ||||||
| @ -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() | ||||||
| @ -120,8 +122,8 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|         { |         { | ||||||
|  |  | ||||||
|             List<FileModel> fileModels = new List<FileModel>(); |             List<FileModel> fileModels = new List<FileModel>(); | ||||||
|             fileModels.Add( new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt",IsAttachments=true,CustomOrder=1 }); |             fileModels.Add(new FileModel() { FileName = "Sample", FileContent = "c2FtcGxl", FileExtension = ".txt", IsAttachments = true, CustomOrder = 1 }); | ||||||
|             return new ReqDoculink() { Id=id, linkTypeId = 1, CustomOrder = 1, Files = fileModels }; |             return new ReqDoculink() { Id = id, linkTypeId = 1, CustomOrder = 1, Files = fileModels }; | ||||||
|         } |         } | ||||||
|         public static async Task<DocuLinks.Models.Doculink> getInputDocumentData() |         public static async Task<DocuLinks.Models.Doculink> getInputDocumentData() | ||||||
|         { |         { | ||||||
| @ -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 | ||||||
| @ -145,9 +148,9 @@ namespace DamageAssesment.Api.DocuLinks.Test | |||||||
|                 Id = 1, |                 Id = 1, | ||||||
|                 linkTypeId = 1, |                 linkTypeId = 1, | ||||||
|                 IsActive = true, |                 IsActive = true, | ||||||
|                 CustomOrder=1, |                 CustomOrder = 1, | ||||||
|                 documentsTranslations = DocuLinksTranslations, |                 documentsTranslations = DocuLinksTranslations, | ||||||
|                 doclinksAttachments= doclinksAttachments |                 doclinksAttachments = doclinksAttachments | ||||||
|             }; |             }; | ||||||
|         } |         } | ||||||
|         public static async Task<List<DocuLinks.Models.Doculink>> getInputDocuLinksData() |         public static async Task<List<DocuLinks.Models.Doculink>> getInputDocuLinksData() | ||||||
| @ -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,6 +2,7 @@ | |||||||
| 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; | ||||||
|  |  | ||||||
| @ -12,8 +13,9 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|     { |     { | ||||||
|         private readonly IDoculinkProvider documentsProvider; |         private readonly IDoculinkProvider documentsProvider; | ||||||
|         private readonly IUploadService uploadService; |         private readonly IUploadService uploadService; | ||||||
|  |         private readonly IAzureBlobService azureBlobService; | ||||||
|  |  | ||||||
|         public DoculinkController(IDoculinkProvider documentsProvider,IUploadService uploadService) |         public DoculinkController(IDoculinkProvider documentsProvider, IUploadService uploadService) | ||||||
|         { |         { | ||||||
|  |  | ||||||
|             this.documentsProvider = documentsProvider; |             this.documentsProvider = documentsProvider; | ||||||
| @ -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) | ||||||
| @ -38,10 +41,11 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Get a Doculink type by id. |         /// Get a Doculink type by id. | ||||||
|         /// </summary> |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         [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) | ||||||
|         { |         { | ||||||
|             var result = await this.documentsProvider.GetLinkTypeAsync(id, language); |             var result = await this.documentsProvider.GetLinkTypeAsync(id, language); | ||||||
|             if (result.IsSuccess) |             if (result.IsSuccess) | ||||||
| @ -53,13 +57,14 @@ 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) | ||||||
|         { |         { | ||||||
|             if (linkType != null) |             if (linkType != null) | ||||||
|             { |             { | ||||||
|                 var result = await this.documentsProvider.UpdateLinkTypeAsync(id,linkType); |                 var result = await this.documentsProvider.UpdateLinkTypeAsync(id, linkType); | ||||||
|                 if (result.IsSuccess) |                 if (result.IsSuccess) | ||||||
|                 { |                 { | ||||||
|                     return Ok(result.LinkType); |                     return Ok(result.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,14 +111,90 @@ 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}")] | ||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language,bool? isactive) |         public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language, bool? isactive) | ||||||
|         { |         { | ||||||
|             var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive); |             var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive); | ||||||
|             if (result.IsSuccess) |             if (result.IsSuccess) | ||||||
| @ -129,7 +212,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         [HttpGet] |         [HttpGet] | ||||||
|         public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language) |         public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language) | ||||||
|         { |         { | ||||||
|             var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language,true); |             var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, true); | ||||||
|             if (result.IsSuccess) |             if (result.IsSuccess) | ||||||
|             { |             { | ||||||
|                 return Ok(result.documents); |                 return Ok(result.documents); | ||||||
| @ -154,11 +237,12 @@ 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}")] | ||||||
|         [Route("doculinks/{id}/{linktype:alpha}/{language:alpha}")] |         [Route("doculinks/{id}/{linktype:alpha}/{language:alpha}")] | ||||||
|         public async Task<IActionResult> GetDocumentAsync(int id,string? linktype, string? language) |         public async Task<IActionResult> GetDocumentAsync(int id, string? linktype, string? language) | ||||||
|         { |         { | ||||||
|             var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language); |             var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language); | ||||||
|             if (result.IsSuccess) |             if (result.IsSuccess) | ||||||
| @ -170,9 +254,10 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// update existing doclink. |         /// update existing doclink. | ||||||
|         /// </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) | ||||||
|         { |         { | ||||||
|             if (documentInfo != null) |             if (documentInfo != null) | ||||||
|             { |             { | ||||||
| @ -180,7 +265,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|                 if (dbdoc.IsSuccess) |                 if (dbdoc.IsSuccess) | ||||||
|                 { |                 { | ||||||
|                     var documents = await this.documentsProvider.GetDocumentCounter(); |                     var documents = await this.documentsProvider.GetDocumentCounter(); | ||||||
|                     Models.Doculink DocuLink= uploadService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo); |                     Models.Doculink DocuLink = uploadService.UpdateDocuments(documents.counter, dbdoc.Document, documentInfo); | ||||||
|                     var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink); |                     var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink); | ||||||
|                     if (result.IsSuccess) |                     if (result.IsSuccess) | ||||||
|                     { |                     { | ||||||
| @ -193,8 +278,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) | ||||||
| @ -204,7 +304,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|                 if (documentInfo != null) |                 if (documentInfo != null) | ||||||
|                 { |                 { | ||||||
|                     var documents = await this.documentsProvider.GetDocumentCounter(); |                     var documents = await this.documentsProvider.GetDocumentCounter(); | ||||||
|                     Models.Doculink DocuLink= uploadService.UploadDocument(documents.counter, documentInfo); |                     Models.Doculink DocuLink = uploadService.UploadDocument(documents.counter, documentInfo); | ||||||
|                     var result = await this.documentsProvider.PostDocumentAsync(DocuLink); |                     var result = await this.documentsProvider.PostDocumentAsync(DocuLink); | ||||||
|                     if (result.IsSuccess) |                     if (result.IsSuccess) | ||||||
|                     { |                     { | ||||||
| @ -222,6 +322,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers | |||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// Delete Doculink by id. |         /// Delete Doculink 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) | ||||||
|  | |||||||
| @ -1 +0,0 @@ | |||||||
| sample |  | ||||||
| @ -1 +0,0 @@ | |||||||
| sample |  | ||||||
| @ -11,7 +11,8 @@ | |||||||
|  |  | ||||||
|   <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.18.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"> | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.DocuLinks.Db | namespace DamageAssesment.Api.DocuLinks.Db | ||||||
| { | { | ||||||
|  |     [Table("Doculinks")] | ||||||
|     public class Doculink |     public class Doculink | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.DocuLinks.Db | namespace DamageAssesment.Api.DocuLinks.Db | ||||||
| { | { | ||||||
|  |     [Table("DoculinkAttachments")] | ||||||
|     public class DoculinkAttachments |     public class DoculinkAttachments | ||||||
|     { |     { | ||||||
|  |  | ||||||
| @ -14,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; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -7,8 +7,15 @@ namespace DamageAssesment.Api.DocuLinks.Db | |||||||
| { | { | ||||||
|     public class DoculinkDbContext : DbContext |     public class DoculinkDbContext : DbContext | ||||||
|     { |     { | ||||||
|         public DoculinkDbContext(DbContextOptions options) : base(options) |         private IConfiguration _Configuration { get; set; } | ||||||
|  |         public DoculinkDbContext(DbContextOptions options, IConfiguration configuration) : base(options) | ||||||
|         { |         { | ||||||
|  |             _Configuration = configuration; | ||||||
|  |         } | ||||||
|  |         protected override void OnConfiguring(DbContextOptionsBuilder options) | ||||||
|  |         { | ||||||
|  |             // connect to sql server with connection string from app settings | ||||||
|  |             options.UseSqlServer(_Configuration.GetConnectionString("DoculinkConnection")); | ||||||
|         } |         } | ||||||
|         public DbSet<Db.Doculink> Documents { get; set; } |         public DbSet<Db.Doculink> Documents { get; set; } | ||||||
|         public DbSet<Db.LinkType> LinkTypes { get; set; } |         public DbSet<Db.LinkType> LinkTypes { get; set; } | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.DocuLinks.Db | namespace DamageAssesment.Api.DocuLinks.Db | ||||||
| { | { | ||||||
|  |     [Table("DoculinkTrans")] | ||||||
|     public class DoculinkTranslation |     public class DoculinkTranslation | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -1,7 +1,9 @@ | |||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.DocuLinks.Db | namespace DamageAssesment.Api.DocuLinks.Db | ||||||
| { | { | ||||||
|  |     [Table("DoculinkTypes")] | ||||||
|     public class LinkType |     public class LinkType | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.DocuLinks.Db | namespace DamageAssesment.Api.DocuLinks.Db | ||||||
| { | { | ||||||
|  |     [Table("DoculinkTypeTrans")] | ||||||
|     public class LinksTranslation |     public class LinksTranslation | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -1,10 +1,14 @@ | |||||||
| using Azure.Storage.Blobs.Models; | using Azure.Storage.Blobs.Models; | ||||||
|  | using DamageAssesment.Api.DocuLinks.Models; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.DocuLinks.Interfaces | namespace DamageAssesment.Api.DocuLinks.Interfaces | ||||||
| { | { | ||||||
|     public interface IAzureBlobService |     public interface IAzureBlobService | ||||||
|     { |     { | ||||||
|         Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files); |         Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files); | ||||||
|  |         Task<Models.Doculink> UploadDocument(int counter, ReqDoculink documentInfo); | ||||||
|  |         Task<Models.Doculink> UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo); | ||||||
|         void DeleteFile(string path); |         void DeleteFile(string path); | ||||||
|  |         void Movefile(string path); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -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,30 +2,84 @@ 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); | ||||||
|  | builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => { | ||||||
|  |     build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin(); | ||||||
|  | })); | ||||||
| // 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>(); | ||||||
| builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30 | builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30 | ||||||
| builder.Services.AddDbContext<DoculinkDbContext>(option => | builder.Services.AddDbContext<DoculinkDbContext>(option => | ||||||
| { | { | ||||||
|     option.UseInMemoryDatabase("DocumentConnection"); |     option.UseSqlServer("DoculinkConnection"); | ||||||
| }); | }); | ||||||
| var app = builder.Build(); | var app = builder.Build(); | ||||||
|  |  | ||||||
| @ -35,7 +89,8 @@ if (app.Environment.IsDevelopment()) | |||||||
|     app.UseSwagger(); |     app.UseSwagger(); | ||||||
|     app.UseSwaggerUI(); |     app.UseSwaggerUI(); | ||||||
| } | } | ||||||
|  | app.UseCors("DamageAppCorsPolicy"); | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
|  |  | ||||||
| app.MapControllers(); | app.MapControllers(); | ||||||
|  | |||||||
| @ -1,8 +1,17 @@ | |||||||
|  |  | ||||||
|  | using Azure; | ||||||
| using Azure.Storage.Blobs; | using Azure.Storage.Blobs; | ||||||
| using Azure.Storage.Blobs.Models; | using Azure.Storage.Blobs.Models; | ||||||
| using Azure.Storage.Blobs.Specialized; | using Azure.Storage.Blobs.Specialized; | ||||||
| using DamageAssesment.Api.DocuLinks.Interfaces; | using DamageAssesment.Api.DocuLinks.Interfaces; | ||||||
|  | using DamageAssesment.Api.DocuLinks.Models; | ||||||
|  | using Microsoft.AspNetCore.Mvc.Filters; | ||||||
|  | using Microsoft.Extensions.Configuration; | ||||||
|  | using Microsoft.VisualBasic; | ||||||
|  | using System.ComponentModel; | ||||||
|  | using System.IO; | ||||||
|  | using System.Text; | ||||||
|  | using System.Threading.Tasks; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.DocuLinks.Providers | namespace DamageAssesment.Api.DocuLinks.Providers | ||||||
| { | { | ||||||
| @ -10,11 +19,111 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|     { |     { | ||||||
|         BlobServiceClient _blobClient; |         BlobServiceClient _blobClient; | ||||||
|         BlobContainerClient _containerClient; |         BlobContainerClient _containerClient; | ||||||
|         string azureConnectionString = "<Primary Connection String>"; |         string azureConnectionString; | ||||||
|         public AzureBlobService() |         private string uploadpath = ""; | ||||||
|  |         private string Deletepath = ""; | ||||||
|  |         public AzureBlobService(IConfiguration configuration) | ||||||
|         { |         { | ||||||
|             _blobClient = new BlobServiceClient(azureConnectionString); |             uploadpath = configuration.GetValue<string>("Fileupload:folderpath"); | ||||||
|             _containerClient = _blobClient.GetBlobContainerClient("apiimages"); |             Deletepath = configuration.GetValue<string>("Fileupload:Deletepath"); | ||||||
|  |             _blobClient = new BlobServiceClient(configuration.GetValue<string>("Fileupload:BlobConnectionString")); | ||||||
|  |             _containerClient = _blobClient.GetBlobContainerClient(configuration.GetValue<string>("Fileupload:BlobContainerName")); | ||||||
|  |         } | ||||||
|  |         public async Task<Models.Doculink> UploadDocument(int counter, ReqDoculink documentInfo) | ||||||
|  |         { | ||||||
|  |             Models.Doculink Documents = new Models.Doculink(); | ||||||
|  |             List <Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>(); | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 string path = "", UserfileName = ""; | ||||||
|  |                 if (documentInfo.Files != null) | ||||||
|  |                 { | ||||||
|  |  | ||||||
|  |                     int counter1 = 1; | ||||||
|  |                     foreach (var item in documentInfo.Files) | ||||||
|  |                     { | ||||||
|  |                         if (item.IsAttachments) | ||||||
|  |                         { | ||||||
|  |                             UserfileName = Path.GetFileName(item.FileName); | ||||||
|  |                             var fileName = String.Format("Document_{0}_{1}{2}", counter, counter1, item.FileExtension); | ||||||
|  |                             byte[] byteArray = Convert.FromBase64String(item.FileContent); | ||||||
|  |                             MemoryStream stream = new MemoryStream(byteArray); | ||||||
|  |                             BlobClient client = _containerClient.GetBlobClient(uploadpath + "/" + fileName); | ||||||
|  |                             var result = await client.UploadAsync(stream, true); | ||||||
|  |                             path = uploadpath + "/" + fileName; | ||||||
|  |                             counter1++; | ||||||
|  |                         } | ||||||
|  |                         else | ||||||
|  |                             path = item.url; | ||||||
|  |                         attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder }); | ||||||
|  |                     } | ||||||
|  |                 } | ||||||
|  |                 Documents = new Models.Doculink() | ||||||
|  |                 { | ||||||
|  |                     linkTypeId = documentInfo.linkTypeId, | ||||||
|  |                     documentsTranslations = documentInfo.documentsTranslations, | ||||||
|  |                     doclinksAttachments = attachments, | ||||||
|  |                     IsDeleted = false, | ||||||
|  |                     CustomOrder = documentInfo.CustomOrder, | ||||||
|  |                     IsActive = true | ||||||
|  |                 }; | ||||||
|  |  | ||||||
|  |                 return Documents; | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 return new Models.Doculink(); | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         public async Task<Models.Doculink> UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 foreach (var item in document.doclinksAttachments) | ||||||
|  |                 { | ||||||
|  |                      Movefile(item.Path); | ||||||
|  |                 } | ||||||
|  |                 string path = "", UserfileName = ""; | ||||||
|  |                 List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>(); | ||||||
|  |                 int counter1 = 1; | ||||||
|  |                 foreach (var item in documentInfo.Files) | ||||||
|  |                 { | ||||||
|  |                     if (item.IsAttachments) | ||||||
|  |                     { | ||||||
|  |                         UserfileName = Path.GetFileName(item.FileName); | ||||||
|  |                         var fileName = String.Format("Document_{0}_{1}{2)", document.Id, counter1, item.FileExtension); | ||||||
|  |                         byte[] byteArray = Encoding.UTF8.GetBytes(item.FileContent); | ||||||
|  |                         MemoryStream stream = new MemoryStream(byteArray); | ||||||
|  |                         BlobClient client = _containerClient.GetBlobClient(uploadpath + "/" + fileName); | ||||||
|  |                         path = uploadpath + "/" + fileName; | ||||||
|  |                         var result = await client.UploadAsync(stream, true); | ||||||
|  |                         counter1++; | ||||||
|  |                     } | ||||||
|  |                     else | ||||||
|  |                         path = item.url; | ||||||
|  |                     attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path, IsAttachments = item.IsAttachments, CustomOrder = item.CustomOrder }); | ||||||
|  |                 } | ||||||
|  |                 Models.Doculink Documents = new Models.Doculink() | ||||||
|  |                 { | ||||||
|  |                     Id = documentInfo.Id, | ||||||
|  |                     linkTypeId = documentInfo.linkTypeId, | ||||||
|  |                     documentsTranslations = documentInfo.documentsTranslations, | ||||||
|  |                     IsActive = true, | ||||||
|  |                     IsDeleted = false, | ||||||
|  |                     CustomOrder = documentInfo.CustomOrder, | ||||||
|  |                     doclinksAttachments = attachments | ||||||
|  |                 }; | ||||||
|  |  | ||||||
|  |                 return Documents; | ||||||
|  |             } | ||||||
|  |  | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 return new Models.Doculink(); | ||||||
|  |             } | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files) |         public async Task<List<Azure.Response<BlobContentInfo>>> UploadFiles(List<IFormFile> files) | ||||||
| @ -35,10 +144,52 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|  |  | ||||||
|             return azureResponse; |             return azureResponse; | ||||||
|         } |         } | ||||||
|  |         public string getMovefilename(string movefilename) | ||||||
|  |         { | ||||||
|  |             var list = movefilename.Split('.'); | ||||||
|  |             if (list.Length > 0) | ||||||
|  |                 list[list.Length - 1] = DateTime.Now.ToShortDateString().Replace("/", "_") +"_"+ DateTime.Now.ToShortTimeString().Replace("/", "_")+"." + list[list.Length - 1]; | ||||||
|  |             return string.Join("_", list); | ||||||
|  |         } | ||||||
|  |         public void Movefile(string path) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 if (path != "") | ||||||
|  |                 { | ||||||
|  |                     string MovePath = getMovefilename(path.Replace(uploadpath, Deletepath)); | ||||||
|  |                     // Get references to the source and destination blobs | ||||||
|  |                     BlobClient sourceBlobClient = _containerClient.GetBlobClient(path); | ||||||
|  |                     BlobClient destinationBlobClient = _containerClient.GetBlobClient(MovePath); | ||||||
|  |                     // Start the copy operation from the source to the destination | ||||||
|  |                      destinationBlobClient.StartCopyFromUri(sourceBlobClient.Uri); | ||||||
|  |  | ||||||
|  |                     // Check if the copy operation completed successfully | ||||||
|  |                      WaitForCopyToComplete(destinationBlobClient); | ||||||
|  |  | ||||||
|  |                     // Delete the source blob after a successful copy | ||||||
|  |                      sourceBlobClient.DeleteIfExists(); | ||||||
|  |                 } | ||||||
|  |             } | ||||||
|  |             catch(Exception ex) | ||||||
|  |             { | ||||||
|  |  | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         static void  WaitForCopyToComplete(BlobClient blobClient) | ||||||
|  |         { | ||||||
|  |             BlobProperties properties =  blobClient.GetProperties(); | ||||||
|  |  | ||||||
|  |             while (properties.CopyStatus == CopyStatus.Pending) | ||||||
|  |             { | ||||||
|  |                  Task.Delay(TimeSpan.FromSeconds(1)); | ||||||
|  |                 properties =  blobClient.GetProperties(); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         public void DeleteFile(string url) |         public void DeleteFile(string url) | ||||||
|         { |         { | ||||||
|             var blob = _containerClient.GetBlockBlobClient(url); |             BlobClient sourceBlobClient = _containerClient.GetBlobClient(url); | ||||||
|             blob.DeleteIfExists(); |             sourceBlobClient.DeleteIfExists(); | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @ -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; | ||||||
|  |  | ||||||
| @ -21,20 +24,27 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|         private DoculinkDbContext DocumentDbContext; |         private DoculinkDbContext DocumentDbContext; | ||||||
|         private ILogger<DoculinkProvider> logger; |         private ILogger<DoculinkProvider> logger; | ||||||
|         private IUploadService uploadservice; |         private IUploadService uploadservice; | ||||||
|  |         private IAzureBlobService azureBlobService; | ||||||
|         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, IAzureBlobService azureBlobService, 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; | ||||||
|             SeedData(); |             this.httpContextAccessor = httpContextAccessor; | ||||||
|  |             baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}"; | ||||||
|  |             baseUrl = baseUrl + "/doculinks/download"; | ||||||
|  |             this.azureBlobService = azureBlobService; | ||||||
|  |             //SeedData(); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|         private void SeedData() |         private async Task SeedDataAsync() | ||||||
|         { |         { | ||||||
|             if (!DocumentDbContext.LinkTypes.Any()) |             if (!DocumentDbContext.LinkTypes.Any()) | ||||||
|             { |             { | ||||||
| @ -71,11 +81,11 @@ 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 = linkTypeId, 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)); | ||||||
|                     DocumentDbContext.SaveChanges(); |                     DocumentDbContext.SaveChanges(); | ||||||
| @ -170,7 +180,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 +237,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 +272,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 +327,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 +359,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 +390,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 +432,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 +455,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; | ||||||
|             } |             } | ||||||
| @ -80,26 +116,27 @@ namespace DamageAssesment.Api.DocuLinks.Providers | |||||||
|  |  | ||||||
|                 string path = "", UserfileName = ""; |                 string path = "", UserfileName = ""; | ||||||
|                 List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>(); |                 List<Models.DoculinkAttachments> attachments = new List<Models.DoculinkAttachments>(); | ||||||
|  |                 int counter1 = 1; | ||||||
|                 foreach (var item in documentInfo.Files) |                 foreach (var item in documentInfo.Files) | ||||||
|                 { |                 { | ||||||
|                     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}", counter1, 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)); | ||||||
|  |                         counter1++; | ||||||
|                     } |                     } | ||||||
|                     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 | ||||||
|  | |||||||
| @ -1,8 +0,0 @@ | |||||||
| { |  | ||||||
|   "Logging": { |  | ||||||
|     "LogLevel": { |  | ||||||
|       "Default": "Information", |  | ||||||
|       "Microsoft.AspNetCore": "Warning" |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
| } |  | ||||||
| @ -1,4 +1,7 @@ | |||||||
| { | { | ||||||
|  |   "JwtSettings": { | ||||||
|  |     "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk=" | ||||||
|  |   }, | ||||||
|   "Logging": { |   "Logging": { | ||||||
|     "LogLevel": { |     "LogLevel": { | ||||||
|       "Default": "Information", |       "Default": "Information", | ||||||
| @ -6,8 +9,15 @@ | |||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "AllowedHosts": "*", |   "AllowedHosts": "*", | ||||||
|  |   "ConnectionStrings": { | ||||||
|  |     //"DoculinkConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;" | ||||||
|  |     "DoculinkConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;" | ||||||
|  |  | ||||||
|  |   }, | ||||||
|   "Fileupload": { |   "Fileupload": { | ||||||
|     "folderpath": "DASA_Documents/Active", |     "folderpath": "DASA_Documents/Active", | ||||||
|     "Deletepath": "DASA_Documents/Deleted" |     "Deletepath": "DASA_Documents/Deleted", | ||||||
|  |     "BlobConnectionString": "DefaultEndpointsProtocol=https;AccountName=damagedoculink;AccountKey=blynpwrAQtthEneXC5f4vFewJ3tPV+QZUt1AX3nefZScPPjkr5hMoC18B9ni6/ZYdhRiERPQw+hB+AStonf+iw==;EndpointSuffix=core.windows.net", | ||||||
|  |     "BlobContainerName": "doculinks" | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -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) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -12,8 +12,18 @@ | |||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> |     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> | ||||||
|     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> |     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" /> |     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" /> | ||||||
|     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> |     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> | ||||||
|   </ItemGroup> |   </ItemGroup> | ||||||
|  | |||||||
| @ -1,7 +1,9 @@ | |||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Employees.Db | namespace DamageAssesment.Api.Employees.Db | ||||||
| { | { | ||||||
|  |     [Table("Employees")] | ||||||
|     public class Employee |     public class Employee | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -4,18 +4,23 @@ namespace DamageAssesment.Api.Employees.Db | |||||||
| { | { | ||||||
|     public class EmployeeDbContext: DbContext |     public class EmployeeDbContext: DbContext | ||||||
|     { |     { | ||||||
|         public DbSet<Db.Employee> Employees { get; set; } |         private IConfiguration _Configuration { get; set; } | ||||||
|         public EmployeeDbContext(DbContextOptions options) : base(options) |         public EmployeeDbContext(DbContextOptions options, IConfiguration configuration) : base(options) | ||||||
|         { |         { | ||||||
|  |             _Configuration = configuration; | ||||||
|  |         } | ||||||
|  |         protected override void OnConfiguring(DbContextOptionsBuilder options) | ||||||
|  |         { | ||||||
|  |             // connect to sql server with connection string from app settings | ||||||
|  |             options.UseSqlServer(_Configuration.GetConnectionString("EmployeeConnection")); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         protected override void OnModelCreating(ModelBuilder modelBuilder) |         protected override void OnModelCreating(ModelBuilder modelBuilder) | ||||||
|         { |         { | ||||||
|             base.OnModelCreating(modelBuilder); |             base.OnModelCreating(modelBuilder); | ||||||
|  |  | ||||||
|             modelBuilder.Entity<Employee>() |             modelBuilder.Entity<Employee>() | ||||||
|                 .Property(item => item.Id) |                 .Property(item => item.Id) | ||||||
|                 .ValueGeneratedOnAdd(); |                 .ValueGeneratedOnAdd(); | ||||||
|         } |         } | ||||||
|  |         public DbSet<Db.Employee> Employees { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,30 +1,84 @@ | |||||||
| 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); | ||||||
|  | builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => { | ||||||
|  |     build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin(); | ||||||
|  | })); | ||||||
| // 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>(); | ||||||
| builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30 | builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30 | ||||||
| builder.Services.AddDbContext<EmployeeDbContext>(option => | builder.Services.AddDbContext<EmployeeDbContext>(option => | ||||||
| { | { | ||||||
|     option.UseInMemoryDatabase("Employees"); |     option.UseSqlServer("EmployeeConnection"); | ||||||
| }); | }); | ||||||
|  |  | ||||||
| var app = builder.Build(); | var app = builder.Build(); | ||||||
| @ -42,7 +96,8 @@ if (app.Environment.IsDevelopment()) | |||||||
|         employeesProvider.SeedData(); |         employeesProvider.SeedData(); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | app.UseCors("DamageAppCorsPolicy"); | ||||||
|  | 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"); | ||||||
|             } |             } | ||||||
|  | |||||||
| @ -1,8 +0,0 @@ | |||||||
| { |  | ||||||
|   "Logging": { |  | ||||||
|     "LogLevel": { |  | ||||||
|       "Default": "Information", |  | ||||||
|       "Microsoft.AspNetCore": "Warning" |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
| } |  | ||||||
| @ -9,9 +9,9 @@ | |||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "AllowedHosts": "*", |   "AllowedHosts": "*", | ||||||
|   "settings": { |   "ConnectionStrings": { | ||||||
|     "endpoint1": "xxx", |     //"EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;" | ||||||
|     "endpoint2": "xxx", |     "EmployeeConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;" | ||||||
|     "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) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -11,6 +11,17 @@ | |||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> |     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> |     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Locations.Db | namespace DamageAssesment.Api.Locations.Db | ||||||
| { | { | ||||||
|  |     [Table("Locations")] | ||||||
|     public class Location |     public class Location | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -4,6 +4,16 @@ namespace DamageAssesment.Api.Locations.Db | |||||||
| { | { | ||||||
|     public class LocationDbContext : DbContext |     public class LocationDbContext : DbContext | ||||||
|     { |     { | ||||||
|  |         private IConfiguration _Configuration { get; set; } | ||||||
|  |         public LocationDbContext(DbContextOptions options, IConfiguration configuration) : base(options) | ||||||
|  |         { | ||||||
|  |             _Configuration = configuration; | ||||||
|  |         } | ||||||
|  |         protected override void OnConfiguring(DbContextOptionsBuilder options) | ||||||
|  |         { | ||||||
|  |             // connect to sql server with connection string from app settings | ||||||
|  |             options.UseSqlServer(_Configuration.GetConnectionString("LocationConnection")); | ||||||
|  |         } | ||||||
|         public DbSet<Db.Location> Locations { get; set; } |         public DbSet<Db.Location> Locations { get; set; } | ||||||
|         public DbSet<Db.Region> Regions { get; set; } |         public DbSet<Db.Region> Regions { get; set; } | ||||||
|         public LocationDbContext(DbContextOptions options) : base(options) |         public LocationDbContext(DbContextOptions options) : base(options) | ||||||
|  | |||||||
| @ -1,7 +1,9 @@ | |||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Locations.Db | namespace DamageAssesment.Api.Locations.Db | ||||||
| { | { | ||||||
|  |     [Table("Regions")] | ||||||
|     public class Region |     public class Region | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -1,32 +1,88 @@ | |||||||
| 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); | ||||||
|  | builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => { | ||||||
|  |     build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin(); | ||||||
|  | })); | ||||||
| // 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>(); | ||||||
| builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30 | builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30 | ||||||
| builder.Services.AddDbContext<LocationDbContext>(option => | builder.Services.AddDbContext<LocationDbContext>(option => | ||||||
| { | { | ||||||
|     option.UseInMemoryDatabase("Locations"); |     option.UseSqlServer("LocationConnection"); | ||||||
| }); | }); | ||||||
|  |  | ||||||
|  |  | ||||||
| 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()) | ||||||
| @ -43,7 +99,8 @@ if (app.Environment.IsDevelopment()) | |||||||
|         regionProvider.SeedData(); |         regionProvider.SeedData(); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | app.UseCors("DamageAppCorsPolicy"); | ||||||
|  | app.UseAuthentication(); | ||||||
| app.UseAuthorization(); | app.UseAuthorization(); | ||||||
|  |  | ||||||
| app.MapControllers(); | app.MapControllers(); | ||||||
|  | |||||||
| @ -1,8 +0,0 @@ | |||||||
| { |  | ||||||
|   "Logging": { |  | ||||||
|     "LogLevel": { |  | ||||||
|       "Default": "Information", |  | ||||||
|       "Microsoft.AspNetCore": "Warning" |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
| } |  | ||||||
| @ -8,5 +8,10 @@ | |||||||
|       "Microsoft.AspNetCore": "Warning" |       "Microsoft.AspNetCore": "Warning" | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "AllowedHosts": "*" |   "AllowedHosts": "*", | ||||||
|  |   "ConnectionStrings": { | ||||||
|  |     //"LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;" | ||||||
|  |     "LocationConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;" | ||||||
|  |  | ||||||
|  |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,4 +1,6 @@ | |||||||
| using DamageAssesment.Api.Questions.Interfaces; | using DamageAssesment.Api.Questions.Interfaces; | ||||||
|  | using DamageAssesment.Api.Questions.Models; | ||||||
|  | using Microsoft.AspNetCore.Authorization; | ||||||
| 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) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -11,6 +11,17 @@ | |||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> |     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> |     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Questions.Db | namespace DamageAssesment.Api.Questions.Db | ||||||
| { | { | ||||||
|  |     [Table("QuestionCategoryTrans")] | ||||||
|     public class CategoryTranslation |     public class CategoryTranslation | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Questions.Db | namespace DamageAssesment.Api.Questions.Db | ||||||
| { | { | ||||||
|  |     [Table("Questions")] | ||||||
|     public class Question |     public class Question | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -1,8 +1,10 @@ | |||||||
| using System.Buffers.Text; | using System.Buffers.Text; | ||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Questions.Db | namespace DamageAssesment.Api.Questions.Db | ||||||
| { | { | ||||||
|  |     [Table("QuestionCategories")] | ||||||
|     public class QuestionCategory |     public class QuestionCategory | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -6,6 +6,16 @@ namespace DamageAssesment.Api.Questions.Db | |||||||
| { | { | ||||||
|     public class QuestionDbContext : DbContext |     public class QuestionDbContext : DbContext | ||||||
|     { |     { | ||||||
|  |         private IConfiguration _Configuration { get; set; } | ||||||
|  |         public QuestionDbContext(DbContextOptions options, IConfiguration configuration) : base(options) | ||||||
|  |         { | ||||||
|  |             _Configuration = configuration; | ||||||
|  |         } | ||||||
|  |         protected override void OnConfiguring(DbContextOptionsBuilder options) | ||||||
|  |         { | ||||||
|  |             // connect to sql server with connection string from app settings | ||||||
|  |             options.UseSqlServer(_Configuration.GetConnectionString("QuestionConnection")); | ||||||
|  |         } | ||||||
|         public DbSet<Db.Question> Questions { get; set; } |         public DbSet<Db.Question> Questions { get; set; } | ||||||
|         public DbSet<Db.QuestionType> QuestionTypes { get; set; } |         public DbSet<Db.QuestionType> QuestionTypes { get; set; } | ||||||
|         public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; } |         public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; } | ||||||
|  | |||||||
| @ -1,7 +1,9 @@ | |||||||
| using System.ComponentModel.DataAnnotations; | using System.ComponentModel.DataAnnotations; | ||||||
|  | using System.ComponentModel.DataAnnotations.Schema; | ||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Questions.Db | namespace DamageAssesment.Api.Questions.Db | ||||||
| { | { | ||||||
|  |     [Table("QuestionTypes")] | ||||||
|     public class QuestionType |     public class QuestionType | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Questions.Db | namespace DamageAssesment.Api.Questions.Db | ||||||
| { | { | ||||||
|  |     [Table("QuestionTrans")] | ||||||
|     public class QuestionsTranslation |     public class QuestionsTranslation | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -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; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -5,6 +5,7 @@ | |||||||
|         public int CategoryId { get; set; } |         public int CategoryId { get; set; } | ||||||
|         public string IconName { get; set; } |         public string IconName { get; set; } | ||||||
|         public string IconLibrary { get; set; } |         public string IconLibrary { get; set; } | ||||||
|  |         public object CategoryNames { get; set; } | ||||||
|         public List<MultiLanguage> QuestionsText { get; set; } |         public List<MultiLanguage> QuestionsText { get; set; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,11 +1,36 @@ | |||||||
| 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); | ||||||
|  | builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => { | ||||||
|  |     build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin(); | ||||||
|  | })); | ||||||
|  | // Add services to the container. | ||||||
|  | var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey"); | ||||||
|  | builder.Services.AddAuthentication(item => | ||||||
|  | { | ||||||
|  |     item.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme; | ||||||
|  |     item.DefaultChallengeScheme = JwtBearerDefaults.AuthenticationScheme; | ||||||
|  | }).AddJwtBearer(item => | ||||||
|  | { | ||||||
|  |     item.RequireHttpsMetadata = true; | ||||||
|  |     item.SaveToken = true; | ||||||
|  |     item.TokenValidationParameters = new TokenValidationParameters() | ||||||
|  |     { | ||||||
|  |         ValidateIssuerSigningKey = true, | ||||||
|  |         IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(authkey)), | ||||||
|  |         ValidateIssuer = false, | ||||||
|  |         ValidateAudience = false, | ||||||
|  |         ClockSkew = TimeSpan.Zero | ||||||
|  |     }; | ||||||
|  | }); | ||||||
| // Add services to the container. | // Add services to the container. | ||||||
|  |  | ||||||
| builder.Services.AddControllers(); | builder.Services.AddControllers(); | ||||||
| @ -17,16 +42,44 @@ 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.UseSqlServer("QuestionConnection"); | ||||||
| }); | }); | ||||||
| var app = builder.Build(); | var app = builder.Build(); | ||||||
|  |  | ||||||
| @ -43,7 +96,8 @@ if (app.Environment.IsDevelopment()) | |||||||
|         questionProvider.SeedData(); |         questionProvider.SeedData(); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | app.UseCors("DamageAppCorsPolicy"); | ||||||
|  | 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" }); | ||||||
| @ -65,14 +64,51 @@ namespace DamageAssesment.Api.Questions.Providers | |||||||
|             if (!questionDbContext.Questions.Any()) |             if (!questionDbContext.Questions.Any()) | ||||||
|             { |             { | ||||||
|                 var question1 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; |                 var question1 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; | ||||||
|                 var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; |                 var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 }; | ||||||
|                 var question3 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; |                 var question3 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; | ||||||
|                 var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; |                 var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 }; | ||||||
|  |                 var question5 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 }; | ||||||
|  |                 var question6 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 }; | ||||||
|  |                 var question7 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 3}; | ||||||
|  |                 var question8 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 }; | ||||||
|  |                 var question9 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = true, Key = true, CategoryId = 5 }; | ||||||
|  |                 var question10 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = false, Key = true, CategoryId = 1 }; | ||||||
|  |                 var question11 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 2 }; | ||||||
|  |                 var question12 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 }; | ||||||
|  |                 var question13 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 4 }; | ||||||
|  |                 var question14 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 5 }; | ||||||
|  |                 var question15 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 }; | ||||||
|  |                 var question16 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 2 }; | ||||||
|  |                 var question17 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 3 }; | ||||||
|  |                 var question18 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 }; | ||||||
|  |                 var question19 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 5 }; | ||||||
|  |                 var question20 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 }; | ||||||
|  |                 var question21 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 2 }; | ||||||
|  |                 var question22 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 }; | ||||||
|  |  | ||||||
|                 questionDbContext.Questions.Add(question1); |                 questionDbContext.Questions.Add(question1); | ||||||
|                 questionDbContext.Questions.Add(question2); |                 questionDbContext.Questions.Add(question2); | ||||||
|                 questionDbContext.Questions.Add(question3); |                 questionDbContext.Questions.Add(question3); | ||||||
|                 questionDbContext.Questions.Add(question4); |                 questionDbContext.Questions.Add(question4); | ||||||
|  |                 questionDbContext.Questions.Add(question5); | ||||||
|  |                 questionDbContext.Questions.Add(question6); | ||||||
|  |                 questionDbContext.Questions.Add(question7); | ||||||
|  |                 questionDbContext.Questions.Add(question8); | ||||||
|  |                 questionDbContext.Questions.Add(question9); | ||||||
|  |                 questionDbContext.Questions.Add(question10); | ||||||
|  |                 questionDbContext.Questions.Add(question11); | ||||||
|  |                 questionDbContext.Questions.Add(question12); | ||||||
|  |                 questionDbContext.Questions.Add(question13); | ||||||
|  |                 questionDbContext.Questions.Add(question14); | ||||||
|  |                 questionDbContext.Questions.Add(question15); | ||||||
|  |                 questionDbContext.Questions.Add(question16); | ||||||
|  |                 questionDbContext.Questions.Add(question17); | ||||||
|  |                 questionDbContext.Questions.Add(question18); | ||||||
|  |                 questionDbContext.Questions.Add(question19); | ||||||
|  |                 questionDbContext.Questions.Add(question20); | ||||||
|  |                 questionDbContext.Questions.Add(question21); | ||||||
|  |                 questionDbContext.Questions.Add(question22); | ||||||
|  |  | ||||||
|                 questionDbContext.SaveChanges(); |                 questionDbContext.SaveChanges(); | ||||||
|             } |             } | ||||||
|  |  | ||||||
| @ -90,6 +126,64 @@ namespace DamageAssesment.Api.Questions.Providers | |||||||
|                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Are the grounds flooded ?", Language = "en" }); |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Are the grounds flooded ?", Language = "en" }); | ||||||
|                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); | ||||||
|                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); | ||||||
|  |  | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Can you open?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Is debris blocking access?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Are the grounds flooded?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "Is the access blocked by flooding?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Are any utility wires down?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Do you have damage to windows, doors, or walls?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Do you have roof damage?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Do you have major water intrusion?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Are any portable classrooms damaged and unusable?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Does your facility need to be secured/boarded?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Are you without commercial power?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Are you without water pressure?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Are you without telephones?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Are traffic signals damaged/missing?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "Are you without an operable fire alarm?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "Are you without an operable public address?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Do you have major debris?", Language = "en" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Are there any problems or issues not addressed above that would impede you from opening? If yes, please explain below?", Language = "en" }); | ||||||
|  |  | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Pouvez-vous ouvrir ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Est-ce que des débris bloquent l'accès ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "L'accès est-il bloqué par des inondations ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Des câbles d'utilité sont-ils tombés ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Avez-vous des dommages aux fenêtres, portes ou murs ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Avez-vous des dommages au toit ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Avez-vous une intrusion d'eau majeure ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Les salles de classe portables sont-elles endommagées et inutilisables ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Votre établissement a-t-il besoin d'être sécurisé/protégé ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Êtes-vous sans alimentation électrique commerciale ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Êtes-vous sans pression d'eau ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Êtes-vous sans téléphones ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Les feux de circulation sont-ils endommagés/absents ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "N'avez-vous pas d'alarme incendie fonctionnelle ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "N'avez-vous pas de système de sonorisation opérationnel ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Avez-vous une grande quantité de débris ?", Language = "fr" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Y a-t-il des problèmes ou des problèmes non abordés ci-dessus qui vous empêcheraient d'ouvrir ? Si oui, veuillez expliquer ci-dessous.", Language = "fr" }); | ||||||
|  |  | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "¿Puedes abrir ?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "¿Los escombros bloquean el acceso?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "¿Están inundados los terrenos?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "¿Hay cables de utilidad caídos?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "¿Tienes daños en ventanas, puertas o paredes?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "¿Tienes daños en el techo?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "¿Tienes una gran intrusión de agua?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "¿Hay aulas portátiles dañadas e inutilizables?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "¿Tu instalación necesita ser asegurada/tabicada?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "¿No tienes energía comercial?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "¿No tienes presión de agua?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "¿No tienes teléfonos?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "¿Los semáforos están dañados/faltan?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "¿No tienes una alarma de incendios operativa?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "¿No tienes un sistema de megafonía operativo?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "¿Tienes una gran cantidad de escombros?", Language = "es" }); | ||||||
|  |                 questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "¿Hay algún problema o asunto no abordado anteriormente que le impida abrir? Si es así, por favor explíquelo a continuación.", Language = "es" }); | ||||||
|  |  | ||||||
|                 questionDbContext.SaveChanges(); |                 questionDbContext.SaveChanges(); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
| @ -219,6 +313,7 @@ namespace DamageAssesment.Api.Questions.Providers | |||||||
|                             CategoryId = item.Id, |                             CategoryId = item.Id, | ||||||
|                             IconLibrary = item.IconLibrary, |                             IconLibrary = item.IconLibrary, | ||||||
|                             IconName = item.IconName, |                             IconName = item.IconName, | ||||||
|  |                             CategoryNames= CreateCategoryMultiLanguageObject(GetCategoryTranslations(item.Id, language)), | ||||||
|                             QuestionsText = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanguage>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language) |                             QuestionsText = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanguage>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language) | ||||||
|                         }); |                         }); | ||||||
|                     } |                     } | ||||||
| @ -239,16 +334,7 @@ namespace DamageAssesment.Api.Questions.Providers | |||||||
|             try |             try | ||||||
|             { |             { | ||||||
|                 logger?.LogInformation("Query Question"); |                 logger?.LogInformation("Query Question"); | ||||||
|                 var dbquestion = mapper.Map<Models.Question, Db.Question>(Question); |                 var result = InsertQuestion(Question); | ||||||
|                 var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions); |  | ||||||
|                 dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault(); |  | ||||||
|                 questionDbContext.Questions.Add(dbquestion); |  | ||||||
|                 dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id); |  | ||||||
|                 questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation); |  | ||||||
|                 questionDbContext.SaveChanges(); |  | ||||||
|                 Question.Id = dbquestion.Id; |  | ||||||
|                 var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion); |  | ||||||
|                 result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id,"")); |  | ||||||
|                 return (true, result, null); |                 return (true, result, null); | ||||||
|             } |             } | ||||||
|             catch (Exception ex) |             catch (Exception ex) | ||||||
| @ -257,6 +343,69 @@ namespace DamageAssesment.Api.Questions.Providers | |||||||
|                 return (false, null, ex.Message); |                 return (false, null, ex.Message); | ||||||
|             } |             } | ||||||
|         } |         } | ||||||
|  |         private Models.MultiLanguage InsertQuestion(Models.Question Question) | ||||||
|  |         { | ||||||
|  |             var dbquestion = mapper.Map<Models.Question, Db.Question>(Question); | ||||||
|  |             var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions); | ||||||
|  |             dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault(); | ||||||
|  |             questionDbContext.Questions.Add(dbquestion); | ||||||
|  |             questionDbContext.SaveChanges(); | ||||||
|  |             dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id); | ||||||
|  |             questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation); | ||||||
|  |             questionDbContext.SaveChanges(); | ||||||
|  |             Question.Id = dbquestion.Id; | ||||||
|  |             var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion); | ||||||
|  |             result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, "")); | ||||||
|  |             return result; | ||||||
|  |         } | ||||||
|  |         public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 List<Models.MultiLanguage> results = new List<MultiLanguage>(); | ||||||
|  |                 logger?.LogInformation("Query Question"); | ||||||
|  |                 foreach (Models.Question Question in Questions) | ||||||
|  |                 { | ||||||
|  |                     results.Add(InsertQuestion(Question)); | ||||||
|  |                 } | ||||||
|  |                 return (true, results, null); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |        | ||||||
|  |         public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId, List<Models.Question> Questions) | ||||||
|  |         { | ||||||
|  |             try | ||||||
|  |             { | ||||||
|  |                 var questions=await questionDbContext.Questions.AsNoTracking().Where(a=>a.SurveyId == surveyId).ToListAsync(); | ||||||
|  |                 if (questions != null) | ||||||
|  |                 { | ||||||
|  |                     List<int> questionids=questions.Select(a=>a.Id).ToList(); | ||||||
|  |                     var questiontrans = await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x => questionids.Contains(x.QuestionId)).ToListAsync(); | ||||||
|  |                     if (questiontrans != null) | ||||||
|  |                         questionDbContext.QuestionsTranslations.RemoveRange(questiontrans); | ||||||
|  |                     questionDbContext.Questions.RemoveRange(questions); | ||||||
|  |                     questionDbContext.SaveChanges(); | ||||||
|  |                 } | ||||||
|  |                 List<Models.MultiLanguage> results = new List<MultiLanguage>(); | ||||||
|  |                 logger?.LogInformation("Query Question"); | ||||||
|  |                 foreach (Models.Question Question in Questions) | ||||||
|  |                 { | ||||||
|  |                     Question.SurveyId = surveyId; | ||||||
|  |                     results.Add(InsertQuestion(Question)); | ||||||
|  |                 } | ||||||
|  |                 return (true, results, null); | ||||||
|  |             } | ||||||
|  |             catch (Exception ex) | ||||||
|  |             { | ||||||
|  |                 logger?.LogError(ex.ToString()); | ||||||
|  |                 return (false, null, ex.Message); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question) |         public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question) | ||||||
|         { |         { | ||||||
|             try |             try | ||||||
| @ -290,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"); | ||||||
|  | |||||||
| @ -1,8 +0,0 @@ | |||||||
| { |  | ||||||
|   "Logging": { |  | ||||||
|     "LogLevel": { |  | ||||||
|       "Default": "Information", |  | ||||||
|       "Microsoft.AspNetCore": "Warning" |  | ||||||
|     } |  | ||||||
|   } |  | ||||||
| } |  | ||||||
| @ -8,5 +8,10 @@ | |||||||
|       "Microsoft.AspNetCore": "Warning" |       "Microsoft.AspNetCore": "Warning" | ||||||
|     } |     } | ||||||
|   }, |   }, | ||||||
|   "AllowedHosts": "*" |   "AllowedHosts": "*", | ||||||
|  |   "ConnectionStrings": { | ||||||
|  |     //"QuestionConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;" | ||||||
|  |     "QuestionConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;" | ||||||
|  |  | ||||||
|  |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -10,7 +10,7 @@ | |||||||
|   </PropertyGroup> |   </PropertyGroup> | ||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" /> | ||||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" /> |     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" /> | ||||||
|     <PackageReference Include="Moq" Version="4.18.4" /> |     <PackageReference Include="Moq" Version="4.18.4" /> | ||||||
|     <PackageReference Include="xunit" Version="2.4.2" /> |     <PackageReference Include="xunit" Version="2.4.2" /> | ||||||
|  | |||||||
| @ -75,8 +75,20 @@ 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() | ||||||
| @ -329,6 +356,5 @@ namespace DamageAssesment.Api.Questions.Test | |||||||
|  |  | ||||||
|             Assert.Equal(404, result.StatusCode); |             Assert.Equal(404, result.StatusCode); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @ -12,9 +12,11 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|     public class SurveyResponsesServiceTest |     public class SurveyResponsesServiceTest | ||||||
|     { |     { | ||||||
|         Mock<ISurveysResponse> mockSurveyResponseService; |         Mock<ISurveysResponse> mockSurveyResponseService; | ||||||
|  |         Mock<IExcelExportService> mockExcelExportService; | ||||||
|         public SurveyResponsesServiceTest() |         public SurveyResponsesServiceTest() | ||||||
|         { |         { | ||||||
|             mockSurveyResponseService = new Mock<ISurveysResponse>(); |             mockSurveyResponseService = new Mock<ISurveysResponse>(); | ||||||
|  |             mockExcelExportService = new Mock<IExcelExportService>(); | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         [Fact(DisplayName = "Get Responses - Ok case")] |         [Fact(DisplayName = "Get Responses - Ok case")] | ||||||
| @ -23,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); |             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); |             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); | ||||||
|         } |         } | ||||||
| @ -43,9 +44,9 @@ 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); |             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); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @ -53,9 +54,9 @@ namespace DamageAssesment.SurveyResponses.Test | |||||||
|         public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode204() |         public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode204() | ||||||
|         { |         { | ||||||
|             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); |             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); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @ -67,9 +68,9 @@ 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); |             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); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @ -78,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); |             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); | ||||||
|         } |         } | ||||||
| @ -88,9 +89,9 @@ 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); |             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); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @ -99,8 +100,8 @@ 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); |             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); | ||||||
|         } |         } | ||||||
|  |  | ||||||
| @ -110,8 +111,8 @@ 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); |             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); | ||||||
|         } |         } | ||||||
| @ -121,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); |             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); | ||||||
|         } |         } | ||||||
| @ -132,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); |             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); | ||||||
|         } |         } | ||||||
| @ -142,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); |             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); | ||||||
|         } |         } | ||||||
| @ -153,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); |             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); | ||||||
|         } |         } | ||||||
| @ -163,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); |             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); | ||||||
|         } |         } | ||||||
| @ -175,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); |             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); | ||||||
|         } |         } | ||||||
| @ -186,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); |             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); | ||||||
|         } |         } | ||||||
| @ -197,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); |             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); | ||||||
|         } |         } | ||||||
| @ -208,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); |             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); | ||||||
|         } |         } | ||||||
| @ -219,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); |             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); | ||||||
|         } |         } | ||||||
| @ -229,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); |             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,22 +1,26 @@ | |||||||
| 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; | ||||||
| 
 | 
 | ||||||
|         public SurveyResponsesController(ISurveysResponse surveyResponseProvider) |         public ResponsesController(ISurveysResponse surveyResponseProvider, IExcelExportService excelExportService) | ||||||
|         { |         { | ||||||
|             this.surveyResponseProvider = surveyResponseProvider; |             this.surveyResponseProvider = surveyResponseProvider; | ||||||
|  |             this.excelExportService = excelExportService; | ||||||
|         } |         } | ||||||
|         /// <summary> |         /// <summary> | ||||||
|         /// 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] | ||||||
| @ -36,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] | ||||||
| @ -54,12 +59,13 @@ 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] | ||||||
|         public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid,int? employeeid) |         public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid, int? employeeid) | ||||||
|         { |         { | ||||||
|             var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid,employeeid ?? 0); |             var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid, employeeid ?? 0); | ||||||
|             if (result.IsSuccess) |             if (result.IsSuccess) | ||||||
|             { |             { | ||||||
|                 return Ok(result.SurveyResponses); |                 return Ok(result.SurveyResponses); | ||||||
| @ -73,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] | ||||||
| @ -91,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] | ||||||
| @ -107,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] | ||||||
| @ -124,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) | ||||||
|         { |         { | ||||||
| @ -140,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) | ||||||
|         { |         { | ||||||
| @ -156,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) | ||||||
|         { |         { | ||||||
| @ -173,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) | ||||||
|         { |         { | ||||||
| @ -188,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) | ||||||
|         { |         { | ||||||
| @ -198,6 +212,11 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|             else |             else | ||||||
|                 return BadRequest(result.ErrorMessage); |                 return BadRequest(result.ErrorMessage); | ||||||
|         } |         } | ||||||
|  |         /// <summary> | ||||||
|  |         /// Get All active surveys . | ||||||
|  |         /// </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}")] | ||||||
| @ -212,6 +231,24 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|             } |             } | ||||||
|             return NoContent(); |             return NoContent(); | ||||||
|         } |         } | ||||||
|  |         /// <summary> | ||||||
|  |         /// Export all survey response data based on survey id. | ||||||
|  |         /// </summary> | ||||||
|  |         [Authorize(Roles = "admin,survey,user,report")] | ||||||
|  |         [HttpGet] | ||||||
|  |         [Route("responses/surveys/export/{surveyid}")] | ||||||
|  |         public async Task<ActionResult> GetExcelSurveysAsync(int surveyid, string language, bool IsAdmin = false) | ||||||
|  |         { | ||||||
|  |             var result = await this.surveyResponseProvider.ExportSurveyResponsesAsync(surveyid, language, IsAdmin); | ||||||
|  |             if (result.IsSuccess && result.surveyResponses.Count > 0) | ||||||
|  |             { | ||||||
|  | 
 | ||||||
|  |                 byte[] fileContents = excelExportService.ExportToExcel<object>(result.surveyResponses); | ||||||
|  |                 return File(fileContents, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "data.xlsx"); | ||||||
|  |                 //return Ok(result.Surveys); | ||||||
|  |             } | ||||||
|  |             return NoContent(); | ||||||
|  |         } | ||||||
|         //[Route("responses/surveys/active")] |         //[Route("responses/surveys/active")] | ||||||
|         //[Route("responses/surveys/active/{language:alpha}")] |         //[Route("responses/surveys/active/{language:alpha}")] | ||||||
|         //[HttpGet] |         //[HttpGet] | ||||||
| @ -224,6 +261,11 @@ namespace DamageAssesment.Api.Responses.Controllers | |||||||
|         //    } |         //    } | ||||||
|         //    return NoContent(); |         //    return NoContent(); | ||||||
|         //} |         //} | ||||||
|  | 
 | ||||||
|  |         /// <summary> | ||||||
|  |         /// Get all historical surveys . | ||||||
|  |         /// </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}")] | ||||||
| @ -11,6 +11,21 @@ | |||||||
|  |  | ||||||
|   <ItemGroup> |   <ItemGroup> | ||||||
|     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> |     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" /> | ||||||
|  |     <PackageReference Include="ClosedXML" Version="0.102.1" /> | ||||||
|  |     <PackageReference Include="EPPlus" Version="6.2.10" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" /> | ||||||
|  |     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.9"> | ||||||
|  |       <PrivateAssets>all</PrivateAssets> | ||||||
|  |       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||||||
|  |     </PackageReference> | ||||||
|  |     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" /> | ||||||
|  |     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.9" /> | ||||||
|     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> |     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" /> | ||||||
|     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> |     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" /> | ||||||
|  | |||||||
| @ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; | |||||||
|  |  | ||||||
| namespace DamageAssesment.Api.Responses.Db | namespace DamageAssesment.Api.Responses.Db | ||||||
| { | { | ||||||
|  |     [Table("SurveyResponses")] | ||||||
|     public class SurveyResponse |     public class SurveyResponse | ||||||
|     { |     { | ||||||
|         [Key] |         [Key] | ||||||
|  | |||||||
| @ -4,12 +4,17 @@ namespace DamageAssesment.Api.Responses.Db | |||||||
| { | { | ||||||
|     public class SurveyResponseDbContext:DbContext |     public class SurveyResponseDbContext:DbContext | ||||||
|     { |     { | ||||||
|         public DbSet<Db.SurveyResponse> SurveyResponses { get; set; } |         private IConfiguration _Configuration { get; set; } | ||||||
|  |         public SurveyResponseDbContext(DbContextOptions options, IConfiguration configuration) : base(options) | ||||||
|         public SurveyResponseDbContext(DbContextOptions options) : base(options) |  | ||||||
|         { |         { | ||||||
|  |             _Configuration = configuration; | ||||||
|         } |         } | ||||||
|  |         protected override void OnConfiguring(DbContextOptionsBuilder options) | ||||||
|  |         { | ||||||
|  |             // connect to sql server with connection string from app settings | ||||||
|  |             options.UseSqlServer(_Configuration.GetConnectionString("ResponsesConnection")); | ||||||
|  |         } | ||||||
|  |         public DbSet<Db.SurveyResponse> SurveyResponses { get; set; } | ||||||
|  |  | ||||||
|         protected override void OnModelCreating(ModelBuilder modelBuilder) |         protected override void OnModelCreating(ModelBuilder modelBuilder) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -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); | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @ -0,0 +1,7 @@ | |||||||
|  | namespace DamageAssesment.Api.Responses.Interfaces | ||||||
|  | { | ||||||
|  |     public interface IExcelExportService | ||||||
|  |     { | ||||||
|  |         public byte[] ExportToExcel<T1>(List<object> responses); | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -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,8 +4,9 @@ namespace DamageAssesment.Api.Responses.Interfaces | |||||||
| { | { | ||||||
|     public interface IQuestionServiceProvider |     public interface IQuestionServiceProvider | ||||||
|     { |     { | ||||||
|         Task<List<Question>> getQuestionsAsync(); |         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, 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); | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -7,8 +7,9 @@ namespace DamageAssesment.Api.Responses.Interfaces | |||||||
|     { |     { | ||||||
|         Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId, int employeeid); |         Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId, int employeeid); | ||||||
|         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyResponseAsync(Models.SurveyResponse surveyResponse); |         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyResponseAsync(Models.SurveyResponse surveyResponse); | ||||||
|        // Task<(bool IsSuccess,dynamic surveyResponses, string ErrorMessage)> GetSurveyResponseAsync(int responseId); |         // Task<(bool IsSuccess,dynamic surveyResponses, string ErrorMessage)> GetSurveyResponseAsync(int responseId); | ||||||
|         Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync(int employeeid); |         Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync(int employeeid); | ||||||
|  |         Task<(bool IsSuccess, List<object> surveyResponses, string ErrorMessage)> ExportSurveyResponsesAsync(int surveyId, string language, bool IsAdmin); | ||||||
|         Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetActiveSurveysAsync(int? employeeid, string language); |         Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetActiveSurveysAsync(int? employeeid, string language); | ||||||
|         Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetHistoricSurveysAsync(int? employeeid, string language); |         Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetHistoricSurveysAsync(int? employeeid, string language); | ||||||
|         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse); |         Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse); | ||||||
|  | |||||||
| @ -11,6 +11,7 @@ namespace DamageAssesment.Api.Responses.Models | |||||||
|  |  | ||||||
|         public int? AnswerId { get; set; } |         public int? AnswerId { get; set; } | ||||||
|         public bool IsDeleted { get; set; } |         public bool IsDeleted { get; set; } | ||||||
|  |         public string FileName { get; set; } | ||||||
|  |  | ||||||
|         public Attachment(int answerId, string uri) |         public Attachment(int answerId, string uri) | ||||||
|         { |         { | ||||||
|  | |||||||
| @ -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; } | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user
	