Compare commits
40 Commits
dev
...
local-dock
Author | SHA1 | Date | |
---|---|---|---|
|
513049287c | ||
|
fcc0205175 | ||
|
281a789deb | ||
|
fc154274a0 | ||
|
19fac4d810 | ||
|
17cd993a56 | ||
|
8285588db9 | ||
|
6fbe21979f | ||
|
fc166e65c9 | ||
|
ae6b306290 | ||
|
d3a751a6ad | ||
|
2182b9a6b3 | ||
|
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
|
||||
*.sln.iml
|
||||
**/migrations/
|
@ -13,7 +13,12 @@
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.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.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
|
||||
</ItemGroup>
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Answers.Db
|
||||
{
|
||||
[Table("Answers")]
|
||||
public class Answer
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,13 +1,19 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace DamageAssesment.Api.Answers.Db
|
||||
{
|
||||
public class AnswerDbContext:DbContext
|
||||
{
|
||||
|
||||
public AnswerDbContext(DbContextOptions options):base(options)
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
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; }
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
|
@ -23,7 +23,7 @@ builder.Services.AddScoped<IAnswersProvider, AnswersProvider>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
|
||||
builder.Services.AddDbContext<AnswerDbContext>(option =>
|
||||
{
|
||||
option.UseInMemoryDatabase("Answers");
|
||||
option.UseSqlServer("AnswerConnection");
|
||||
});
|
||||
|
||||
var app = builder.Build();
|
||||
|
@ -198,13 +198,12 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
{
|
||||
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() { Id = 2, AnswerText = "No", Comment = "Comment test 5", QuestionId = 2, SurveyResponseId = 1 });
|
||||
// Uncomment the lines below to add more initial data if needed
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { Id = 4, AnswerText = "Yes", Comment = "No Comment", QuestionId = 1, SurveyResponseId = 2 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { Id = 5, AnswerText = "No", Comment = "No Comment", QuestionId = 2, SurveyResponseId = 2 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { Id = 6, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 2 });
|
||||
answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
|
||||
answerDbContext.Answers.Add(new Db.Answer() { AnswerText = "No", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
|
||||
//answerDbContext.Answers.Add(new Db.Answer() { 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() { 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.SaveChanges();
|
||||
}
|
||||
}
|
||||
|
@ -1,8 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -8,5 +8,11 @@
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
//"AnswerConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
// "AnswerConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;",
|
||||
"AnswerConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -136,6 +136,80 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// download an existing attachment.
|
||||
/// </summary>
|
||||
[HttpGet("attachments/download/{id}")]
|
||||
public async Task<IActionResult> downloadfile(int id)
|
||||
{
|
||||
try
|
||||
{
|
||||
var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id);
|
||||
if (!result.IsSuccess)
|
||||
return NotFound();
|
||||
string path = await UploadService.GetFile(result.Attachment.URI);
|
||||
if (path == null)
|
||||
return NotFound();
|
||||
var contentType = GetContentType(result.Attachment.FileName);
|
||||
if (contentType == "application/octet-stream")
|
||||
return PhysicalFile(path, contentType, result.Attachment.FileName);
|
||||
return PhysicalFile(path, contentType, enableRangeProcessing: true);// result.Attachment.FileName);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Handle the exception here or log it
|
||||
return StatusCode(500, "An error occurred: " + ex.Message);
|
||||
}
|
||||
//try
|
||||
//{
|
||||
// var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id);
|
||||
// if(!result.IsSuccess)
|
||||
// return NotFound();
|
||||
// byte[] fileContent = await UploadService.DownloadFile(result.Attachment.URI);
|
||||
// if (fileContent == null || fileContent.Length == 0)
|
||||
// return NotFound();
|
||||
// var contentType = "application/octet-stream";
|
||||
// return File(fileContent, contentType, result.Attachment.FileName);
|
||||
//}
|
||||
//catch (Exception ex)
|
||||
//{
|
||||
// // Handle the exception here or log it
|
||||
// return StatusCode(500, "An error occurred: " + ex.Message);
|
||||
//}
|
||||
}
|
||||
private string GetContentType(string fileName)
|
||||
{
|
||||
// You can add more content types based on the file extensions
|
||||
switch (Path.GetExtension(fileName).ToLower())
|
||||
{
|
||||
//case ".txt":
|
||||
// return "text/plain";
|
||||
case ".jpg":
|
||||
case ".jpeg":
|
||||
return "image/jpeg";
|
||||
case ".png":
|
||||
return "image/png";
|
||||
case ".gif":
|
||||
return "image/gif";
|
||||
case ".bmp":
|
||||
return "image/bmp";
|
||||
case ".webp":
|
||||
return "image/webp";
|
||||
case ".csv":
|
||||
return "text/csv";
|
||||
case ".pdf":
|
||||
return "application/pdf";
|
||||
case ".docx":
|
||||
case ".doc":
|
||||
return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
|
||||
case ".xlsx":
|
||||
case ".xls":
|
||||
return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
||||
// Add more cases as needed
|
||||
default:
|
||||
return "application/octet-stream";
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Delete an existing attachment.
|
||||
/// </summary>
|
||||
[HttpDelete("attachments/{id}")]
|
||||
|
@ -1 +0,0 @@
|
||||
sample
|
@ -14,8 +14,19 @@
|
||||
<PackageReference Include="Azure.Storage.Blobs" Version="12.16.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<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="Swashbuckle.AspNetCore" Version="6.2.3" />
|
||||
</ItemGroup>
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Attachments.Db
|
||||
{
|
||||
[Table("AnswerAttachments")]
|
||||
public class Attachment
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,11 +1,19 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace DamageAssesment.Api.Attachments.Db
|
||||
{
|
||||
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; }
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
|
@ -7,6 +7,8 @@ namespace DamageAssesment.Api.Attachments.Interfaces
|
||||
List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
|
||||
List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
|
||||
public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
|
||||
Task<byte[]> DownloadFile(string path);
|
||||
Task<string> GetFile(string path);
|
||||
void Deletefile(string path);
|
||||
void Movefile(string path);
|
||||
}
|
||||
|
@ -27,7 +27,7 @@ builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
|
||||
builder.Services.AddDbContext<AttachmentsDbContext>(option =>
|
||||
{
|
||||
option.UseInMemoryDatabase("Attachments");
|
||||
option.UseSqlServer("AttachmentConnection");
|
||||
});
|
||||
builder.Services.Configure<FormOptions>(o =>
|
||||
{
|
||||
|
@ -21,7 +21,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
this.uploadservice = uploadservice;
|
||||
SeedData();
|
||||
//SeedData();
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
|
||||
{
|
||||
|
@ -24,6 +24,41 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
|
||||
Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
|
||||
}
|
||||
public async Task<string> GetFile(string path)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (System.IO.File.Exists(path))
|
||||
{
|
||||
return path;
|
||||
}
|
||||
|
||||
return null; // File not found
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Handle or log the exception as needed
|
||||
throw;
|
||||
}
|
||||
|
||||
}
|
||||
public async Task<byte[]> DownloadFile(string path)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (System.IO.File.Exists(path))
|
||||
{
|
||||
return await System.IO.File.ReadAllBytesAsync(path);
|
||||
}
|
||||
|
||||
return null; // File not found
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Handle or log the exception as needed
|
||||
throw;
|
||||
}
|
||||
}
|
||||
public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
|
||||
{
|
||||
var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
|
||||
|
@ -1,8 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -12,5 +12,11 @@
|
||||
"Fileupload": {
|
||||
"folderpath": "DMS_Attachments/Active",
|
||||
"Deletepath": "DMS_Attachments/Deleted"
|
||||
},
|
||||
"ConnectionStrings": {
|
||||
//"AttachmentConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
// "AttachmentConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"AttachmentConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
}
|
||||
}
|
||||
|
@ -197,7 +197,29 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1);
|
||||
Assert.Equal(404, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Update Document IsActive- Ok case")]
|
||||
public async Task UpdateDocumentAsync_ShouldReturnStatusCode200()
|
||||
{
|
||||
var mockDocumentService = new Mock<IDoculinkProvider>();
|
||||
var mockUploadService = new Mock<IUploadService>();
|
||||
var mockResponse = await MockData.getOkResponse(1);
|
||||
mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
|
||||
var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
|
||||
var result = (OkObjectResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
|
||||
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Update Document IsActive - NotFound case")]
|
||||
public async Task UpdateDocumentAsync_ShouldReturnStatusCode404()
|
||||
{
|
||||
var mockDocumentService = new Mock<IDoculinkProvider>();
|
||||
var mockUploadService = new Mock<IUploadService>();
|
||||
var mockResponse = await MockData.getNotFoundResponse();
|
||||
mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
|
||||
var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
|
||||
var result = (NotFoundResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
|
||||
Assert.Equal(404, result.StatusCode);
|
||||
}
|
||||
|
||||
// Link Type Test cases
|
||||
|
||||
|
@ -13,7 +13,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
private readonly IDoculinkProvider documentsProvider;
|
||||
private readonly IUploadService uploadService;
|
||||
|
||||
public DoculinkController(IDoculinkProvider documentsProvider,IUploadService uploadService)
|
||||
public DoculinkController(IDoculinkProvider documentsProvider, IUploadService uploadService)
|
||||
{
|
||||
|
||||
this.documentsProvider = documentsProvider;
|
||||
@ -41,7 +41,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
[HttpGet]
|
||||
[Route("doculinks/types/{id}")]
|
||||
[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);
|
||||
if (result.IsSuccess)
|
||||
@ -55,11 +55,11 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
/// </summary>
|
||||
[HttpPut]
|
||||
[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)
|
||||
{
|
||||
var result = await this.documentsProvider.UpdateLinkTypeAsync(id,linkType);
|
||||
var result = await this.documentsProvider.UpdateLinkTypeAsync(id, linkType);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.LinkType);
|
||||
@ -104,6 +104,80 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
return NotFound();
|
||||
}
|
||||
/// <summary>
|
||||
/// download an existing attachment.
|
||||
/// </summary>
|
||||
[HttpGet("doculinks/download/{id}")]
|
||||
public async Task<IActionResult> downloadfile(int id)
|
||||
{
|
||||
try
|
||||
{
|
||||
var result = await this.documentsProvider.GetDownloadAttachmentAsync(id);
|
||||
if (!result.IsSuccess)
|
||||
return NotFound();
|
||||
string path = await uploadService.GetFile(result.DoculinkAttachments.Path);
|
||||
if (path == null)
|
||||
return NotFound();
|
||||
var contentType = GetContentType(result.DoculinkAttachments.docName);
|
||||
if (contentType == "application/octet-stream")
|
||||
return PhysicalFile(path, contentType, result.DoculinkAttachments.docName);
|
||||
return PhysicalFile(path, contentType, enableRangeProcessing: true);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Handle the exception here or log it
|
||||
return StatusCode(500, "An error occurred: " + ex.Message);
|
||||
}
|
||||
//try
|
||||
//{
|
||||
// var result = await this.documentsProvider.GetDownloadAttachmentAsync(id);
|
||||
// if (!result.IsSuccess)
|
||||
// return NotFound();
|
||||
// byte[] fileContent = await uploadService.DownloadFile(result.DoculinkAttachments.Path);
|
||||
// if (fileContent == null || fileContent.Length == 0)
|
||||
// return NotFound();
|
||||
// var contentType = "application/octet-stream";
|
||||
// return File(fileContent, contentType, result.DoculinkAttachments.docName);
|
||||
//}
|
||||
//catch (Exception ex)
|
||||
//{
|
||||
// // Handle the exception here or log it
|
||||
// return StatusCode(500, "An error occurred: " + ex.Message);
|
||||
//}
|
||||
}
|
||||
private string GetContentType(string fileName)
|
||||
{
|
||||
// You can add more content types based on the file extensions
|
||||
switch (Path.GetExtension(fileName).ToLower())
|
||||
{
|
||||
//case ".txt":
|
||||
// return "text/plain";
|
||||
case ".jpg":
|
||||
case ".jpeg":
|
||||
return "image/jpeg";
|
||||
case ".png":
|
||||
return "image/png";
|
||||
case ".gif":
|
||||
return "image/gif";
|
||||
case ".bmp":
|
||||
return "image/bmp";
|
||||
case ".webp":
|
||||
return "image/webp";
|
||||
case ".csv":
|
||||
return "text/csv";
|
||||
case ".pdf":
|
||||
return "application/pdf";
|
||||
case ".docx":
|
||||
case ".doc":
|
||||
return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
|
||||
case ".xlsx":
|
||||
case ".xls":
|
||||
return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
||||
// Add more cases as needed
|
||||
default:
|
||||
return "application/octet-stream";
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Get all Doculink.
|
||||
/// </summary>
|
||||
///
|
||||
@ -111,7 +185,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
[Route("doculinks/{linktype:alpha}")]
|
||||
[Route("doculinks/{linktype:alpha}/{language:alpha}")]
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language,bool? isactive)
|
||||
public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language, bool? isactive)
|
||||
{
|
||||
var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive);
|
||||
if (result.IsSuccess)
|
||||
@ -129,7 +203,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
[HttpGet]
|
||||
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)
|
||||
{
|
||||
return Ok(result.documents);
|
||||
@ -158,7 +232,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
[Route("doculinks/{id}")]
|
||||
[Route("doculinks/{id}/{linktype:alpha}")]
|
||||
[Route("doculinks/{id}/{linktype:alpha}/{language:alpha}")]
|
||||
public async Task<IActionResult> GetDocumentAsync(int id,string? linktype, string? language)
|
||||
public async Task<IActionResult> GetDocumentAsync(int id, string? linktype, string? language)
|
||||
{
|
||||
var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
|
||||
if (result.IsSuccess)
|
||||
@ -172,7 +246,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
/// </summary>
|
||||
[HttpPut]
|
||||
[Route("doculinks/{id}")]
|
||||
public async Task<IActionResult> UpdateDocument(int id,ReqDoculink documentInfo)
|
||||
public async Task<IActionResult> UpdateDocument(int id, ReqDoculink documentInfo)
|
||||
{
|
||||
if (documentInfo != null)
|
||||
{
|
||||
@ -180,7 +254,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
if (dbdoc.IsSuccess)
|
||||
{
|
||||
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);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
@ -193,6 +267,20 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
return BadRequest(documentInfo);
|
||||
}
|
||||
/// <summary>
|
||||
/// update existing doclink isactive field.
|
||||
/// </summary>
|
||||
[HttpPut]
|
||||
[Route("doculinks/{id}/{isactive}")]
|
||||
public async Task<IActionResult> UpdateIsActiveDocument(int id, bool isactive)
|
||||
{
|
||||
var result = await this.documentsProvider.UpdateDocumentAsync(id, isactive);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Document);
|
||||
}
|
||||
return NotFound();
|
||||
}
|
||||
/// <summary>
|
||||
/// Create new doclink.
|
||||
/// </summary>
|
||||
[HttpPost]
|
||||
@ -204,7 +292,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
if (documentInfo != null)
|
||||
{
|
||||
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);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
|
@ -1 +0,0 @@
|
||||
sample
|
@ -1 +0,0 @@
|
||||
sample
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("Doculinks")]
|
||||
public class Doculink
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkAttachments")]
|
||||
public class DoculinkAttachments
|
||||
{
|
||||
|
||||
|
@ -7,8 +7,15 @@ namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
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("DoculinConnection"));
|
||||
}
|
||||
public DbSet<Db.Doculink> Documents { get; set; }
|
||||
public DbSet<Db.LinkType> LinkTypes { get; set; }
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTrans")]
|
||||
public class DoculinkTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,7 +1,9 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTypes")]
|
||||
public class LinkType
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTypeTrans")]
|
||||
public class LinksTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -11,6 +11,7 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
|
||||
Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, bool isactive);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
|
||||
Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
|
||||
|
||||
|
@ -7,6 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
|
||||
Models.Doculink UploadDocument( int counter, ReqDoculink documentInfo);
|
||||
public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
|
||||
void Deletefile(string path);
|
||||
Task<byte[]> DownloadFile(string path);
|
||||
Task<string> GetFile(string path);
|
||||
void Movefile(string path);
|
||||
}
|
||||
}
|
||||
|
@ -7,6 +7,7 @@ namespace DamageAssesment.Api.DocuLinks.Models
|
||||
public int Id { get; set; }
|
||||
public int linkTypeId { get; set; }
|
||||
public List<DoculinkTranslation> documentsTranslations { get; set; }
|
||||
public bool IsActive { get; set; }
|
||||
public int CustomOrder { get; set; }
|
||||
public List<FileModel>? Files { get; set; }
|
||||
}
|
||||
|
@ -25,7 +25,7 @@ builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
|
||||
builder.Services.AddDbContext<DoculinkDbContext>(option =>
|
||||
{
|
||||
option.UseInMemoryDatabase("DocumentConnection");
|
||||
option.UseSqlServer("DoculinConnection");
|
||||
});
|
||||
var app = builder.Build();
|
||||
|
||||
|
@ -75,7 +75,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
}
|
||||
else
|
||||
fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
|
||||
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);
|
||||
DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
|
||||
DocumentDbContext.SaveChanges();
|
||||
@ -414,6 +414,35 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
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)
|
||||
{
|
||||
|
||||
|
@ -25,6 +25,32 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
|
||||
Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
|
||||
}
|
||||
public async Task<string> GetFile(string path)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (System.IO.File.Exists(path))
|
||||
{
|
||||
return path;
|
||||
}
|
||||
|
||||
return null; // File not found
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Handle or log the exception as needed
|
||||
throw;
|
||||
}
|
||||
|
||||
}
|
||||
public async Task<byte[]> DownloadFile(string path)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (System.IO.File.Exists(path))
|
||||
{
|
||||
return await System.IO.File.ReadAllBytesAsync(path);
|
||||
}
|
||||
|
||||
public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
|
||||
{
|
||||
@ -56,7 +82,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
}
|
||||
Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
|
||||
documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
|
||||
IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true};
|
||||
IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =documentInfo.IsActive
|
||||
};
|
||||
|
||||
return Documents;
|
||||
}
|
||||
@ -99,7 +126,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
Id = documentInfo.Id,
|
||||
linkTypeId = documentInfo.linkTypeId,
|
||||
documentsTranslations=documentInfo.documentsTranslations,
|
||||
IsActive = true,
|
||||
IsActive = documentInfo.IsActive,
|
||||
IsDeleted=false,
|
||||
CustomOrder = documentInfo.CustomOrder,
|
||||
doclinksAttachments = attachments
|
||||
|
@ -1,8 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -6,6 +6,12 @@
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
//"DoculinConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;",
|
||||
//"DoculinConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"DoculinConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
},
|
||||
"Fileupload": {
|
||||
"folderpath": "DASA_Documents/Active",
|
||||
"Deletepath": "DASA_Documents/Deleted"
|
||||
|
@ -12,8 +12,18 @@
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
|
||||
<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="Swashbuckle.AspNetCore" Version="6.2.3" />
|
||||
</ItemGroup>
|
||||
|
@ -1,7 +1,9 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Employees.Db
|
||||
{
|
||||
[Table("Employees")]
|
||||
public class Employee
|
||||
{
|
||||
[Key]
|
||||
|
@ -4,18 +4,23 @@ namespace DamageAssesment.Api.Employees.Db
|
||||
{
|
||||
public class EmployeeDbContext: DbContext
|
||||
{
|
||||
public DbSet<Db.Employee> Employees { get; set; }
|
||||
public EmployeeDbContext(DbContextOptions options) : base(options)
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
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)
|
||||
{
|
||||
base.OnModelCreating(modelBuilder);
|
||||
|
||||
modelBuilder.Entity<Employee>()
|
||||
.Property(item => item.Id)
|
||||
.ValueGeneratedOnAdd();
|
||||
}
|
||||
public DbSet<Db.Employee> Employees { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -24,7 +24,7 @@ builder.Services.AddScoped<IEmployeesProvider, EmployeesProvider>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
|
||||
builder.Services.AddDbContext<EmployeeDbContext>(option =>
|
||||
{
|
||||
option.UseInMemoryDatabase("Employees");
|
||||
option.UseSqlServer("EmployeeConnection");
|
||||
});
|
||||
|
||||
var app = builder.Build();
|
||||
|
@ -1,8 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -13,5 +13,11 @@
|
||||
"endpoint1": "xxx",
|
||||
"endpoint2": "xxx",
|
||||
"endpoint3": "xxx"
|
||||
},
|
||||
"ConnectionStrings": {
|
||||
//"EmployeeConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;",
|
||||
//"EmployeeConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"EmployeeConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -11,6 +11,17 @@
|
||||
|
||||
<ItemGroup>
|
||||
<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.EntityFrameworkCore" 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
|
||||
{
|
||||
[Table("Locations")]
|
||||
public class Location
|
||||
{
|
||||
[Key]
|
||||
@ -20,6 +21,10 @@ namespace DamageAssesment.Api.Locations.Db
|
||||
|
||||
[StringLength(2)]
|
||||
public string SchoolType { get; set; }
|
||||
public int? DataValue { get; set; }
|
||||
public int? Enrollment { get; set; }
|
||||
public double? Longitute { get; set; }
|
||||
public double? Latitude { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -4,6 +4,16 @@ namespace DamageAssesment.Api.Locations.Db
|
||||
{
|
||||
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.Region> Regions { get; set; }
|
||||
public LocationDbContext(DbContextOptions options) : base(options)
|
||||
|
@ -1,7 +1,9 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Locations.Db
|
||||
{
|
||||
[Table("Regions")]
|
||||
public class Region
|
||||
{
|
||||
[Key]
|
||||
|
@ -11,5 +11,9 @@ namespace DamageAssesment.Api.Locations.Models
|
||||
public string Name { get; set; }
|
||||
public string MaintenanceCenter { get; set; }
|
||||
public string SchoolType { get; set; }
|
||||
public int? DataValue { get; set; }
|
||||
public int? Enrollment { get; set; }
|
||||
public double? Longitute { get; set; }
|
||||
public double? Latitude { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -24,7 +24,7 @@ builder.Services.AddScoped<IRegionsProvider, RegionsProvider>();
|
||||
builder.Services.AddAutoMapper(AppDomain.CurrentDomain.GetAssemblies()); //4/30
|
||||
builder.Services.AddDbContext<LocationDbContext>(option =>
|
||||
{
|
||||
option.UseInMemoryDatabase("Locations");
|
||||
option.UseSqlServer("LocationConnection");
|
||||
});
|
||||
var app = builder.Build();
|
||||
|
||||
|
@ -17,7 +17,7 @@ namespace DamageAssesment.Api.Locations.Providers
|
||||
this.locationDbContext = locationDbContext;
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
// SeedData();
|
||||
// SeedData();
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Location> Locations, string ErrorMessage)> GetLocationsAsync()
|
||||
@ -28,6 +28,8 @@ namespace DamageAssesment.Api.Locations.Providers
|
||||
var locations = await locationDbContext.Locations.AsNoTracking().ToListAsync();
|
||||
if (locations != null)
|
||||
{
|
||||
int maxenrollment = (int)locations.Max(a => a.Enrollment);
|
||||
foreach (Db.Location item in locations) { item.DataValue = GetHeatmapdata(item.Enrollment, maxenrollment); }
|
||||
logger?.LogInformation($"{locations.Count} Locations(s) found");
|
||||
var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(locations);
|
||||
return (true, result, null);
|
||||
@ -46,9 +48,12 @@ namespace DamageAssesment.Api.Locations.Providers
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Location");
|
||||
|
||||
int maxenrollment = (int)await locationDbContext.Locations.AsNoTracking().MaxAsync(a => a.Enrollment);
|
||||
var location = await locationDbContext.Locations.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
|
||||
if (location != null)
|
||||
{
|
||||
{if(maxenrollment>0)
|
||||
location.DataValue = GetHeatmapdata(location.Enrollment, maxenrollment);
|
||||
logger?.LogInformation($"{location} found");
|
||||
var result = mapper.Map<Db.Location, Models.Location>(location);
|
||||
return (true, result, null);
|
||||
@ -61,6 +66,10 @@ namespace DamageAssesment.Api.Locations.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
private int GetHeatmapdata(int? enrollment,int maxenrollment)
|
||||
{
|
||||
return (enrollment != null ? enrollment.Value : 0) * 100 / maxenrollment;
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> PostLocationAsync(Models.Location location)
|
||||
{
|
||||
try
|
||||
@ -139,9 +148,9 @@ namespace DamageAssesment.Api.Locations.Providers
|
||||
{
|
||||
if (!locationDbContext.Locations.Any())
|
||||
{
|
||||
locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0091", RegionId = 5, Name = "BOB GRAHAM EDUCATION CENTER", MaintenanceCenter = "1", SchoolType = "K8" });
|
||||
locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0092", RegionId = 1, Name = "NORMAN S. EDELCUP/SUNNY ISLES BEACH K-8", MaintenanceCenter = "1", SchoolType = "K8" });
|
||||
locationDbContext.Locations.Add(new Db.Location() { LocationCode = "7511", RegionId = 4, Name = "MIAMI SPRINGS SHS", MaintenanceCenter = "2", SchoolType = "S" });
|
||||
locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0091", RegionId = 5, Name = "BOB GRAHAM EDUCATION CENTER", MaintenanceCenter = "1", SchoolType = "K8", DataValue = 25,Enrollment=780,Latitude= 25.83604,Longitute= -80.21618 });
|
||||
locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0092", RegionId = 1, Name = "NORMAN S. EDELCUP/SUNNY ISLES BEACH K-8", MaintenanceCenter = "1", SchoolType = "K8", DataValue = 46, Enrollment = 650, Latitude = 20.83604, Longitute = -40.21618 });
|
||||
locationDbContext.Locations.Add(new Db.Location() { LocationCode = "7511", RegionId = 4, Name = "MIAMI SPRINGS SHS", MaintenanceCenter = "2", SchoolType = "S", DataValue = 12, Enrollment = 500, Latitude = 53.83604, Longitute = -60.21618 });
|
||||
//locationDbContext.Locations.Add(new Db.Location() { Id = 3, LocationCode = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
|
||||
//locationDbContext.Locations.Add(new Db.Location() { Id = 4, LocationCode = "Loc4", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 4", MaintenanceCenter = "1", SchoolType = "US" });
|
||||
//locationDbContext.Locations.Add(new Db.Location() { Id = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });
|
||||
|
@ -1,8 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -8,5 +8,11 @@
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
//"LocationConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;",
|
||||
// "LocationConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"LocationConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -89,6 +89,26 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
|
||||
}
|
||||
/// <summary>
|
||||
/// POST request for creating a multiple question (multilingual).
|
||||
/// </summary>
|
||||
[HttpPost("questions/multiple")]
|
||||
public async Task<IActionResult> CreateQuestions(List<Models.Question> questions)
|
||||
{
|
||||
if (questions != null)
|
||||
{
|
||||
var result = await this.questionsProvider.PostQuestionsAsync(questions);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Question);
|
||||
}
|
||||
if (result.ErrorMessage == "Not Found")
|
||||
return NotFound(result.ErrorMessage);
|
||||
|
||||
return BadRequest(result.ErrorMessage);
|
||||
}
|
||||
return CreatedAtRoute("DefaultApi",questions);
|
||||
}
|
||||
/// <summary>
|
||||
/// POST request for creating a new question (multilingual).
|
||||
/// </summary>
|
||||
|
||||
|
@ -11,6 +11,17 @@
|
||||
|
||||
<ItemGroup>
|
||||
<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.EntityFrameworkCore" 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
|
||||
{
|
||||
[Table("QuestionCategoryTrans")]
|
||||
public class CategoryTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("Questions")]
|
||||
public class Question
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,8 +1,10 @@
|
||||
using System.Buffers.Text;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionCategories")]
|
||||
public class QuestionCategory
|
||||
{
|
||||
[Key]
|
||||
|
@ -6,6 +6,16 @@ namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
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.QuestionType> QuestionTypes { get; set; }
|
||||
public DbSet<Db.QuestionsTranslation> QuestionsTranslations { get; set; }
|
||||
|
@ -1,7 +1,9 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionTypes")]
|
||||
public class QuestionType
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionTrans")]
|
||||
public class QuestionsTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -8,6 +8,7 @@ namespace DamageAssesment.Api.Questions.Interfaces
|
||||
Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language);
|
||||
Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string language);
|
||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions);
|
||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
|
||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id);
|
||||
|
||||
|
@ -5,6 +5,7 @@
|
||||
public int CategoryId { get; set; }
|
||||
public string IconName { get; set; }
|
||||
public string IconLibrary { get; set; }
|
||||
public object CategoryNames { get; set; }
|
||||
public List<MultiLanguage> QuestionsText { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ builder.Services.AddSwaggerGen(c =>
|
||||
});
|
||||
builder.Services.AddDbContext<QuestionDbContext>(option =>
|
||||
{
|
||||
option.UseInMemoryDatabase("Questions");
|
||||
option.UseSqlServer("QuestionConnection");
|
||||
});
|
||||
var app = builder.Build();
|
||||
|
||||
|
@ -31,8 +31,7 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" });
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
if (!questionDbContext.QuestionCategories.Any())
|
||||
if (!questionDbContext.QuestionsTranslations.Any())
|
||||
{
|
||||
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" });
|
||||
@ -65,14 +64,51 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
if (!questionDbContext.Questions.Any())
|
||||
{
|
||||
var question1 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
|
||||
var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
|
||||
var question2 = new Db.Question() { QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
|
||||
var question3 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
|
||||
var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
|
||||
var question4 = new Db.Question() { QuestionTypeId = 1, SurveyId = 2, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
|
||||
var question5 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
|
||||
var question6 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 2 };
|
||||
var question7 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 3};
|
||||
var question8 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 };
|
||||
var question9 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = true, Key = true, CategoryId = 5 };
|
||||
var question10 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = false, Key = true, CategoryId = 1 };
|
||||
var question11 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 2 };
|
||||
var question12 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 };
|
||||
var question13 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 4 };
|
||||
var question14 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 5 };
|
||||
var question15 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 1 };
|
||||
var question16 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 2 };
|
||||
var question17 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = false, CategoryId = 3 };
|
||||
var question18 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 4 };
|
||||
var question19 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 5 };
|
||||
var question20 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 };
|
||||
var question21 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 2 };
|
||||
var question22 = new Db.Question() { QuestionTypeId = 1, SurveyId = 3, QuestionNumber = 2, IsRequired = false, Comment = true, Key = true, CategoryId = 3 };
|
||||
|
||||
questionDbContext.Questions.Add(question1);
|
||||
questionDbContext.Questions.Add(question2);
|
||||
questionDbContext.Questions.Add(question3);
|
||||
questionDbContext.Questions.Add(question4);
|
||||
questionDbContext.Questions.Add(question5);
|
||||
questionDbContext.Questions.Add(question6);
|
||||
questionDbContext.Questions.Add(question7);
|
||||
questionDbContext.Questions.Add(question8);
|
||||
questionDbContext.Questions.Add(question9);
|
||||
questionDbContext.Questions.Add(question10);
|
||||
questionDbContext.Questions.Add(question11);
|
||||
questionDbContext.Questions.Add(question12);
|
||||
questionDbContext.Questions.Add(question13);
|
||||
questionDbContext.Questions.Add(question14);
|
||||
questionDbContext.Questions.Add(question15);
|
||||
questionDbContext.Questions.Add(question16);
|
||||
questionDbContext.Questions.Add(question17);
|
||||
questionDbContext.Questions.Add(question18);
|
||||
questionDbContext.Questions.Add(question19);
|
||||
questionDbContext.Questions.Add(question20);
|
||||
questionDbContext.Questions.Add(question21);
|
||||
questionDbContext.Questions.Add(question22);
|
||||
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
@ -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 = "Les terrains sont-ils inondés ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 4, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
|
||||
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Can you open?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Is debris blocking access?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Are the grounds flooded?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "Is the access blocked by flooding?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Are any utility wires down?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Do you have damage to windows, doors, or walls?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Do you have roof damage?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Do you have major water intrusion?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Are any portable classrooms damaged and unusable?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Does your facility need to be secured/boarded?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Are you without commercial power?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Are you without water pressure?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Are you without telephones?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Are traffic signals damaged/missing?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "Are you without an operable fire alarm?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "Are you without an operable public address?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Do you have major debris?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Are there any problems or issues not addressed above that would impede you from opening? If yes, please explain below?", Language = "en" });
|
||||
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "Pouvez-vous ouvrir ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "Est-ce que des débris bloquent l'accès ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "L'accès est-il bloqué par des inondations ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "Des câbles d'utilité sont-ils tombés ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "Avez-vous des dommages aux fenêtres, portes ou murs ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "Avez-vous des dommages au toit ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "Avez-vous une intrusion d'eau majeure ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "Les salles de classe portables sont-elles endommagées et inutilisables ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "Votre établissement a-t-il besoin d'être sécurisé/protégé ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "Êtes-vous sans alimentation électrique commerciale ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "Êtes-vous sans pression d'eau ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "Êtes-vous sans téléphones ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "Les feux de circulation sont-ils endommagés/absents ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "N'avez-vous pas d'alarme incendie fonctionnelle ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "N'avez-vous pas de système de sonorisation opérationnel ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "Avez-vous une grande quantité de débris ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "Y a-t-il des problèmes ou des problèmes non abordés ci-dessus qui vous empêcheraient d'ouvrir ? Si oui, veuillez expliquer ci-dessous.", Language = "fr" });
|
||||
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 5, QuestionText = "¿Puedes abrir ?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 6, QuestionText = "¿Los escombros bloquean el acceso?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 7, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 8, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 9, QuestionText = "¿Hay cables de utilidad caídos?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 10, QuestionText = "¿Tienes daños en ventanas, puertas o paredes?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 11, QuestionText = "¿Tienes daños en el techo?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 12, QuestionText = "¿Tienes una gran intrusión de agua?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 13, QuestionText = "¿Hay aulas portátiles dañadas e inutilizables?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 14, QuestionText = "¿Tu instalación necesita ser asegurada/tabicada?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 15, QuestionText = "¿No tienes energía comercial?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 16, QuestionText = "¿No tienes presión de agua?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 17, QuestionText = "¿No tienes teléfonos?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 18, QuestionText = "¿Los semáforos están dañados/faltan?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 19, QuestionText = "¿No tienes una alarma de incendios operativa?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 20, QuestionText = "¿No tienes un sistema de megafonía operativo?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 21, QuestionText = "¿Tienes una gran cantidad de escombros?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 22, QuestionText = "¿Hay algún problema o asunto no abordado anteriormente que le impida abrir? Si es así, por favor explíquelo a continuación.", Language = "es" });
|
||||
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
}
|
||||
@ -219,6 +313,7 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
CategoryId = item.Id,
|
||||
IconLibrary = item.IconLibrary,
|
||||
IconName = item.IconName,
|
||||
CategoryNames= CreateCategoryMultiLanguageObject(GetCategoryTranslations(item.Id, language)),
|
||||
QuestionsText = GetSurveyQuestion(mapper.Map<List<Db.Question>, List<Models.MultiLanguage>>(questions.Where(a => a.CategoryId == item.Id).ToList()), language)
|
||||
});
|
||||
}
|
||||
@ -239,16 +334,7 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Question");
|
||||
var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
|
||||
var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
|
||||
dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
|
||||
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,""));
|
||||
var result = InsertQuestion(Question);
|
||||
return (true, result, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -257,6 +343,39 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
private Models.MultiLanguage InsertQuestion(Models.Question Question)
|
||||
{
|
||||
var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
|
||||
var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
|
||||
dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
|
||||
questionDbContext.Questions.Add(dbquestion);
|
||||
questionDbContext.SaveChanges();
|
||||
dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
|
||||
questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
|
||||
questionDbContext.SaveChanges();
|
||||
Question.Id = dbquestion.Id;
|
||||
var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
|
||||
result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
|
||||
return result;
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions)
|
||||
{
|
||||
try
|
||||
{
|
||||
List<Models.MultiLanguage> results = new List<MultiLanguage>();
|
||||
logger?.LogInformation("Query Question");
|
||||
foreach (Models.Question Question in Questions)
|
||||
{
|
||||
results.Add(InsertQuestion(Question));
|
||||
}
|
||||
return (true, results, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
|
||||
{
|
||||
try
|
||||
|
@ -1,8 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -8,5 +8,11 @@
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
"AllowedHosts": "*",
|
||||
"ConnectionStrings": {
|
||||
//"QuestionConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
// "QuestionConnection": "Server=localhost,1433;Database=da_survey_dev;User Id=sa;Password=Password123;TrustServerCertificate=True;"
|
||||
"QuestionConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -10,7 +10,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<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="Moq" Version="4.18.4" />
|
||||
<PackageReference Include="xunit" Version="2.4.2" />
|
||||
|
@ -75,8 +75,19 @@ namespace DamageAssesment.Api.Questions.Test
|
||||
return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1};
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static async Task<List<Questions.Models.Question>> getInputQuestionsData()
|
||||
{
|
||||
Models.QuestionsTranslation QuestionsTranslation = new Models.QuestionsTranslation()
|
||||
{
|
||||
Language = "en",
|
||||
QuestionText = "Sample question"
|
||||
};
|
||||
List<Models.QuestionsTranslation> QuestionsTranslations = new List<Models.QuestionsTranslation>();
|
||||
List<Models.Question> Questions = new List<Models.Question>();
|
||||
QuestionsTranslations.Add(QuestionsTranslation);
|
||||
Questions.Models.Question question = new Questions.Models.Question() { Id = 1, Questions = QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
|
||||
Questions.Add(question);
|
||||
return Questions;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -110,6 +110,33 @@ namespace DamageAssesment.Api.Questions.Test
|
||||
|
||||
Assert.Equal(400, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Post Questions - Ok case")]
|
||||
public async Task PostQuestionsAsync_ShouldReturnStatusCode200()
|
||||
{
|
||||
var mockQuestionService = new Mock<IQuestionsProvider>();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
var mockInputQuestion = await MockData.getInputQuestionsData();
|
||||
mockQuestionService.Setup(service => service.PostQuestionsAsync(mockInputQuestion)).ReturnsAsync(mockResponse);
|
||||
|
||||
var QuestionProvider = new QuestionsController(mockQuestionService.Object);
|
||||
var result = (OkObjectResult)await QuestionProvider.CreateQuestions(mockInputQuestion);
|
||||
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
|
||||
[Fact(DisplayName = "Post Questions - BadRequest case")]
|
||||
public async Task PostQuestionsAsync_ShouldReturnStatusCode400()
|
||||
{
|
||||
var mockQuestionService = new Mock<IQuestionsProvider>();
|
||||
var mockInputQuestion = await MockData.getInputQuestionData();
|
||||
var mockResponse = await MockData.getBadRequestResponse();
|
||||
mockQuestionService.Setup(service => service.UpdateQuestionAsync(mockInputQuestion)).ReturnsAsync(mockResponse);
|
||||
|
||||
var QuestionProvider = new QuestionsController(mockQuestionService.Object);
|
||||
var result = (BadRequestObjectResult)await QuestionProvider.UpdateQuestion(mockInputQuestion);
|
||||
|
||||
Assert.Equal(400, result.StatusCode);
|
||||
}
|
||||
|
||||
[Fact(DisplayName = "Put Question - Ok case")]
|
||||
public async Task PutQuestionAsync_ShouldReturnStatusCode200()
|
||||
|
@ -12,9 +12,11 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
public class SurveyResponsesServiceTest
|
||||
{
|
||||
Mock<ISurveysResponse> mockSurveyResponseService;
|
||||
Mock<IExcelExportService> mockExcelExportService;
|
||||
public SurveyResponsesServiceTest()
|
||||
{
|
||||
mockSurveyResponseService = new Mock<ISurveysResponse>();
|
||||
mockExcelExportService = new Mock<IExcelExportService>();
|
||||
}
|
||||
|
||||
[Fact(DisplayName = "Get Responses - Ok case")]
|
||||
@ -23,7 +25,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getOkResponse(mockRequestObject);
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
@ -33,7 +35,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
var mockResponse = await MockData.getResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesAsync(1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (BadRequestObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1);
|
||||
Assert.Equal(400, result.StatusCode);
|
||||
}
|
||||
@ -43,9 +45,9 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1,1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1);
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
|
||||
@ -53,9 +55,9 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
public async Task GetSurveyResponsesBySurveyAsync_ShouldReturnStatusCode204()
|
||||
{
|
||||
var mockResponse = await MockData.getResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1,1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1,1);
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAsync(1, 1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesAsync(1, 1);
|
||||
Assert.Equal(204, result.StatusCode);
|
||||
}
|
||||
|
||||
@ -67,9 +69,9 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1,1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1,1);
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
|
||||
@ -78,7 +80,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
var mockResponse = await MockData.getResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(1, 1, 1);
|
||||
Assert.Equal(204, result.StatusCode);
|
||||
}
|
||||
@ -88,9 +90,9 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes",1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes",1);
|
||||
mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1);
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
|
||||
@ -99,8 +101,8 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
var mockResponse = await MockData.getResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetResponsesByAnswerAsync(1, 1, "Yes", 1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes",1);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponsesByAnswerAsyncAsync(1, 1, "Yes", 1);
|
||||
Assert.Equal(204, result.StatusCode);
|
||||
}
|
||||
|
||||
@ -110,8 +112,8 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1,1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
@ -121,7 +123,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
var mockResponse = await MockData.getResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetAnswersByRegionAsync(1, 1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (NoContentResult)await surveyResponseProvider.GetAnswersByRegionAsync(1, 1);
|
||||
Assert.Equal(204, result.StatusCode);
|
||||
}
|
||||
@ -132,7 +134,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
@ -142,7 +144,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
var mockResponse = await MockData.getResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponsesByMaintenanceCenterAsync(1, 1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (NoContentResult)await surveyResponseProvider.GetAnswersByMaintenaceCentersync(1, 1);
|
||||
Assert.Equal(204, result.StatusCode);
|
||||
}
|
||||
@ -153,7 +155,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
@ -163,7 +165,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
var mockResponse = await MockData.getResponse();
|
||||
mockSurveyResponseService.Setup(service => service.GetSurveyResponseByIdAsync(1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseProvider = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (NoContentResult)await surveyResponseProvider.GetSurveyResponseByIdAsync(1);
|
||||
Assert.Equal(204, result.StatusCode);
|
||||
}
|
||||
@ -175,7 +177,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getOkResponse(mockRequestObject);
|
||||
mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
@ -186,7 +188,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getResponse();
|
||||
mockSurveyResponseService.Setup(service => service.PostSurveyResponseAsync(mockRequestObject)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (BadRequestObjectResult)await surveyResponseController.PostSurveysAsync(mockRequestObject);
|
||||
Assert.Equal(400, result.StatusCode);
|
||||
}
|
||||
@ -197,7 +199,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getOkResponse(mockRequestObject);
|
||||
mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
@ -208,7 +210,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getResponse();
|
||||
mockSurveyResponseService.Setup(service => service.PutSurveyResponseAsync(1, mockRequestObject)).ReturnsAsync(mockResponse); ;
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (BadRequestObjectResult)await surveyResponseController.PutSurveyResponseAsync(1, mockRequestObject);
|
||||
Assert.Equal(400, result.StatusCode);
|
||||
}
|
||||
@ -219,7 +221,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
SurveyResponse mockRequestObject = await MockData.getSurveyResponseObject();
|
||||
var mockResponse = await MockData.getOkResponse(mockRequestObject);
|
||||
mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse);
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (OkObjectResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
@ -229,7 +231,7 @@ namespace DamageAssesment.SurveyResponses.Test
|
||||
{
|
||||
var mockResponse = await MockData.getResponse();
|
||||
mockSurveyResponseService.Setup(service => service.DeleteSurveyResponseAsync(1)).ReturnsAsync(mockResponse); ;
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object);
|
||||
var surveyResponseController = new SurveyResponsesController(mockSurveyResponseService.Object, mockExcelExportService.Object);
|
||||
var result = (NotFoundResult)await surveyResponseController.DeleteSurveyResponseAsync(1);
|
||||
Assert.Equal(404, result.StatusCode);
|
||||
}
|
||||
|
@ -8,10 +8,12 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
public class SurveyResponsesController : ControllerBase
|
||||
{
|
||||
private readonly ISurveysResponse surveyResponseProvider;
|
||||
private readonly IExcelExportService excelExportService;
|
||||
|
||||
public SurveyResponsesController(ISurveysResponse surveyResponseProvider)
|
||||
public SurveyResponsesController(ISurveysResponse surveyResponseProvider, IExcelExportService excelExportService)
|
||||
{
|
||||
this.surveyResponseProvider = surveyResponseProvider;
|
||||
this.excelExportService = excelExportService;
|
||||
}
|
||||
/// <summary>
|
||||
/// GET request for retrieving survey responses.
|
||||
@ -57,9 +59,9 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
[Route("responses/{surveyid:int}/{locationid:int}/{employeeid:int}")]
|
||||
[Route("responses/{surveyid:int}/{locationid:int}")]
|
||||
[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)
|
||||
{
|
||||
return Ok(result.SurveyResponses);
|
||||
@ -198,6 +200,9 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
else
|
||||
return BadRequest(result.ErrorMessage);
|
||||
}
|
||||
/// <summary>
|
||||
/// Get All active surveys .
|
||||
/// </summary>
|
||||
[Route("responses/surveys/active")]
|
||||
[Route("responses/surveys/active/{language:alpha}")]
|
||||
[Route("responses/surveys/active/{employeeid:int}")]
|
||||
@ -212,6 +217,23 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
/// Export all survey response data based on survey id.
|
||||
/// </summary>
|
||||
[HttpGet]
|
||||
[Route("responses/surveys/export/{surveyid}")]
|
||||
public async Task<ActionResult> GetExcelSurveysAsync(int surveyid, string language, bool IsAdmin = false)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.ExportSurveyResponsesAsync(surveyid, language, IsAdmin);
|
||||
if (result.IsSuccess && result.surveyResponses.Count > 0)
|
||||
{
|
||||
|
||||
byte[] fileContents = excelExportService.ExportToExcel<object>(result.surveyResponses);
|
||||
return File(fileContents, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "data.xlsx");
|
||||
//return Ok(result.Surveys);
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
//[Route("responses/surveys/active")]
|
||||
//[Route("responses/surveys/active/{language:alpha}")]
|
||||
//[HttpGet]
|
||||
@ -224,6 +246,10 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
// }
|
||||
// return NoContent();
|
||||
//}
|
||||
|
||||
/// <summary>
|
||||
/// Get all historical surveys .
|
||||
/// </summary>
|
||||
[Route("responses/surveys/historic")]
|
||||
[Route("responses/surveys/historic/{language:alpha}")]
|
||||
[Route("responses/surveys/historic/{employeeid:int}")]
|
||||
|
@ -11,6 +11,21 @@
|
||||
|
||||
<ItemGroup>
|
||||
<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.EntityFrameworkCore" 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
|
||||
{
|
||||
[Table("SurveyResponses")]
|
||||
public class SurveyResponse
|
||||
{
|
||||
[Key]
|
||||
|
@ -4,12 +4,17 @@ namespace DamageAssesment.Api.Responses.Db
|
||||
{
|
||||
public class SurveyResponseDbContext:DbContext
|
||||
{
|
||||
public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }
|
||||
|
||||
public SurveyResponseDbContext(DbContextOptions options) : base(options)
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
public SurveyResponseDbContext(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("ResponsesConnection"));
|
||||
}
|
||||
public DbSet<Db.SurveyResponse> SurveyResponses { get; set; }
|
||||
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
{
|
||||
|
@ -0,0 +1,7 @@
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
{
|
||||
public interface IExcelExportService
|
||||
{
|
||||
public byte[] ExportToExcel<T1>(List<object> responses);
|
||||
}
|
||||
}
|
@ -4,8 +4,9 @@ namespace DamageAssesment.Api.Responses.Interfaces
|
||||
{
|
||||
public interface IQuestionServiceProvider
|
||||
{
|
||||
Task<List<Question>> getQuestionsAsync();
|
||||
Task<List<Question>> getQuestionsAsync(string language);
|
||||
Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId);
|
||||
Task<Question> getQuestionsAsync(int questionId);
|
||||
Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language);
|
||||
}
|
||||
}
|
||||
|
@ -7,8 +7,9 @@ namespace DamageAssesment.Api.Responses.Interfaces
|
||||
{
|
||||
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,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, 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)> GetHistoricSurveysAsync(int? employeeid, string language);
|
||||
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 bool IsDeleted { get; set; }
|
||||
public string FileName { get; set; }
|
||||
|
||||
public Attachment(int answerId, string uri)
|
||||
{
|
||||
|
@ -4,8 +4,13 @@
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int RegionId { get; set; }
|
||||
public string LocationCode { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string MaintenanceCenter { get; set; }
|
||||
public string SchoolType { get; set; }
|
||||
public int? DataValue { get; set; }
|
||||
public int? Enrollment { get; set; }
|
||||
public double? Longitute { get; set; }
|
||||
public double? Latitude { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,10 @@
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
{
|
||||
public class QuestionCategory
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string IconName { get; set; }
|
||||
public string IconLibrary { get; set; }
|
||||
public object Titles { get; set; }
|
||||
}
|
||||
}
|
@ -2,13 +2,20 @@
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
{
|
||||
public enum SurveyStatus
|
||||
{
|
||||
PENDING,
|
||||
ACTIVE,
|
||||
INACTIVE
|
||||
}
|
||||
public class Survey
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public bool IsEnabled { get; set; }
|
||||
public DateTime StartDate { get; set; }
|
||||
public DateTime EndDate { get; set; }
|
||||
public DateTime? StartDate { get; set; }
|
||||
public DateTime? EndDate { get; set; }
|
||||
public DateTime CreatedDate { get; set; }
|
||||
public string Status { get; set; }
|
||||
public Dictionary<string, string> Titles { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,24 @@
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
{
|
||||
public class SurveyExport
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public string SurveyQuestion { get; set; }
|
||||
public string Answer { get; set; }
|
||||
public string Category { get; set; }
|
||||
|
||||
public string School { get; set; }
|
||||
public string Location { get; set; }
|
||||
public string Region { get; set; }
|
||||
|
||||
public string MC { get; set; }
|
||||
public string ResponseDate { get; set; }
|
||||
public string Notes { get; set; }
|
||||
|
||||
public string Attachment1 { get; set; }
|
||||
public string Attachment2 { get; set; }
|
||||
public string Attachment3 { get; set; }
|
||||
public string Attachment4 { get; set; }
|
||||
public string Attachment5 { get; set; }
|
||||
}
|
||||
}
|
@ -26,6 +26,7 @@ builder.Services.AddScoped<IQuestionServiceProvider, QuestionServiceProvider>();
|
||||
builder.Services.AddScoped<IEmployeeServiceProvider, EmployeeServiceProvider>();
|
||||
builder.Services.AddScoped<IAttachmentServiceProvider, AttachmentServiceProvider>();
|
||||
builder.Services.AddScoped<ISurveyServiceProvider, SurveyServiceProvider>();
|
||||
builder.Services.AddScoped<IExcelExportService, ExcelExportService>();
|
||||
|
||||
builder.Services.AddHttpClient<IHttpUtil, HttpUtil>().
|
||||
AddTransientHttpErrorPolicy(policy => policy.WaitAndRetryAsync(maxApiCallRetries, _ => TimeSpan.FromSeconds(intervalToRetry))).
|
||||
@ -44,7 +45,7 @@ builder.Services.AddSwaggerGen(c =>
|
||||
});
|
||||
builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
|
||||
{
|
||||
option.UseInMemoryDatabase("Responses");
|
||||
option.UseSqlServer("ResponsesConnection");
|
||||
});
|
||||
var app = builder.Build();
|
||||
|
||||
|
@ -0,0 +1,62 @@
|
||||
using ClosedXML.Excel;
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using OfficeOpenXml;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Providers
|
||||
{
|
||||
public class ExcelExportService: IExcelExportService
|
||||
{
|
||||
public byte[] ExportToExcel<T1>(List<object> responses)
|
||||
{
|
||||
ExcelPackage.LicenseContext = LicenseContext.NonCommercial;
|
||||
using (var package = new ExcelPackage())
|
||||
{
|
||||
// Create the first worksheet and populate it with responses
|
||||
var workSheet1 = package.Workbook.Worksheets.Add("responses");
|
||||
PopulateWorksheet(workSheet1, responses);
|
||||
return package.GetAsByteArray();
|
||||
}
|
||||
}
|
||||
private void PopulateWorksheet(ExcelWorksheet worksheet, List<object> data)
|
||||
{
|
||||
if (data.Count > 0)
|
||||
{
|
||||
var properties = data[0].GetType().GetProperties();
|
||||
List<int> IsAttchments = new List<int>();
|
||||
// Add column headers
|
||||
for (int col = 1; col <= properties.Length; col++)
|
||||
{
|
||||
worksheet.Cells[1, col].Value = properties[col - 1].Name;
|
||||
if(properties[col - 1].Name.ToLower().Contains("attachment"))
|
||||
IsAttchments.Add(col);
|
||||
}
|
||||
|
||||
// Add data
|
||||
for (int row = 2; row <= data.Count + 1; row++)
|
||||
{
|
||||
for (int col = 1; col <= properties.Length; col++)
|
||||
{
|
||||
|
||||
string value = Convert.ToString(properties[col - 1].GetValue(data[row - 2]));
|
||||
if (IsAttchments.Where(a => a == col).Count() > 0 && !string.IsNullOrEmpty(value))
|
||||
{
|
||||
List<string> attachments = value.Split("##").ToList();
|
||||
try
|
||||
{
|
||||
Uri linkUri = new Uri(attachments[1]);
|
||||
worksheet.Cells[row, col].Value = attachments[0];
|
||||
worksheet.Cells[row, col].Style.Font.UnderLine = true;
|
||||
}
|
||||
catch { worksheet.Cells[row, col].Value = attachments[1]; }
|
||||
}
|
||||
else
|
||||
worksheet.Cells[row, col].Value = value;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -3,6 +3,9 @@ using DamageAssesment.Api.Responses.Db;
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Metadata.Internal;
|
||||
using System.Reflection;
|
||||
using System.Text.Json;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Providers
|
||||
{
|
||||
@ -43,7 +46,6 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
// Create and save SurveyResponse records with references to existing Employee and Location records
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 1, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { SurveyId = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
|
||||
|
||||
surveyResponseDbContext.SaveChanges();
|
||||
}
|
||||
}
|
||||
@ -119,10 +121,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
logger?.LogInformation("Querying to get SurveyResponse object from DB");
|
||||
//get all the survey that already taken by the employee
|
||||
var surveys = await surveyServiceProvider.getSurveysAsync(language);
|
||||
surveys = surveys.Where(s => s.IsEnabled == true && s.StartDate <= DateTime.Now && s.EndDate >= DateTime.Now).ToList();
|
||||
if (employeeid==null || employeeid==0)
|
||||
surveys = surveys.Where(s => s.IsEnabled == true && s.Status == SurveyStatus.ACTIVE.ToString()).ToList();
|
||||
if (employeeid == null || employeeid == 0)
|
||||
return (true, surveys, null);
|
||||
List<int> listOfsurveysId = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid.Value).Select(y => y.SurveyId).ToListAsync();
|
||||
List<int> listOfsurveysId = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid.Value).Select(y => y.SurveyId).ToListAsync();
|
||||
var activeSurveys = surveys.Where(s => !listOfsurveysId.Contains(s.Id));
|
||||
return (true, activeSurveys, null);
|
||||
}
|
||||
@ -141,11 +143,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
var surveys = await surveyServiceProvider.getSurveysAsync(language);
|
||||
// returning only historic data: end date is less than current date.
|
||||
surveys = surveys.Where(s => s.EndDate < DateTime.Now).ToList();
|
||||
if(employeeid==null|| employeeid==0)
|
||||
surveys = surveys.Where(s => s.Status == SurveyStatus.INACTIVE.ToString()).ToList();
|
||||
if (employeeid == null || employeeid == 0)
|
||||
return (true, surveys, null);
|
||||
var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).ToListAsync();
|
||||
|
||||
var historicSurveys = from s in surveys
|
||||
from r in surveyResponses
|
||||
where s.Id == r.SurveyId
|
||||
@ -308,6 +309,26 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, List<object> surveyResponses, string ErrorMessage)> ExportSurveyResponsesAsync(int surveyId, string language, bool isadmin)
|
||||
{
|
||||
try
|
||||
{
|
||||
var responses = await getAllSurveyResponsesExcelAsync(surveyId, language, isadmin);
|
||||
|
||||
if (responses != null)
|
||||
return (true, responses, "Request Successful.");
|
||||
else
|
||||
{
|
||||
responses = null;
|
||||
return (true, responses, "Empty object returned");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyResponseAsync(Models.SurveyResponse surveyResponse)
|
||||
{
|
||||
@ -488,20 +509,22 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
{
|
||||
var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId);
|
||||
var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id);
|
||||
var allQuestions = await questionServiceProvider.getQuestionsAsync();
|
||||
var allQuestions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
|
||||
var result = new
|
||||
{
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var location = Locations.Where(a => a.Id == surveyResponse.LocationId).FirstOrDefault();
|
||||
var result = new{
|
||||
surveyResponse.Id,
|
||||
surveyResponse.SurveyId,
|
||||
surveyResponse.LocationId,
|
||||
surveyResponse.EmployeeId,
|
||||
surveyResponse.ClientDevice,
|
||||
surveyResponse.KeyAnswerResult,
|
||||
surveyResponse.Longitute,
|
||||
surveyResponse.Latitude,
|
||||
DataValue=(location!=null?location.DataValue:0),
|
||||
Enrollment= (location != null ? location.Enrollment : 0),
|
||||
Longitute = (location != null ? location.Longitute : surveyResponse.Longitute),
|
||||
Latitude=(location != null ? location.Latitude : surveyResponse.Latitude),
|
||||
Employee = employee,
|
||||
answers = from ans in answers
|
||||
select new
|
||||
@ -544,7 +567,8 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
|
||||
|
||||
//var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId);
|
||||
@ -554,6 +578,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
if (employeeid == 0)
|
||||
{
|
||||
var result = from r in surveyResonses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
@ -562,8 +587,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -588,6 +615,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
_employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
|
||||
}
|
||||
var result = from r in surveyResonses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
@ -596,8 +624,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
Employee = _employee,
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -650,10 +680,12 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var result = from r in surveyResonses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
@ -662,8 +694,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -687,7 +721,136 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
return null;
|
||||
}
|
||||
}
|
||||
//Method to get All Survey Responses for excel export
|
||||
private async Task<List<object>> getAllSurveyResponsesExcelAsync(int surveyId, string language, bool isadmin)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (string.IsNullOrEmpty(language)) language = "en";
|
||||
List<Db.SurveyResponse> surveyResonses;
|
||||
surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(a => a.SurveyId == surveyId).ToListAsync();
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var regions = await regionServiceProvider.getRegionsAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(language);
|
||||
var categories = await questionServiceProvider.GetQuestionCategoriesAsync(language);
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
List<object> questionLists = new List<object>();
|
||||
var allques = from res in surveyResonses
|
||||
join loc in Locations on res.LocationId equals loc.Id
|
||||
join reg in regions on loc.RegionId equals reg.Id
|
||||
join ans in answers on res.Id equals ans.SurveyResponseId
|
||||
join q in questions on ans.QuestionId equals q.Id
|
||||
join qc in categories on q.CategoryId equals qc.Id
|
||||
select new
|
||||
{
|
||||
responseId = res.Id,
|
||||
questionId = q.Id,
|
||||
QuestionNumber = q.QuestionNumber,
|
||||
Category = JsonSerializer.Deserialize<Dictionary<string, string>>(qc.Titles.ToString())[language],
|
||||
question = q.Text[language],
|
||||
answerId = ans.Id,
|
||||
AnswerText = ans.AnswerText,
|
||||
Comment = ans.Comment,
|
||||
Location = loc.LocationCode,
|
||||
school = loc.Name,
|
||||
Region = reg.Name,
|
||||
MC = loc.MaintenanceCenter,
|
||||
ResponseDate = res.CreatedDate,
|
||||
EmployeeId = res.EmployeeId,
|
||||
ClientDevice = res.ClientDevice,
|
||||
Attachments = attachments.Where(a => a.AnswerId == ans.Id).Select(a => a.FileName + "##" + a.URI).ToList()
|
||||
};
|
||||
List<object> allresoponses = new List<object>();
|
||||
foreach (var item in allques)
|
||||
{
|
||||
|
||||
List<string> ansattachments = item.Attachments.ToList();
|
||||
|
||||
//// Initialize the attachment dictionary
|
||||
//var attachmentsobject = new Dictionary<string, string>();
|
||||
//for (int i = 0; i < ansattachments.Count; i++)
|
||||
//{
|
||||
// attachmentsobject["Attachment"+(i+1).ToString()] = ansattachments[i];
|
||||
//}
|
||||
|
||||
|
||||
string[] variables = new string[5];
|
||||
for (int i = 0; i < 5; i++) // Assuming you want to assign 5 values
|
||||
{
|
||||
if (i < ansattachments.Count())
|
||||
{
|
||||
variables[i] = ansattachments[i];
|
||||
}
|
||||
else
|
||||
{
|
||||
variables[i] = string.Empty; // or null, or any other default value
|
||||
}
|
||||
}
|
||||
|
||||
// Now, you can access the values using the variables
|
||||
string att1 = variables[0], att2 = variables[1], att3 = variables[2], att4 = variables[3], att5 = variables[4];
|
||||
object response;
|
||||
if (isadmin)
|
||||
{
|
||||
response = new
|
||||
{
|
||||
SurveyQuestion = item.question,
|
||||
Answer = item.AnswerText,
|
||||
Category = item.Category,
|
||||
School = item.school,
|
||||
Location = item.Location,
|
||||
Region = item.Region,
|
||||
MC = item.MC,
|
||||
ResponseDate = item.ResponseDate.ToString(),
|
||||
Notes = item.Comment,
|
||||
Attachment1 = att1,
|
||||
Attachment2 = att2,
|
||||
Attachment3 = att3,
|
||||
Attachment4 = att4,
|
||||
Attachment5 = att5,
|
||||
User = item.EmployeeId,
|
||||
DeviceType = item.ClientDevice,
|
||||
Reference = item.responseId
|
||||
};
|
||||
// Add the attachment dictionary to the response object
|
||||
// response = new { response, Attachments = attachments };
|
||||
}
|
||||
else
|
||||
{
|
||||
response = new
|
||||
{
|
||||
SurveyQuestion = item.question,
|
||||
Answer = item.AnswerText,
|
||||
Category = item.Category,
|
||||
School = item.school,
|
||||
Location = item.Location,
|
||||
Region = item.Region,
|
||||
MC = item.MC,
|
||||
ResponseDate = item.ResponseDate.ToString(),
|
||||
Notes = item.Comment,
|
||||
Attachment1 = att1,
|
||||
Attachment2 = att2,
|
||||
Attachment3 = att3,
|
||||
Attachment4 = att4,
|
||||
Attachment5 = att5
|
||||
};
|
||||
|
||||
// Add the attachment dictionary to the response object
|
||||
// response = new { response, Attachments = attachments };
|
||||
}
|
||||
allresoponses.Add(response);
|
||||
}
|
||||
return allresoponses;
|
||||
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: SurveyResponsesProvider.getSurveyResponseBySurveyIdAsync()");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
//Method to get Answers By Maintenance Center by surveyId
|
||||
private async Task<dynamic> getResultsByMaintenanceCenterAsync(int surveyId, int employeeid)
|
||||
@ -784,11 +947,13 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var result = from r in surveyResonses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
@ -797,8 +962,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -854,8 +1021,9 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
// var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var result = from r in surveyResponses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
@ -864,8 +1032,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
|
@ -10,10 +10,12 @@ namespace DamageAssesment.Api.Responses.Services
|
||||
{
|
||||
}
|
||||
|
||||
public async Task<List<Question>> getQuestionsAsync()
|
||||
public async Task<List<Question>> getQuestionsAsync(string language)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!string.IsNullOrEmpty(language))
|
||||
url = url + "/" + language;
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var questions = JsonConvert.DeserializeObject<List<Question>>(responseJsonString);
|
||||
|
||||
@ -27,6 +29,27 @@ namespace DamageAssesment.Api.Responses.Services
|
||||
return new List<Question>();
|
||||
}
|
||||
}
|
||||
public async Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language)
|
||||
{
|
||||
try
|
||||
{
|
||||
url = urlBase + configuration.GetValue<string>("RessourceSettings:QuestionCategory");
|
||||
|
||||
if (!string.IsNullOrEmpty(language))
|
||||
url = url + "/" + language;
|
||||
var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
|
||||
var questions = JsonConvert.DeserializeObject<List<QuestionCategory>>(responseJsonString);
|
||||
|
||||
if (questions == null || !questions.Any())
|
||||
return new List<QuestionCategory>();
|
||||
else return questions;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError($"Exception Found : {ex.Message} - Ref: QuestionServiceProvider.GetQuestionCategoriesAsync()");
|
||||
return new List<QuestionCategory>();
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId)
|
||||
{
|
||||
@ -37,7 +60,7 @@ namespace DamageAssesment.Api.Responses.Services
|
||||
var questions = JsonConvert.DeserializeObject<List<SurveyQuestions>>(responseJsonString);
|
||||
|
||||
if (questions == null || !questions.Any())
|
||||
return new List<SurveyQuestions>() ;
|
||||
return new List<SurveyQuestions>();
|
||||
else return questions;
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
@ -31,6 +31,7 @@
|
||||
"EmployeeById": "/employees/{0}",
|
||||
"Question": "/questions",
|
||||
"QuestionById": "/questions/{0}",
|
||||
"QuestionCategory": "/questions/categories",
|
||||
"SurveyQuestion": "/questions/bysurvey/{0}",
|
||||
"Survey": "/surveys",
|
||||
"SurveyById": "/surveys/{0}",
|
||||
@ -39,5 +40,10 @@
|
||||
"AnswerByResponse": "/answers/byresponse/{0}",
|
||||
"Location": "/locations",
|
||||
"Region": "/regions"
|
||||
},
|
||||
"ConnectionStrings": {
|
||||
//"SurveyResponseConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
//"ResponsesConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
"ResponsesConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,55 @@
|
||||
// <auto-generated />
|
||||
using DamageAssesment.Api.SurveyResponses.Db;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Metadata;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Migrations
|
||||
{
|
||||
[DbContext(typeof(SurveyResponseDbContext))]
|
||||
[Migration("20230817221348_InitialSurveyResponse")]
|
||||
partial class InitialSurveyResponse
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "7.0.9")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 128);
|
||||
|
||||
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("DamageAssesment.Api.SurveyResponses.Db.SurveyResponse", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<string>("EmployeeId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(6)
|
||||
.HasColumnType("nvarchar(6)");
|
||||
|
||||
b.Property<string>("LocationId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(4)
|
||||
.HasColumnType("nvarchar(4)");
|
||||
|
||||
b.Property<int>("SurveyId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("SurveyResponses");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,36 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class InitialSurveyResponse : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.CreateTable(
|
||||
name: "SurveyResponses",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<int>(type: "int", nullable: false)
|
||||
.Annotation("SqlServer:Identity", "1, 1"),
|
||||
SurveyId = table.Column<int>(type: "int", nullable: false),
|
||||
LocationId = table.Column<string>(type: "nvarchar(4)", maxLength: 4, nullable: false),
|
||||
EmployeeId = table.Column<string>(type: "nvarchar(6)", maxLength: 6, nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_SurveyResponses", x => x.Id);
|
||||
});
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "SurveyResponses");
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,52 @@
|
||||
// <auto-generated />
|
||||
using DamageAssesment.Api.SurveyResponses.Db;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Metadata;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Migrations
|
||||
{
|
||||
[DbContext(typeof(SurveyResponseDbContext))]
|
||||
partial class SurveyResponseDbContextModelSnapshot : ModelSnapshot
|
||||
{
|
||||
protected override void BuildModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "7.0.9")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 128);
|
||||
|
||||
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("DamageAssesment.Api.SurveyResponses.Db.SurveyResponse", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<string>("EmployeeId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(6)
|
||||
.HasColumnType("nvarchar(6)");
|
||||
|
||||
b.Property<string>("LocationId")
|
||||
.IsRequired()
|
||||
.HasMaxLength(4)
|
||||
.HasColumnType("nvarchar(4)");
|
||||
|
||||
b.Property<int>("SurveyId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("SurveyResponses");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
@ -11,6 +11,17 @@
|
||||
|
||||
<ItemGroup>
|
||||
<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.EntityFrameworkCore" 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.Surveys.Db
|
||||
{
|
||||
[Table("Surveys")]
|
||||
public class Survey
|
||||
{
|
||||
[Key]
|
||||
@ -12,9 +13,9 @@ namespace DamageAssesment.Api.Surveys.Db
|
||||
|
||||
public bool IsEnabled { get; set; }
|
||||
|
||||
public DateTime StartDate { get; set; }
|
||||
public DateTime? StartDate { get; set; }
|
||||
|
||||
public DateTime EndDate { get; set; }
|
||||
public DateTime? EndDate { get; set; }
|
||||
|
||||
public DateTime CreatedDate { get; set; } = DateTime.Now;
|
||||
/*
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.Surveys.Db
|
||||
{
|
||||
[Table("SurveyTrans")]
|
||||
public class SurveyTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -4,11 +4,18 @@ namespace DamageAssesment.Api.Surveys.Db
|
||||
{
|
||||
public class SurveysDbContext : DbContext
|
||||
{
|
||||
private IConfiguration _Configuration { get; set; }
|
||||
public SurveysDbContext(DbContextOptions options, IConfiguration configuration) : base(options)
|
||||
{
|
||||
_Configuration = configuration;
|
||||
}
|
||||
|
||||
public DbSet<Db.Survey> Surveys { get; set; }
|
||||
public DbSet<Db.SurveyTranslation> SurveysTranslation { get; set; }
|
||||
public SurveysDbContext(DbContextOptions options) : base(options)
|
||||
protected override void OnConfiguring(DbContextOptionsBuilder options)
|
||||
{
|
||||
|
||||
// connect to sql server with connection string from app settings
|
||||
options.UseSqlServer(_Configuration.GetConnectionString("SurveyConnection"));
|
||||
}
|
||||
protected override void OnModelCreating(ModelBuilder modelBuilder)
|
||||
{
|
||||
|
@ -21,8 +21,8 @@ namespace DamageAssesment.Api.Surveys.Models
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public bool IsEnabled { get; set; }
|
||||
public DateTime StartDate { get; set; }
|
||||
public DateTime EndDate { get; set; }
|
||||
public DateTime CreatedDate { get; set; }
|
||||
public DateTime? StartDate { get; set; }
|
||||
public DateTime? EndDate { get; set; }
|
||||
public DateTime? CreatedDate { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -44,7 +44,7 @@ builder.Services.AddSwaggerGen(c =>
|
||||
});
|
||||
builder.Services.AddDbContext<SurveysDbContext>(option =>
|
||||
{
|
||||
option.UseInMemoryDatabase("Surveys");
|
||||
option.UseSqlServer("SurveyConnection");
|
||||
});
|
||||
var app = builder.Build();
|
||||
|
||||
|
@ -18,7 +18,7 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
this.surveyDbContext = surveysDbContext;
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
// seedData();
|
||||
//seedData();
|
||||
}
|
||||
|
||||
// Method to seed initial data into the database
|
||||
@ -45,9 +45,9 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "es", Title = "Encuesta sobre las secuelas del huracán Andrew" });
|
||||
surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey2.Id, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Andrew" });
|
||||
|
||||
surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "en", Title = "Hurricane Idalia Aftermath Survey" });
|
||||
surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "es", Title = "Encuesta sobre las secuelas del huracán Idalia" });
|
||||
surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "fr", Title = "Enquête sur les conséquences de l'ouragan Idalia" });
|
||||
surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "en", Title = "Hurricane Irma" });
|
||||
surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "es", Title = "Huracán Irma" });
|
||||
surveyDbContext.SurveysTranslation.Add(new Db.SurveyTranslation { SurveyId = survey3.Id, Language = "fr", Title = "Ouragan Irma" });
|
||||
|
||||
surveyDbContext.SaveChanges();
|
||||
}
|
||||
@ -85,14 +85,21 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
MultiLanguage = dict;
|
||||
return MultiLanguage;
|
||||
}
|
||||
public string GetStatus(DateTime StartDate,DateTime EndDate)
|
||||
public string GetStatus(DateTime? StartDate,DateTime? EndDate)
|
||||
{
|
||||
if (StartDate > DateTime.Now)
|
||||
return SurveyStatus.PENDING.ToString();
|
||||
else if (StartDate <= DateTime.Now && EndDate > DateTime.Now)
|
||||
return SurveyStatus.ACTIVE.ToString();
|
||||
else
|
||||
try
|
||||
{
|
||||
if (StartDate > DateTime.Now)
|
||||
return SurveyStatus.PENDING.ToString();
|
||||
else if (StartDate <= DateTime.Now && EndDate > DateTime.Now)
|
||||
return SurveyStatus.ACTIVE.ToString();
|
||||
else
|
||||
return SurveyStatus.INACTIVE.ToString();
|
||||
}
|
||||
catch
|
||||
{
|
||||
return SurveyStatus.INACTIVE.ToString();
|
||||
}
|
||||
}
|
||||
// Method to get surveys asynchronously with multi-language support
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanSurvey> Surveys, string ErrorMessage)> GetSurveysAsync(string language)
|
||||
@ -136,7 +143,8 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Survey");
|
||||
var survey = await surveyDbContext.Surveys.SingleOrDefaultAsync(s => s.Id == id && s.IsEnabled == true);
|
||||
// removed is enabled becuase we are using it in responses to get response
|
||||
var survey = await surveyDbContext.Surveys.SingleOrDefaultAsync(s => s.Id == id);
|
||||
|
||||
if (survey != null)
|
||||
{
|
||||
@ -217,12 +225,10 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
_survey = mapper.Map<Models.Survey, Db.Survey>(survey);
|
||||
surveyDbContext.Surveys.Update(_survey);
|
||||
await surveyDbContext.SaveChangesAsync();
|
||||
|
||||
List<Db.SurveyTranslation> listSurveyTranslation = new List<Db.SurveyTranslation>();
|
||||
Random random = new Random();
|
||||
foreach (var title in survey.Titles)
|
||||
{
|
||||
listSurveyTranslation.Add(new Db.SurveyTranslation { Id = random.Next(), SurveyId = _survey.Id, Language = title.Language, Title = title.Title });
|
||||
listSurveyTranslation.Add(new Db.SurveyTranslation { SurveyId = _survey.Id, Language = title.Language, Title = title.Title });
|
||||
}
|
||||
surveyDbContext.SurveysTranslation.AddRange(listSurveyTranslation);
|
||||
await surveyDbContext.SaveChangesAsync();
|
||||
|
@ -1,8 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user