Compare commits
1 Commits
dev
...
Doculinks_
Author | SHA1 | Date | |
---|---|---|---|
|
91765aba63 |
@ -17,7 +17,7 @@ namespace DamageAssesment.Api.Answers.Controllers
|
||||
/// Get all answers
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("answers")]
|
||||
[HttpGet("Answers")]
|
||||
public async Task<ActionResult> GetAnswersAsync() {
|
||||
|
||||
var result = await answerProvider.GetAnswersAsync();
|
||||
@ -33,11 +33,11 @@ namespace DamageAssesment.Api.Answers.Controllers
|
||||
/// </summary>
|
||||
|
||||
|
||||
[HttpGet("answers/{id}")]
|
||||
public async Task<ActionResult> GetAnswerByIdAsync(int id)
|
||||
[HttpGet("Answers/{Id}")]
|
||||
public async Task<ActionResult> GetAnswerByIdAsync(int Id)
|
||||
{
|
||||
|
||||
var result = await answerProvider.GetAnswerByIdAsync(id);
|
||||
var result = await answerProvider.GetAnswerByIdAsync(Id);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Answer);
|
||||
@ -48,7 +48,7 @@ namespace DamageAssesment.Api.Answers.Controllers
|
||||
/// <summary>
|
||||
/// Get all answers based on responseId.
|
||||
/// </summary>
|
||||
[HttpGet("answers/byresponse/{responseid}")]
|
||||
[HttpGet("Answers/ByResponse/{responseid}")]
|
||||
public async Task<IActionResult> GetAnswersByResponseId(int responseid)
|
||||
{
|
||||
var result = await this.answerProvider.GetAnswersAsync(responseid);
|
||||
@ -62,7 +62,7 @@ namespace DamageAssesment.Api.Answers.Controllers
|
||||
/// Get all answers based on questionId.
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("answers/byquestion/{questionid}")]
|
||||
[HttpGet("Answers/ByQuestion/{questionid}")]
|
||||
public async Task<IActionResult> AnswersByQuestionId(int questionid)
|
||||
{
|
||||
var result = await this.answerProvider.GetAnswersByQuestionAsync(questionid);
|
||||
@ -76,7 +76,7 @@ namespace DamageAssesment.Api.Answers.Controllers
|
||||
/// Update an existing answer.
|
||||
/// </summary>
|
||||
|
||||
[HttpPut("answers")]
|
||||
[HttpPut("Answers")]
|
||||
public async Task<IActionResult> UpdateAnswer(Models.Answer answer)
|
||||
{
|
||||
if (answer != null)
|
||||
@ -97,7 +97,7 @@ namespace DamageAssesment.Api.Answers.Controllers
|
||||
/// Save a new answer.
|
||||
/// </summary>
|
||||
|
||||
[HttpPost("answers")]
|
||||
[HttpPost("Answers")]
|
||||
public async Task<IActionResult> CreateAnswer(Models.Answer answer)
|
||||
{
|
||||
if (answer != null)
|
||||
@ -115,7 +115,7 @@ namespace DamageAssesment.Api.Answers.Controllers
|
||||
/// Delete an existing answer.
|
||||
/// </summary>
|
||||
|
||||
[HttpDelete("answers/{id}")]
|
||||
[HttpDelete("Answers/{id}")]
|
||||
public async Task<IActionResult> DeleteAnswer(int id)
|
||||
{
|
||||
var result = await this.answerProvider.DeleteAnswerAsync(id);
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Answers.Db
|
||||
{
|
||||
[Table("Answers")]
|
||||
public class Answer
|
||||
{
|
||||
[Key]
|
||||
|
@ -8,20 +8,19 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
{
|
||||
public class AnswersProvider : IAnswersProvider
|
||||
{
|
||||
|
||||
private AnswerDbContext answerDbContext;
|
||||
private ILogger<AnswersProvider> logger;
|
||||
private IMapper mapper;
|
||||
|
||||
// Constructor with dependency injection and data seeding
|
||||
public AnswersProvider(AnswerDbContext answerDbContext, ILogger<AnswersProvider> logger, IMapper mapper)
|
||||
{
|
||||
this.answerDbContext = answerDbContext;
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
SeedData(); // Seed initial data if the table is empty
|
||||
//SeedData();
|
||||
}
|
||||
|
||||
// Get all answers
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync()
|
||||
{
|
||||
try
|
||||
@ -41,9 +40,9 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Get an answer by its ID
|
||||
public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> GetAnswerByIdAsync(int Id)
|
||||
{
|
||||
try
|
||||
@ -64,8 +63,6 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
// Get answers by survey response ID
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersAsync(int surveyResponseId)
|
||||
{
|
||||
try
|
||||
@ -77,17 +74,17 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
{
|
||||
var result = mapper.Map<IEnumerable<Db.Answer>, IEnumerable<Models.Answer>>(respAnswers);
|
||||
return (true, result, null);
|
||||
|
||||
}
|
||||
return (false, null, "Not Found");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
// Get answers by question ID
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Answer> Answers, string ErrorMessage)> GetAnswersByQuestionAsync(int questionId)
|
||||
{
|
||||
try
|
||||
@ -99,17 +96,17 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
{
|
||||
var result = mapper.Map<IEnumerable<Db.Answer>, IEnumerable<Models.Answer>>(respAnswers);
|
||||
return (true, result, null);
|
||||
|
||||
}
|
||||
return (false, null, "Not Found");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
// Create a new answer
|
||||
public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> PostAnswerAsync(Models.Answer Answer)
|
||||
{
|
||||
try
|
||||
@ -123,7 +120,7 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
var result = mapper.Map<Db.Answer, Models.Answer>(answer);
|
||||
return (true, result, null);
|
||||
}
|
||||
return (false, null, "Answer is already exists");
|
||||
return (false, null, "Answer is already exits");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -131,8 +128,6 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
// Update an existing answer
|
||||
public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> UpdateAnswerAsync(Models.Answer Answer)
|
||||
{
|
||||
try
|
||||
@ -161,14 +156,14 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
return (false,null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
// Delete an answer by its ID
|
||||
public async Task<(bool IsSuccess, Models.Answer Answer, string ErrorMessage)> DeleteAnswerAsync(int Id)
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
Db.Answer answer = answerDbContext.Answers.AsNoTracking().Where(a => a.Id == Id).FirstOrDefault();
|
||||
@ -178,33 +173,30 @@ namespace DamageAssesment.Api.Answers.Providers
|
||||
}
|
||||
answerDbContext.Answers.Remove(answer);
|
||||
answerDbContext.SaveChanges();
|
||||
return (true, mapper.Map<Db.Answer, Models.Answer>(answer), $"AnswerId {Id} deleted successfully");
|
||||
return (true, mapper.Map<Db.Answer, Models.Answer>(answer), $"AnswerId {Id} deleted Successfuly");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
return (false,null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
// Check if an answer with a specific ID exists
|
||||
private bool AnswerExists(int id)
|
||||
{
|
||||
return answerDbContext.Answers.AsNoTracking().Count(e => e.Id == id) > 0;
|
||||
}
|
||||
|
||||
// Seed initial data if the table is empty
|
||||
public void SeedData()
|
||||
{
|
||||
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() { Id = 1, AnswerText = "Yes", Comment = "", QuestionId = 1, SurveyResponseId = 1 });
|
||||
answerDbContext.Answers.Add(new Db.Answer() { Id = 2, AnswerText = "Yes", Comment = "myComment", QuestionId = 2, SurveyResponseId = 1 });
|
||||
answerDbContext.Answers.Add(new Db.Answer() { Id = 3, AnswerText = "No", Comment = "No Comment", QuestionId = 3, SurveyResponseId = 1 });
|
||||
answerDbContext.Answers.Add(new Db.Answer() { 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.SaveChanges();
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -22,7 +22,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
/// Get all attachments.
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("attachments")]
|
||||
[HttpGet("Attachments")]
|
||||
public async Task<ActionResult> GetAttachmentsAsync()
|
||||
{
|
||||
|
||||
@ -37,7 +37,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
/// <summary>
|
||||
/// Get all attachments by attachmentId.
|
||||
/// </summary>
|
||||
[HttpGet("attachments/{id}")]
|
||||
[HttpGet("Attachments/{id}")]
|
||||
public async Task<ActionResult> GetAttachmentbyIdAsync(int id)
|
||||
{
|
||||
|
||||
@ -81,7 +81,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
/// Save new Attachment(s)
|
||||
/// </summary>
|
||||
|
||||
[HttpPost("attachments"), DisableRequestSizeLimit]
|
||||
[HttpPost("Attachments"), DisableRequestSizeLimit]
|
||||
public async Task<IActionResult> UploadAttachmentAsync(AttachmentInfo attachmentInfo)
|
||||
{
|
||||
try
|
||||
@ -108,7 +108,7 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
/// Modify an new attachment.
|
||||
/// </summary>
|
||||
|
||||
[HttpPut("attachments"), DisableRequestSizeLimit]
|
||||
[HttpPut("Attachments"), DisableRequestSizeLimit]
|
||||
public async Task<IActionResult> UpdateAttachmentAsync(AttachmentInfo attachmentInfo)
|
||||
{
|
||||
try
|
||||
@ -136,83 +136,9 @@ 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}")]
|
||||
[HttpDelete("Attachments/{id}")]
|
||||
public async Task<IActionResult> DeleteAttachment(int id)
|
||||
{
|
||||
// database soft delete
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Attachments.Db
|
||||
{
|
||||
[Table("AnswerAttachments")]
|
||||
public class Attachment
|
||||
{
|
||||
[Key]
|
||||
|
@ -9,7 +9,6 @@ namespace DamageAssesment.Api.Attachments.Interfaces
|
||||
Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments);
|
||||
Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> DeleteAttachmentAsync(int Id);
|
||||
Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id);
|
||||
Task<(bool IsSuccess, int counter, string Path)> DeleteAttachmentsAsync(int responseId, int answerId);
|
||||
Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds);
|
||||
Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter();
|
||||
|
@ -7,8 +7,6 @@ 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);
|
||||
}
|
||||
|
@ -21,7 +21,6 @@ builder.Services.AddSwaggerGen(c =>
|
||||
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
|
||||
c.IncludeXmlComments(xmlPath);
|
||||
});
|
||||
builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
|
||||
builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
|
||||
builder.Services.AddScoped<IUploadService, UploadService>();
|
||||
builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
|
||||
|
@ -13,33 +13,25 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
private AttachmentsDbContext AttachmentDbContext;
|
||||
private ILogger<AttachmentsProvider> logger;
|
||||
private IUploadService uploadservice;
|
||||
private IMapper mapper;
|
||||
private readonly IHttpContextAccessor httpContextAccessor;
|
||||
private string baseUrl;
|
||||
public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
|
||||
private IMapper mapper;
|
||||
|
||||
public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice)
|
||||
{
|
||||
this.AttachmentDbContext = AttachmentDbContext;
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
this.uploadservice = uploadservice;
|
||||
this.httpContextAccessor = httpContextAccessor;
|
||||
baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
|
||||
baseUrl = baseUrl + "/attachments/download";
|
||||
SeedData();
|
||||
// SeedData();
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
|
||||
{
|
||||
|
||||
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Question");
|
||||
var Attachment = await AttachmentDbContext.Attachments.AsNoTracking().Where(a => !a.IsDeleted).ToListAsync();
|
||||
if (Attachment != null)
|
||||
{
|
||||
foreach (var attachment in Attachment)
|
||||
{
|
||||
attachment.URI = $"{baseUrl}/{attachment.Id}";
|
||||
}
|
||||
logger?.LogInformation($"{Attachment.Count} Attachments(s) found");
|
||||
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachment);
|
||||
return (true, result, null);
|
||||
@ -62,7 +54,6 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
if (Attachment != null)
|
||||
{
|
||||
logger?.LogInformation($"{Attachment} customer(s) found");
|
||||
Attachment.URI = $"{baseUrl}/{Attachment.Id}";
|
||||
var result = mapper.Map<Db.Attachment, Models.Attachment>(Attachment);
|
||||
return (true, result, null);
|
||||
}
|
||||
@ -82,10 +73,6 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
|
||||
AttachmentDbContext.Attachments.AddRange(attachments);
|
||||
await AttachmentDbContext.SaveChangesAsync();
|
||||
foreach (var attachment in attachments)
|
||||
{
|
||||
attachment.URI = $"{baseUrl}/{attachment.Id}";
|
||||
}
|
||||
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
|
||||
return (true, result, null);
|
||||
}
|
||||
@ -104,10 +91,6 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
|
||||
AttachmentDbContext.Attachments.UpdateRange(attachments);
|
||||
await AttachmentDbContext.SaveChangesAsync();
|
||||
foreach (var attachment in attachments)
|
||||
{
|
||||
attachment.URI = $"{baseUrl}/{attachment.Id}";
|
||||
}
|
||||
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
|
||||
return (true, result, null);
|
||||
}
|
||||
@ -214,24 +197,6 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
{
|
||||
return AttachmentDbContext.Attachments.AsNoTracking().Count(e => e.Id == id && !e.IsDeleted) > 0;
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id)
|
||||
{
|
||||
try
|
||||
{
|
||||
Db.Attachment Attachment = AttachmentDbContext.Attachments.Where(a => a.Id == Id).AsNoTracking().FirstOrDefault();
|
||||
if (Attachment == null)
|
||||
{
|
||||
return (false, null, "Not Found");
|
||||
}
|
||||
return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private void SeedData()
|
||||
{
|
||||
|
@ -24,41 +24,6 @@ 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);
|
||||
@ -124,7 +89,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
{
|
||||
counter++;
|
||||
|
||||
var UserfileName = Path.GetFileName(file.FileName+ file.FileExtension);
|
||||
var UserfileName = Path.GetFileName(file.FileName);
|
||||
var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
|
||||
var dbPath = Path.Combine(fullDirectoryPath, fileName);
|
||||
File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
|
||||
@ -161,7 +126,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
foreach (var file in item.postedFiles)
|
||||
{
|
||||
Models.Attachment attachment= attachments.Where(a=>a.Id == file.AttachmentId).FirstOrDefault();
|
||||
var UserfileName = Path.GetFileName(file.FileName + file.FileExtension);
|
||||
var UserfileName = Path.GetFileName(file.FileName);
|
||||
var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
|
||||
var dbPath = Path.Combine(fullDirectoryPath, fileName);
|
||||
File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -43,7 +43,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
{
|
||||
var mockDocumentService = new Mock<IDoculinkProvider>();
|
||||
var mockUploadService = new Mock<IUploadService>();
|
||||
var mockResponse = await MockData.getOkResponses();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms","en", null)).ReturnsAsync(mockResponse);
|
||||
|
||||
var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
|
||||
@ -56,7 +56,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
{
|
||||
var mockDocumentService = new Mock<IDoculinkProvider>();
|
||||
var mockUploadService = new Mock<IUploadService>();
|
||||
var mockResponse = await MockData.getOkResponses();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
mockDocumentService.Setup(service => service.GetdocumentsByLinkAsync("forms", "en", true)).ReturnsAsync(mockResponse);
|
||||
|
||||
var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
|
||||
@ -65,32 +65,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
|
||||
[Fact(DisplayName = "Get active Documents by linktypeid - Ok case")]
|
||||
public async Task GetActiveDocumentsLinkTypeIdAsync_ShouldReturnStatusCode200()
|
||||
{
|
||||
var mockDocumentService = new Mock<IDoculinkProvider>();
|
||||
var mockUploadService = new Mock<IUploadService>();
|
||||
var mockResponse = await MockData.getOkResponses();
|
||||
mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
|
||||
|
||||
var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
|
||||
var result = (OkObjectResult)await DocumentProvider.GetDocumentsByActiveLinkTypeIdAsync(null, "en");
|
||||
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Get active Documents by linktypeid - NoContent Case")]
|
||||
public async Task GetDocumentsLinkTypeIdAsync_ShouldReturnStatusCode204()
|
||||
{
|
||||
var mockDocumentService = new Mock<IDoculinkProvider>();
|
||||
var mockUploadService = new Mock<IUploadService>();
|
||||
var mockResponse = await MockData.getNoContentResponse();
|
||||
mockDocumentService.Setup(service => service.GetdocumentsByLinkTypeIdAsync(null, "en", true)).ReturnsAsync(mockResponse);
|
||||
|
||||
var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
|
||||
var result = (NoContentResult)await DocumentProvider.GetDocumentsByActiveLinkTypeIdAsync(null, "");
|
||||
|
||||
Assert.Equal(204, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Get Document by Id - Ok case")]
|
||||
public async Task GetDocumentAsync_ShouldReturnStatusCode200()
|
||||
{
|
||||
@ -197,29 +171,7 @@ 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
|
||||
|
||||
|
@ -11,7 +11,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
public class MockData
|
||||
{
|
||||
|
||||
public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponses()
|
||||
public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponse()
|
||||
{
|
||||
List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
|
||||
|
||||
@ -32,8 +32,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
doclinksAttachments.Add(new DoculinkAttachments()
|
||||
{
|
||||
docName = "",Path="www.google.com",
|
||||
Language = "en",
|
||||
IsAttachments =false,CustomOrder=1
|
||||
IsAttachments=false,CustomOrder=1
|
||||
});
|
||||
list.Add(new DocuLinks.Models.ResDoculink()
|
||||
{
|
||||
@ -47,49 +46,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
doclinksAttachments= doclinksAttachments
|
||||
});
|
||||
}
|
||||
// List<ResDoculinks> doculinks = list.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
|
||||
return (true, list, null);
|
||||
}
|
||||
|
||||
|
||||
public static async Task<(bool, List<DocuLinks.Models.ResDoculink>, string)> getOkResponse()
|
||||
{
|
||||
List<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
|
||||
|
||||
for (int i = 1; i < 4; i++)
|
||||
{
|
||||
Dictionary<string, string> dicttitle = new Dictionary<string, string>();
|
||||
Dictionary<string, string> dictdesc = new Dictionary<string, string>();
|
||||
dicttitle.Add("en", "test"); dicttitle.Add("fr", "tester");
|
||||
dictdesc.Add("en", "test"); dictdesc.Add("fr", "tester");
|
||||
List<DoculinkTranslation> DocuLinksTranslations = new List<DoculinkTranslation>();
|
||||
DocuLinksTranslations.Add(new DoculinkTranslation()
|
||||
{
|
||||
Language = "en",
|
||||
title = "tel" + i,
|
||||
description = "Sample" + i
|
||||
});
|
||||
List<DoculinkAttachments> doclinksAttachments = new List<DoculinkAttachments>();
|
||||
doclinksAttachments.Add(new DoculinkAttachments()
|
||||
{
|
||||
docName = "",
|
||||
Path = "www.google.com",
|
||||
IsAttachments = false,
|
||||
Language = "en",
|
||||
CustomOrder = 1
|
||||
});
|
||||
list.Add(new DocuLinks.Models.ResDoculink()
|
||||
{
|
||||
|
||||
Id = i,
|
||||
linkTypeId = i,
|
||||
IsActive = true,
|
||||
titles = dicttitle,
|
||||
description = dictdesc,
|
||||
CustomOrder = i,
|
||||
doclinksAttachments = doclinksAttachments
|
||||
});
|
||||
}
|
||||
return (true, list, null);
|
||||
}
|
||||
public static async Task<(bool, DocuLinks.Models.ResDoculink, string)> getOkResponse(int Id)
|
||||
@ -108,11 +64,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
{
|
||||
return (false, null, "Not Found");
|
||||
}
|
||||
public static async Task<(bool, IEnumerable<DocuLinks.Models.ResDoculinks>, string)> getNoContentResponses()
|
||||
{
|
||||
IEnumerable<DocuLinks.Models.ResDoculinks> list = new List<DocuLinks.Models.ResDoculinks>();
|
||||
return (false, list, null);
|
||||
}
|
||||
public static async Task<(bool, IEnumerable<DocuLinks.Models.ResDoculink>, string)> getNoContentResponse()
|
||||
{
|
||||
IEnumerable<DocuLinks.Models.ResDoculink> list = new List<DocuLinks.Models.ResDoculink>();
|
||||
@ -140,7 +91,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
docName = "",
|
||||
Path = "www.google.com",
|
||||
IsAttachments = false,
|
||||
Language = "en",
|
||||
CustomOrder = 1
|
||||
});
|
||||
return new Models.Doculink
|
||||
@ -168,7 +118,6 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
docName = "",
|
||||
Path = "www.google.com",
|
||||
IsAttachments = false,
|
||||
Language = "en",
|
||||
CustomOrder = 1
|
||||
});
|
||||
List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();
|
||||
|
@ -13,11 +13,11 @@ 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;
|
||||
this.uploadService = uploadService;
|
||||
this.uploadService = uploadService;
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
@ -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,80 +104,6 @@ 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>
|
||||
///
|
||||
@ -185,7 +111,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)
|
||||
@ -203,28 +129,14 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
|
||||
{
|
||||
var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, true);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.documents);
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
/// Get all active Doculink.
|
||||
/// </summary>
|
||||
[Route("doculinks/active/{linktypeid:int}")]
|
||||
[Route("doculinks/active/{linktypeid:int}/{language:alpha}")]
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetDocumentsByActiveLinkTypeIdAsync(int? linktypeid, string? language)
|
||||
{
|
||||
var result = await this.documentsProvider.GetdocumentsByLinkTypeIdAsync(linktypeid, language, true);
|
||||
var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language,true);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.documents);
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get a Doculink by id.
|
||||
/// </summary>
|
||||
@ -232,7 +144,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)
|
||||
@ -246,7 +158,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)
|
||||
{
|
||||
@ -254,7 +166,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)
|
||||
{
|
||||
@ -267,20 +179,6 @@ 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]
|
||||
@ -292,7 +190,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)
|
||||
{
|
||||
@ -327,6 +225,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
}
|
||||
return NotFound();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("Doculinks")]
|
||||
public class Doculink
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkAttachments")]
|
||||
public class DoculinkAttachments
|
||||
{
|
||||
|
||||
@ -15,6 +14,5 @@ namespace DamageAssesment.Api.DocuLinks.Db
|
||||
public string Path { get; set; }
|
||||
public bool IsAttachments { get; set; }
|
||||
public int CustomOrder { get; set; }
|
||||
public string Language { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTrans")]
|
||||
public class DoculinkTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,9 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTypes")]
|
||||
public class LinkType
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTypeTrans")]
|
||||
public class LinksTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -6,14 +6,11 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
|
||||
{
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> GetDocumentAsync(int id, string? linktype, string? language);
|
||||
Task<(bool IsSuccess, Models.Doculink Document, string ErrorMessage)> GetDocumentByidAsync(int id);
|
||||
// Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language);
|
||||
// Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> 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)> UpdateDocumentAsync(int id,Models.Doculink Document);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
|
||||
Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id);
|
||||
Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
|
||||
|
||||
|
||||
|
@ -7,8 +7,6 @@ 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);
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,95 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using DamageAssesment.Api.DocuLinks.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.DocuLinks.Migrations
|
||||
{
|
||||
[DbContext(typeof(DoculinkDbContext))]
|
||||
[Migration("20230828165655_InitialDocumentCreate")]
|
||||
partial class InitialDocumentCreate
|
||||
{
|
||||
/// <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.DocuLinks.Db.Document", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<bool>("IsActive")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<string>("Path")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<DateTime>("dateCreated")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<DateTime>("dateUpdated")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<string>("description")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("docName")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<int>("linkTypeId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<string>("title")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("url")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("Documents");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinkType", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<bool>("IsActive")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<string>("TypeText")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("LinkTypes");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,60 @@
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class InitialDocumentCreate : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.CreateTable(
|
||||
name: "Documents",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<int>(type: "int", nullable: false)
|
||||
.Annotation("SqlServer:Identity", "1, 1"),
|
||||
title = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||
linkTypeId = table.Column<int>(type: "int", nullable: false),
|
||||
description = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||
docName = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||
url = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||
Path = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||
IsActive = table.Column<bool>(type: "bit", nullable: false),
|
||||
dateCreated = table.Column<DateTime>(type: "datetime2", nullable: false),
|
||||
dateUpdated = table.Column<DateTime>(type: "datetime2", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_Documents", x => x.Id);
|
||||
});
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "LinkTypes",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<int>(type: "int", nullable: false)
|
||||
.Annotation("SqlServer:Identity", "1, 1"),
|
||||
TypeText = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||
IsActive = table.Column<bool>(type: "bit", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_LinkTypes", x => x.Id);
|
||||
});
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "Documents");
|
||||
|
||||
migrationBuilder.DropTable(
|
||||
name: "LinkTypes");
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,118 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using DamageAssesment.Api.DocuLinks.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.DocuLinks.Migrations
|
||||
{
|
||||
[DbContext(typeof(DoculinkDbContext))]
|
||||
[Migration("20230830200432_DocumentTranslation")]
|
||||
partial class DocumentTranslation
|
||||
{
|
||||
/// <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.DocuLinks.Db.Document", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<bool>("IsActive")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<string>("Path")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<DateTime>("dateCreated")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<DateTime>("dateUpdated")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<string>("docName")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<int>("linkTypeId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<string>("url")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("Documents");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.DocumentsTranslation", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<int>("DocumentId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<string>("Language")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("description")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("title")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("DocumentsTranslations");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinkType", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<bool>("IsActive")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("IsAttachment")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<string>("TypeText")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("LinkTypes");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,70 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class DocumentTranslation : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "description",
|
||||
table: "Documents");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "title",
|
||||
table: "Documents");
|
||||
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "IsAttachment",
|
||||
table: "LinkTypes",
|
||||
type: "bit",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
|
||||
migrationBuilder.CreateTable(
|
||||
name: "DocumentsTranslations",
|
||||
columns: table => new
|
||||
{
|
||||
Id = table.Column<int>(type: "int", nullable: false)
|
||||
.Annotation("SqlServer:Identity", "1, 1"),
|
||||
DocumentId = table.Column<int>(type: "int", nullable: false),
|
||||
title = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||
description = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||
Language = table.Column<string>(type: "nvarchar(max)", nullable: false)
|
||||
},
|
||||
constraints: table =>
|
||||
{
|
||||
table.PrimaryKey("PK_DocumentsTranslations", x => x.Id);
|
||||
});
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropTable(
|
||||
name: "DocumentsTranslations");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "IsAttachment",
|
||||
table: "LinkTypes");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "description",
|
||||
table: "Documents",
|
||||
type: "nvarchar(max)",
|
||||
nullable: false,
|
||||
defaultValue: "");
|
||||
|
||||
migrationBuilder.AddColumn<string>(
|
||||
name: "title",
|
||||
table: "Documents",
|
||||
type: "nvarchar(max)",
|
||||
nullable: false,
|
||||
defaultValue: "");
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,115 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using DamageAssesment.Api.DocuLinks.Db;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Metadata;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Migrations
|
||||
{
|
||||
[DbContext(typeof(DoculinkDbContext))]
|
||||
partial class DocumentDbContextModelSnapshot : 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.DocuLinks.Db.Document", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<bool>("IsActive")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<string>("Path")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<DateTime>("dateCreated")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<DateTime>("dateUpdated")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<string>("docName")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<int>("linkTypeId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<string>("url")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("Documents");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.DocumentsTranslation", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<int>("DocumentId")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<string>("Language")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("description")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.Property<string>("title")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("DocumentsTranslations");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("DamageAssesment.Api.DocuLinks.Db.LinkType", b =>
|
||||
{
|
||||
b.Property<int>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("int");
|
||||
|
||||
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
|
||||
|
||||
b.Property<bool>("IsActive")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<bool>("IsAttachment")
|
||||
.HasColumnType("bit");
|
||||
|
||||
b.Property<string>("TypeText")
|
||||
.IsRequired()
|
||||
.HasColumnType("nvarchar(max)");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("LinkTypes");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
@ -7,11 +7,6 @@ namespace DamageAssesment.Api.DocuLinks.Models
|
||||
{
|
||||
public List<DoculinkTranslation> documentsTranslations { get; set; }
|
||||
}
|
||||
public class ResDoculinks
|
||||
{
|
||||
public int linkTypeId { get; set; }
|
||||
public List<ResDoculink> doculinks { get; set; }
|
||||
}
|
||||
public class ResDoculink:BaseDoculink
|
||||
{
|
||||
public object titles { get; set; }
|
||||
|
@ -8,7 +8,6 @@ namespace DamageAssesment.Api.DocuLinks.Models
|
||||
public string docName { get; set; }
|
||||
public string Path { get; set; }
|
||||
public bool IsAttachments { get; set; }
|
||||
public string Language { get; set; }
|
||||
public int CustomOrder { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -7,7 +7,6 @@ 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; }
|
||||
}
|
||||
@ -19,6 +18,5 @@ namespace DamageAssesment.Api.DocuLinks.Models
|
||||
public int CustomOrder { get; set; }
|
||||
public string url { get;set; }
|
||||
public bool IsAttachments { get; set; }
|
||||
public string Language { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -19,7 +19,6 @@ builder.Services.AddSwaggerGen(c =>
|
||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
|
||||
builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>();
|
||||
builder.Services.AddScoped<IUploadService, UploadService>();
|
||||
builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
|
||||
|
@ -2,17 +2,12 @@
|
||||
using DamageAssesment.Api.DocuLinks.Db;
|
||||
using DamageAssesment.Api.DocuLinks.Interfaces;
|
||||
using DamageAssesment.Api.DocuLinks.Models;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Metadata.Internal;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.Immutable;
|
||||
using System.Diagnostics.Eventing.Reader;
|
||||
using System.Reflection.Metadata;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Xml;
|
||||
using System.Xml.Linq;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
@ -25,18 +20,13 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
private ILogger<DoculinkProvider> logger;
|
||||
private IUploadService uploadservice;
|
||||
private IMapper mapper;
|
||||
private readonly IHttpContextAccessor httpContextAccessor;
|
||||
private string baseUrl;
|
||||
|
||||
public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
|
||||
public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice)
|
||||
{
|
||||
this.DocumentDbContext = DocumentDbContext;
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
this.uploadservice = uploadservice;
|
||||
this.httpContextAccessor = httpContextAccessor;
|
||||
baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
|
||||
baseUrl = baseUrl + "/doculinks/download";
|
||||
SeedData();
|
||||
}
|
||||
|
||||
@ -73,20 +63,13 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
int counter = 0;
|
||||
for (int i = 1; i <= 4; i++)
|
||||
{
|
||||
int linkTypeId = 2;
|
||||
FileModel fileModel = new FileModel();
|
||||
if (i < 3)
|
||||
{
|
||||
linkTypeId = 1;
|
||||
|
||||
fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1, Language = "en" };
|
||||
}
|
||||
else
|
||||
fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1,Language="en" };
|
||||
ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
|
||||
FileModel fileModel = new FileModel() { url = "www.google"+i+".com", IsAttachments = false, CustomOrder = 1 };
|
||||
ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i,CustomOrder=i, Files = new List<FileModel>() { fileModel } };
|
||||
Db.DoculinkTranslation documents = new Db.DoculinkTranslation { DocumentId = i, title = "Test"+i, description = "ss"+i, Language = "en" };
|
||||
Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
|
||||
DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
|
||||
DocumentDbContext.SaveChanges();
|
||||
DocumentDbContext.DocumentsTranslations.AddRange(documents);
|
||||
var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(document.doclinksAttachments);
|
||||
dbattachments.ForEach(a => a.DocumentId = i);
|
||||
DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
|
||||
@ -94,34 +77,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
counter++;
|
||||
}
|
||||
}
|
||||
if (!DocumentDbContext.DocumentsTranslations.Any())
|
||||
{
|
||||
string[] titles = {
|
||||
"Mobile App Damage Assessment Instructions",
|
||||
"PC Damage Assessment Instructions",
|
||||
"Emergency Evacuation centers",
|
||||
"Mobile App Damage Assessment Instructions" };
|
||||
string[] esTranslations = {
|
||||
"Instrucciones de Evaluación de Daños de la Aplicación Móvil",
|
||||
"Instrucciones de Evaluación de Daños del PC",
|
||||
"Centros de Evacuación de Emergencia",
|
||||
"Instrucciones de Evaluación de Daños de la Aplicación Móvil" };
|
||||
string[] frTranslations = {
|
||||
"Instructions d'Évaluation des Dommages de l'Application Mobile",
|
||||
"Instructions d'Évaluation des Dommages du PC",
|
||||
"Centres d'Évacuation d'Urgence",
|
||||
"Instructions d'Évaluation des Dommages de l'Application Mobile" };
|
||||
List<Db.DoculinkTranslation> documents = new List<Db.DoculinkTranslation>();
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = titles[i], description = titles[i], Language = "en" });
|
||||
documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = esTranslations[i], description = esTranslations[i], Language = "es" });
|
||||
documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = frTranslations[i], description = frTranslations[i], Language = "fr" });
|
||||
}
|
||||
DocumentDbContext.DocumentsTranslations.AddRange(documents);
|
||||
DocumentDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
}
|
||||
public List<Models.DoculinkTranslation> GetDocumentTranslations(int id, string? language)
|
||||
{
|
||||
@ -178,77 +133,6 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
MultiLanguage = dicttitle;
|
||||
return MultiLanguage;
|
||||
}
|
||||
private List<Models.DoculinkAttachments> GetDocumentAttachment(int id,string? language)
|
||||
{
|
||||
List<Db.DoculinkAttachments> doculinkAttachments = null;
|
||||
if (string.IsNullOrEmpty(language))
|
||||
{
|
||||
doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList();
|
||||
}
|
||||
foreach (var attachment in doculinkAttachments)
|
||||
{
|
||||
if (attachment.IsAttachments)
|
||||
attachment.Path = $"{baseUrl}/{attachment.Id}";
|
||||
}
|
||||
return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(doculinkAttachments);
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id)
|
||||
{
|
||||
try
|
||||
{
|
||||
Db.DoculinkAttachments Attachment = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.Id == id).AsNoTracking().FirstOrDefault();
|
||||
if (Attachment == null)
|
||||
{
|
||||
return (false, null, "Not Found");
|
||||
}
|
||||
return (true, mapper.Map<Db.DoculinkAttachments, Models.DoculinkAttachments>(Attachment), $"Attachment {id}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Question");
|
||||
var documents = new List<Db.Doculink>();
|
||||
if (linkTypeId==null)
|
||||
documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
|
||||
else
|
||||
documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
|
||||
q.linkTypeId == linkTypeId.Value).ToListAsync();
|
||||
if (documents != null)
|
||||
{
|
||||
var result = mapper.Map<List<Db.Doculink>, List<Models.ResDoculink>>(documents);
|
||||
foreach (var item in result)
|
||||
{
|
||||
var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
|
||||
item.titles = multilan.titles;
|
||||
item.description = multilan.description;
|
||||
item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
|
||||
item.doclinksAttachments = GetDocumentAttachment(item.Id,language);
|
||||
}
|
||||
// List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
|
||||
return (true, result, null);
|
||||
}
|
||||
return (false, null, "Not found");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
|
||||
{
|
||||
|
||||
@ -270,9 +154,9 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
item.titles = multilan.titles;
|
||||
item.description = multilan.description;
|
||||
item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
|
||||
item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
|
||||
item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
|
||||
}
|
||||
//List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
|
||||
return (true, result, null);
|
||||
}
|
||||
return (false, null, "Not found");
|
||||
@ -325,7 +209,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
|
||||
DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
|
||||
|
||||
result.doclinksAttachments = GetDocumentAttachment(id, "");
|
||||
result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
|
||||
return (true, result, null);
|
||||
}
|
||||
return (false, null, "Not found");
|
||||
@ -357,7 +242,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
|
||||
result.titles = multilan.titles;
|
||||
result.description = multilan.description;
|
||||
result.doclinksAttachments = GetDocumentAttachment(id, language);
|
||||
result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
|
||||
return (true, result, null);
|
||||
}
|
||||
return (false, null, "Not found");
|
||||
@ -388,7 +274,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, ""));
|
||||
result.titles = multilan.titles;
|
||||
result.description = multilan.description;
|
||||
result.doclinksAttachments = GetDocumentAttachment(document.Id,"");
|
||||
result.doclinksAttachments = Document.doclinksAttachments;
|
||||
return (true, result, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -430,7 +316,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, ""));
|
||||
result.titles = multilan.titles;
|
||||
result.description = multilan.description;
|
||||
result.doclinksAttachments = GetDocumentAttachment(document.Id, "");
|
||||
result.doclinksAttachments = Document.doclinksAttachments;
|
||||
return (true, result, "Successful");
|
||||
}
|
||||
else
|
||||
@ -453,35 +339,6 @@ 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,41 +25,6 @@ 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);
|
||||
}
|
||||
|
||||
return null; // File not found
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Handle or log the exception as needed
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
|
||||
{
|
||||
@ -79,20 +44,19 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
counter++;
|
||||
if (item.IsAttachments)
|
||||
{
|
||||
UserfileName = Path.GetFileName(item.FileName + item.FileExtension);
|
||||
UserfileName = Path.GetFileName(item.FileName);
|
||||
var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
|
||||
path = Path.Combine(fullDirectoryPath, fileName);
|
||||
File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
|
||||
}
|
||||
else
|
||||
path = item.url;
|
||||
attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
|
||||
attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
|
||||
}
|
||||
}
|
||||
Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
|
||||
documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
|
||||
IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =documentInfo.IsActive
|
||||
};
|
||||
IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true};
|
||||
|
||||
return Documents;
|
||||
}
|
||||
@ -121,21 +85,21 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
counter++;
|
||||
if (item.IsAttachments)
|
||||
{
|
||||
UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
|
||||
UserfileName = Path.GetFileName(item.FileName);
|
||||
var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
|
||||
path = Path.Combine(fullDirectoryPath, fileName);
|
||||
File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
|
||||
}
|
||||
else
|
||||
path = item.url;
|
||||
attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
|
||||
attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
|
||||
}
|
||||
Models.Doculink Documents = new Models.Doculink()
|
||||
{
|
||||
Id = documentInfo.Id,
|
||||
linkTypeId = documentInfo.linkTypeId,
|
||||
documentsTranslations=documentInfo.documentsTranslations,
|
||||
IsActive = documentInfo.IsActive,
|
||||
IsActive = true,
|
||||
IsDeleted=false,
|
||||
CustomOrder = documentInfo.CustomOrder,
|
||||
doclinksAttachments = attachments
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Controllers
|
||||
/// GET request for retrieving employees.
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("employees")]
|
||||
[HttpGet("Employees")]
|
||||
public async Task<ActionResult> GetEmployeesAsync()
|
||||
{
|
||||
|
||||
@ -36,7 +36,7 @@ namespace DamageAssesment.Api.Employees.Controllers
|
||||
/// GET request for retrieving an employee by ID.
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("employees/{id}")]
|
||||
[HttpGet("Employees/{id}")]
|
||||
public async Task<ActionResult> GetEmployeeByIdAsync(int id)
|
||||
{
|
||||
|
||||
@ -53,7 +53,7 @@ namespace DamageAssesment.Api.Employees.Controllers
|
||||
/// PUT request for updating an existing employee.
|
||||
/// </summary>
|
||||
/// <param name="Employee">The updated employee object.</param>
|
||||
[HttpPut("employees/{id}")]
|
||||
[HttpPut("Employees/{id}")]
|
||||
public async Task<IActionResult> UpdateEmployee(int id, Models.Employee Employee)
|
||||
{
|
||||
if (Employee != null)
|
||||
@ -75,7 +75,7 @@ namespace DamageAssesment.Api.Employees.Controllers
|
||||
/// POST request for creating a new employee.
|
||||
/// </summary>
|
||||
/// <param name="Employee">The employee information for creating a new employee.</param>
|
||||
[HttpPost("employees")]
|
||||
[HttpPost("Employees")]
|
||||
public async Task<IActionResult> CreateEmployee(Models.Employee Employee)
|
||||
{
|
||||
if (Employee != null)
|
||||
@ -93,7 +93,7 @@ namespace DamageAssesment.Api.Employees.Controllers
|
||||
/// DELETE request for deleting an existing employee.
|
||||
/// </summary>
|
||||
/// <param name="id">The ID of the employee to be deleted.</param>
|
||||
[HttpDelete("employees/{id}")]
|
||||
[HttpDelete("Employees/{id}")]
|
||||
public async Task<IActionResult> DeleteEmployee(int id)
|
||||
{
|
||||
var result = await this.EmployeeProvider.DeleteEmployeeAsync(id);
|
||||
|
@ -1,9 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Employees.Db
|
||||
{
|
||||
[Table("Employees")]
|
||||
public class Employee
|
||||
{
|
||||
[Key]
|
||||
|
@ -19,7 +19,7 @@ namespace DamageAssesment.Api.Employees.Providers
|
||||
this.EmployeeDbContext = EmployeeDbContext;
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
// SeedData();
|
||||
// SeedData();
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Employee> Employees, string ErrorMessage)> GetEmployeesAsync()
|
||||
@ -77,8 +77,7 @@ namespace DamageAssesment.Api.Employees.Providers
|
||||
EmployeeDbContext.Employees.Add(_employee);
|
||||
Employee.Id = _employee.Id;
|
||||
EmployeeDbContext.SaveChanges();
|
||||
//return (true, Employee, null);
|
||||
return (true, mapper.Map<Db.Employee, Models.Employee>(_employee), null);
|
||||
return (true, Employee, null);
|
||||
}
|
||||
return (false, null, "Employee code is already exits");
|
||||
}
|
||||
@ -157,12 +156,12 @@ namespace DamageAssesment.Api.Employees.Providers
|
||||
{
|
||||
if (!EmployeeDbContext.Employees.Any())
|
||||
{
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "10101", Name = "David", Email = "david@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { EmployeeCode = "20202", Name = "Smith", Email = "smith@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
|
||||
//EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 3, EmployeeCode = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30), IsActive = true, PreferredLanguage = "fr" });
|
||||
//EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 4, EmployeeCode = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20), IsActive = true, PreferredLanguage = "en" });
|
||||
//EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" });
|
||||
//EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 6, EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), IsActive = true, PreferredLanguage = "es" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 1, EmployeeCode = "Emp1", Name = "ABC1", Email = "abc1@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-18), IsActive = true, PreferredLanguage = "en" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 2, EmployeeCode = "Emp2", Name = "ABC2", Email = "abc2@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-22), IsActive = true, PreferredLanguage = "fr" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 3, EmployeeCode = "Emp3", Name = "ABC3", Email = "abc3@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-30), IsActive = true, PreferredLanguage = "fr" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 4, EmployeeCode = "Emp4", Name = "ABC4", Email = "abc4@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-20), IsActive = true, PreferredLanguage = "en" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 5, EmployeeCode = "Emp5", Name = "ABC5", Email = "abc5@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-23), IsActive = true, PreferredLanguage = "es" });
|
||||
EmployeeDbContext.Employees.Add(new Db.Employee() { Id = 6, EmployeeCode = "Emp6", Name = "ABC6", Email = "abc6@gmail.com", OfficePhoneNumber = "12345678", BirthDate = DateTime.Now.AddYears(-32), IsActive = true, PreferredLanguage = "es" });
|
||||
EmployeeDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -16,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Controllers
|
||||
/// Get all locations.
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("locations")]
|
||||
[HttpGet("Locations")]
|
||||
public async Task<ActionResult> GetLocationsAsync()
|
||||
{
|
||||
|
||||
@ -32,7 +32,7 @@ namespace DamageAssesment.Api.Locations.Controllers
|
||||
/// Get all locations based on locationdId.
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("locations/{id}")]
|
||||
[HttpGet("Locations/{id}")]
|
||||
public async Task<ActionResult> GetLocationByIdAsync(int id)
|
||||
{
|
||||
|
||||
@ -48,7 +48,7 @@ namespace DamageAssesment.Api.Locations.Controllers
|
||||
/// Update a Location.
|
||||
/// </summary>
|
||||
|
||||
[HttpPut("locations/{id}")]
|
||||
[HttpPut("Locations/{id}")]
|
||||
public async Task<IActionResult> UpdateLocation(int id, Models.Location Location)
|
||||
{
|
||||
if (Location != null)
|
||||
@ -66,7 +66,7 @@ namespace DamageAssesment.Api.Locations.Controllers
|
||||
/// Save a new location.
|
||||
/// </summary>
|
||||
|
||||
[HttpPost("locations")]
|
||||
[HttpPost("Locations")]
|
||||
public async Task<IActionResult> CreateLocation(Models.Location Location)
|
||||
{
|
||||
if (Location != null)
|
||||
@ -84,7 +84,7 @@ namespace DamageAssesment.Api.Locations.Controllers
|
||||
/// Delete an existing location.
|
||||
/// </summary>
|
||||
|
||||
[HttpDelete("locations/{id}")]
|
||||
[HttpDelete("Locations/{id}")]
|
||||
public async Task<IActionResult> DeleteLocation(int id)
|
||||
{
|
||||
var result = await this.LocationProvider.DeleteLocationAsync(id);
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Locations.Db
|
||||
{
|
||||
[Table("Locations")]
|
||||
public class Location
|
||||
{
|
||||
[Key]
|
||||
@ -21,10 +20,6 @@ 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; }
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -1,9 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Locations.Db
|
||||
{
|
||||
[Table("Regions")]
|
||||
public class Region
|
||||
{
|
||||
[Key]
|
||||
|
@ -11,9 +11,5 @@ 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; }
|
||||
}
|
||||
}
|
||||
|
@ -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,8 +28,6 @@ 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);
|
||||
@ -48,12 +46,9 @@ 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);
|
||||
@ -66,10 +61,6 @@ 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
|
||||
@ -148,13 +139,12 @@ 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", 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" });
|
||||
//locationDbContext.Locations.Add(new Db.Location() { Id = 6, LocationCode = "Loc6", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
|
||||
locationDbContext.Locations.Add(new Db.Location() { Id = 1, LocationCode = "Loc1", RegionId = 1, Name = "BOB GRAHAM EDUCATION CENTER 1", MaintenanceCenter = "1", SchoolType = "US" });
|
||||
locationDbContext.Locations.Add(new Db.Location() { Id = 2, LocationCode = "Loc2", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 2", MaintenanceCenter = "1", SchoolType = "US" });
|
||||
locationDbContext.Locations.Add(new Db.Location() { Id = 3, LocationCode = "Loc3", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 3", MaintenanceCenter = "1", SchoolType = "US" });
|
||||
locationDbContext.Locations.Add(new Db.Location() { Id = 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" });
|
||||
locationDbContext.Locations.Add(new Db.Location() { Id = 6, LocationCode = "Loc6", RegionId = 3, Name = "BOB GRAHAM EDUCATION CENTER 6", MaintenanceCenter = "1", SchoolType = "US" });
|
||||
locationDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
|
@ -16,7 +16,7 @@ namespace DamageAssesment.Api.Locations.Providers
|
||||
this.locationDbContext = regionDbContext;
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
// SeedData();
|
||||
//SeedData();
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, Models.Region Region, string ErrorMessage)> GetRegionByIdAsync(int Id)
|
||||
@ -165,11 +165,9 @@ namespace DamageAssesment.Api.Locations.Providers
|
||||
{
|
||||
if (!locationDbContext.Regions.Any())
|
||||
{
|
||||
locationDbContext.Regions.Add(new Db.Region() { Name = "North", Abbreviation = "N" });
|
||||
locationDbContext.Regions.Add(new Db.Region() { Name = "Central", Abbreviation = "C" });
|
||||
locationDbContext.Regions.Add(new Db.Region() { Name = "South", Abbreviation = "S" });
|
||||
locationDbContext.Regions.Add(new Db.Region() { Name = "Charter Schools", Abbreviation = "CS" });
|
||||
locationDbContext.Regions.Add(new Db.Region() { Name = "Alternate and Special Centers", Abbreviation = "AC" });
|
||||
locationDbContext.Regions.Add(new Db.Region() { Id = 1, Name = "North", Abbreviation = "N" });
|
||||
locationDbContext.Regions.Add(new Db.Region() { Id = 2, Name = "South", Abbreviation = "S" });
|
||||
locationDbContext.Regions.Add(new Db.Region() { Id = 3, Name = "Central", Abbreviation = "C" });
|
||||
locationDbContext.SaveChanges();
|
||||
}
|
||||
}
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -1,5 +1,4 @@
|
||||
using DamageAssesment.Api.Questions.Interfaces;
|
||||
using DamageAssesment.Api.Questions.Models;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Controllers
|
||||
@ -21,8 +20,8 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
/// </summary>
|
||||
|
||||
// get all questions
|
||||
[Route("questions")]
|
||||
[Route("questions/{language:alpha}")]
|
||||
[Route("Questions")]
|
||||
[Route("Questions/{language:alpha}")]
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetQuestionsAsync(string? language)
|
||||
{
|
||||
@ -38,8 +37,8 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
/// <summary>
|
||||
/// GET request for retrieving a question by ID.
|
||||
/// </summary>
|
||||
[Route("questions/{id}/{language:alpha}")]
|
||||
[Route("questions/{id:int}")]
|
||||
[Route("Questions/{id}/{language:alpha}")]
|
||||
[Route("Questions/{id:int}")]
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetQuestionByIdAsync(int id, string? language)
|
||||
{
|
||||
@ -56,8 +55,8 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
/// GET request for retrieving survey questions based on a survey ID.
|
||||
/// Uri: {Optional language}/GetSurveyQuestions/{surveyId} :Default returns question in all languages
|
||||
/// </summary>
|
||||
[Route("questions/bysurvey/{surveyId:int}")]
|
||||
[Route("questions/bysurvey/{surveyId:int}/{language:alpha}")]
|
||||
[Route("Questions/BySurvey/{surveyId:int}")]
|
||||
[Route("Questions/BySurvey/{surveyId:int}/{language:alpha}")]
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetSurveyQuestions(int surveyId,string? language)
|
||||
{
|
||||
@ -72,7 +71,7 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
/// PUT request for updating a question (multilingual).
|
||||
/// </summary>
|
||||
|
||||
[HttpPut("questions")]
|
||||
[HttpPut("Questions")]
|
||||
public async Task<IActionResult> UpdateQuestion(Models.Question question)
|
||||
{
|
||||
if (question != null)
|
||||
@ -90,50 +89,10 @@ 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>
|
||||
/// PUT request for update a multiple question (multilingual) for survey.
|
||||
/// </summary>
|
||||
[HttpPut("questions/multiple/{surveyid}")]
|
||||
public async Task<IActionResult> CreateQuestions(int surveyid, List<Models.Question> questions)
|
||||
{
|
||||
if (questions != null)
|
||||
{
|
||||
var result = await this.questionsProvider.PutQuestionsAsync(surveyid,questions);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Question);
|
||||
}
|
||||
if (result.ErrorMessage == "Not Found")
|
||||
return NotFound(result.ErrorMessage);
|
||||
|
||||
return BadRequest(result.ErrorMessage);
|
||||
}
|
||||
return CreatedAtRoute("DefaultApi", questions);
|
||||
}
|
||||
/// <summary>
|
||||
/// POST request for creating a new question (multilingual).
|
||||
/// </summary>
|
||||
|
||||
[HttpPost("questions")]
|
||||
[HttpPost("Questions")]
|
||||
public async Task<IActionResult> CreateQuestion(Models.Question question)
|
||||
{
|
||||
if (question != null)
|
||||
@ -151,7 +110,7 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
/// DELETE request for deleting a question based on ID.
|
||||
/// </summary>
|
||||
|
||||
[HttpDelete("questions/{id}")]
|
||||
[HttpDelete("Questions/{id}")]
|
||||
public async Task<IActionResult> DeleteQuestion(int id)
|
||||
{
|
||||
var result = await this.questionsProvider.DeleteQuestionAsync(id);
|
||||
@ -166,8 +125,8 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
/// GET request for retrieving question categories.
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("questions/categories")]
|
||||
[HttpGet("questions/categories/{language:alpha}")]
|
||||
[HttpGet("Questions/Categories")]
|
||||
[HttpGet("Questions/Categories/{language:alpha}")]
|
||||
public async Task<IActionResult> GetQuestionCategoriesAsync(string? language)
|
||||
{
|
||||
var result = await this.questionsProvider.GetQuestionCategoriesAsync(language);
|
||||
@ -181,8 +140,8 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
/// GET request for retrieving a question category by ID.
|
||||
/// </summary>
|
||||
|
||||
[HttpGet("questions/categories/{id:int}")]
|
||||
[HttpGet("questions/categories/{id:int}/{language:alpha}")]
|
||||
[HttpGet("Questions/Categories/{id:int}")]
|
||||
[HttpGet("Questions/Categories/{id:int}/{language:alpha}")]
|
||||
public async Task<IActionResult> GetQuestionCategoryAsync(int id,string? language)
|
||||
{
|
||||
var result = await this.questionsProvider.GetQuestionCategoryAsync(id, language);
|
||||
@ -198,7 +157,7 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
/// PUT request for updating a question category.
|
||||
/// </summary>
|
||||
|
||||
[HttpPut("questions/categories")]
|
||||
[HttpPut("Questions/Categories")]
|
||||
public async Task<IActionResult> UpdateQuestionCategory(Models.QuestionCategory questionCategory)
|
||||
{
|
||||
if (questionCategory != null)
|
||||
@ -219,7 +178,7 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
/// POST request for creating a new question category.
|
||||
/// </summary>
|
||||
|
||||
[HttpPost("questions/categories")]
|
||||
[HttpPost("Questions/Categories")]
|
||||
public async Task<IActionResult> CreateQuestionCategory(Models.QuestionCategory questionCategory)
|
||||
{
|
||||
if (questionCategory != null)
|
||||
@ -237,7 +196,7 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
/// DELETE request for deleting a question category based on ID.
|
||||
/// </summary>
|
||||
|
||||
[HttpDelete("questions/categories/{id}")]
|
||||
[HttpDelete("Questions/Categories/{id}")]
|
||||
public async Task<IActionResult> DeleteQuestionCategory(int id)
|
||||
{
|
||||
var result = await this.questionsProvider.DeleteQuestionCategoryAsync(id);
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionCategoryTrans")]
|
||||
public class CategoryTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("Questions")]
|
||||
public class Question
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,10 +1,8 @@
|
||||
using System.Buffers.Text;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionCategories")]
|
||||
public class QuestionCategory
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,9 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionTypes")]
|
||||
public class QuestionType
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,7 +3,6 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Questions.Db
|
||||
{
|
||||
[Table("QuestionTrans")]
|
||||
public class QuestionsTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -8,8 +8,6 @@ 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, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId,List<Models.Question> Questions);
|
||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
|
||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id);
|
||||
|
||||
|
@ -5,7 +5,6 @@
|
||||
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; }
|
||||
}
|
||||
}
|
||||
|
@ -19,172 +19,68 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
this.questionDbContext = questionDbContext;
|
||||
this.logger = logger;
|
||||
this.mapper = mapper;
|
||||
// SeedData();
|
||||
SeedData();
|
||||
}
|
||||
|
||||
public void SeedData()
|
||||
{
|
||||
|
||||
if (!questionDbContext.QuestionsTranslations.Any())
|
||||
{
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 1, QuestionId = 1, QuestionText = "Can You Open ?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 2, QuestionId = 1, QuestionText = "Peux-tu ouvrir ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 3, QuestionId = 2, QuestionText = "Are the grounds flodded ?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 4, QuestionId = 2, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 5, QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 6, QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 7, QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 8, QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { Id = 9, QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
if (!questionDbContext.Questions.Any())
|
||||
{
|
||||
questionDbContext.Questions.Add(new Db.Question() { Id = 1, QuestionTypeId = 2, SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1 });
|
||||
questionDbContext.Questions.Add(new Db.Question() { Id = 2, QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 2, IsRequired = false, Comment = true, Key = false, CategoryId = 1 });
|
||||
questionDbContext.Questions.Add(new Db.Question() { Id = 3, QuestionTypeId = 1, SurveyId = 1, QuestionNumber = 3, IsRequired = true, Comment = false, Key = true, CategoryId = 2 });
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
if (!questionDbContext.QuestionTypes.Any())
|
||||
{
|
||||
questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "RadioButton" });
|
||||
questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "CheckBox" });
|
||||
questionDbContext.QuestionTypes.Add(new Db.QuestionType() { TypeText = "TextBox" });
|
||||
questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 1, TypeText = "RadioButton" });
|
||||
questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 2, TypeText = "CheckBox" });
|
||||
questionDbContext.QuestionTypes.Add(new Db.QuestionType() { Id = 3, TypeText = "TextBox" });
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
if (!questionDbContext.QuestionCategories.Any())
|
||||
{
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Flooding", IconLibrary = "https://example.com/images/img1.png" });
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Structural", IconLibrary = "https://example.com/images/img3.png" });
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Utility", IconLibrary = "https://example.com/images/img4.png" });
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { IconName = "Debris", IconLibrary = "https://example.com/images/img5.png" });
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 1, IconName = "Flooding", IconLibrary= "https://example.com/images/img1.png" });
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 2, IconName = "Electrical", IconLibrary = "https://example.com/images/img2.png" });
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 3, IconName = "Structural", IconLibrary = "https://example.com/images/img3.png" });
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 4, IconName = "Utility", IconLibrary = "https://example.com/images/img4.png" });
|
||||
questionDbContext.QuestionCategories.Add(new Db.QuestionCategory() { Id = 5, IconName = "Debris", IconLibrary = "https://example.com/images/img5.png" });
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
if (!questionDbContext.CategoryTranslations.Any())
|
||||
{
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 1, Title = "Flooding", Language = "en" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 2, Title = "Electrical", Language = "en" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 3, Title = "Structural", Language = "en" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 4, Title = "Utility", Language = "en" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 5, Title = "Debris", Language = "en" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 1, Title = "Inondation", Language = "fr" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 2, Title = "Électrique", Language = "fr" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 3, Title = "De construction", Language = "fr" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 4, Title = "Utilitaire", Language = "fr" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 5, Title = "Débris", Language = "fr" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 1, Title = "Inundación", Language = "es" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 2, Title = "Eléctrica", Language = "es" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 3, Title = "Estructural", Language = "es" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 4, Title = "Utilidad", Language = "es" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { CategoryId = 5, Title = "Escombros", Language = "es" });
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
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 = 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 = 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();
|
||||
}
|
||||
|
||||
if (!questionDbContext.QuestionsTranslations.Any())
|
||||
{
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Can You Open ?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Peux-tu ouvrir ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 1, QuestionText = "Puedes abrir ?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Are the grounds flooded ?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "Les terrains sont-ils inondés ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 2, QuestionText = "¿Están inundados los terrenos?", Language = "es" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "Is the access blocked by flooding ?", Language = "en" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "L'accès est-il bloqué par les inondations ?", Language = "fr" });
|
||||
questionDbContext.QuestionsTranslations.Add(new Db.QuestionsTranslation() { QuestionId = 3, QuestionText = "¿El acceso está bloqueado por inundaciones?", Language = "es" });
|
||||
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.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 1, CategoryId = 1, Title = "Flooding", Language = "en" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 2, CategoryId = 2, Title = "Electrical", Language = "en" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 3, CategoryId = 3, Title = "Structural", Language = "en" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 4, CategoryId = 4, Title = "Utility", Language = "en" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 5, CategoryId = 5, Title = "Debris", Language = "en" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 6, CategoryId = 1, Title = "Inondation", Language = "fr" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 7, CategoryId = 2, Title = "Électrique", Language = "fr" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 8, CategoryId = 3, Title = "De construction", Language = "fr" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 9, CategoryId = 4, Title = "Utilitaire", Language = "fr" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 10, CategoryId = 5, Title = "Débris", Language = "fr" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 11, CategoryId = 1, Title = "Inundación", Language = "es" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 12, CategoryId = 2, Title = "Eléctrica", Language = "es" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 13, CategoryId = 3, Title = "Estructural", Language = "es" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 14, CategoryId = 4, Title = "Utilidad", Language = "es" });
|
||||
questionDbContext.CategoryTranslations.Add(new Db.CategoryTranslation() { Id = 15, CategoryId = 5, Title = "Escombros", Language = "es" });
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
}
|
||||
@ -314,7 +210,6 @@ 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)
|
||||
});
|
||||
}
|
||||
@ -335,7 +230,16 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Question");
|
||||
var result = InsertQuestion(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,""));
|
||||
return (true, result, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -344,69 +248,6 @@ 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, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PutQuestionsAsync(int surveyId, List<Models.Question> Questions)
|
||||
{
|
||||
try
|
||||
{
|
||||
var questions=await questionDbContext.Questions.AsNoTracking().Where(a=>a.SurveyId == surveyId).ToListAsync();
|
||||
if (questions != null)
|
||||
{
|
||||
List<int> questionids=questions.Select(a=>a.Id).ToList();
|
||||
var questiontrans = await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x => questionids.Contains(x.QuestionId)).ToListAsync();
|
||||
if (questiontrans != null)
|
||||
questionDbContext.QuestionsTranslations.RemoveRange(questiontrans);
|
||||
questionDbContext.Questions.RemoveRange(questions);
|
||||
questionDbContext.SaveChanges();
|
||||
}
|
||||
List<Models.MultiLanguage> results = new List<MultiLanguage>();
|
||||
logger?.LogInformation("Query Question");
|
||||
foreach (Models.Question Question in Questions)
|
||||
{
|
||||
Question.SurveyId = surveyId;
|
||||
results.Add(InsertQuestion(Question));
|
||||
}
|
||||
return (true, results, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
|
||||
{
|
||||
try
|
||||
@ -440,11 +281,8 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
|
||||
if (question != null)
|
||||
{
|
||||
var questiontrans=await questionDbContext.QuestionsTranslations.AsNoTracking().Where(x=>x.QuestionId== id).ToListAsync();
|
||||
var result = mapper.Map<Db.Question, Models.MultiLanguage>(question);
|
||||
result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
|
||||
if(questiontrans!=null)
|
||||
questionDbContext.QuestionsTranslations.RemoveRange(questiontrans);
|
||||
questionDbContext.Questions.Remove(question);
|
||||
questionDbContext.SaveChanges();
|
||||
return (true, result, $"QuestionID {id} deleted Successfuly");
|
||||
|
@ -0,0 +1,8 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
@ -75,19 +75,8 @@ 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,33 +110,6 @@ 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()
|
||||
|
@ -1,7 +0,0 @@
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
{
|
||||
public interface IExcelExportService
|
||||
{
|
||||
public byte[] ExportToExcel<T1>(List<object> responses);
|
||||
}
|
||||
}
|
@ -1,12 +0,0 @@
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
{
|
||||
public interface IQuestionServiceProvider
|
||||
{
|
||||
Task<List<Question>> getQuestionsAsync(string language);
|
||||
Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId);
|
||||
Task<Question> getQuestionsAsync(int questionId);
|
||||
Task<List<QuestionCategory>> GetQuestionCategoriesAsync(string? language);
|
||||
}
|
||||
}
|
@ -1,9 +0,0 @@
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
{
|
||||
public interface IRegionServiceProvider
|
||||
{
|
||||
Task<List<Region>> getRegionsAsync();
|
||||
}
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
{
|
||||
public interface ISurveyServiceProvider
|
||||
{
|
||||
Task<List<Survey>> getSurveysAsync(string language);
|
||||
Task<Survey> getSurveyAsync(int surveyId);
|
||||
}
|
||||
}
|
@ -1,16 +0,0 @@
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
{
|
||||
public class Location
|
||||
{
|
||||
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; }
|
||||
}
|
||||
}
|
@ -1,10 +0,0 @@
|
||||
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; }
|
||||
}
|
||||
}
|
@ -1,24 +0,0 @@
|
||||
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; }
|
||||
}
|
||||
}
|
@ -1,62 +0,0 @@
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using OfficeOpenXml;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Providers
|
||||
{
|
||||
public class ExcelExportService : IExcelExportService
|
||||
{
|
||||
public byte[] ExportToExcel<T1>(List<object> responses)
|
||||
{
|
||||
ExcelPackage.LicenseContext = OfficeOpenXml.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;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@ -1,30 +1,28 @@
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Controllers
|
||||
namespace DamageAssesment.Api.SurveyResponses.Controllers
|
||||
{
|
||||
[ApiController]
|
||||
public class SurveyResponsesController : ControllerBase
|
||||
{
|
||||
private readonly ISurveysResponse surveyResponseProvider;
|
||||
private readonly IExcelExportService excelExportService;
|
||||
|
||||
public SurveyResponsesController(ISurveysResponse surveyResponseProvider, IExcelExportService excelExportService)
|
||||
public SurveyResponsesController(ISurveysResponse surveyResponseProvider)
|
||||
{
|
||||
this.surveyResponseProvider = surveyResponseProvider;
|
||||
this.excelExportService = excelExportService;
|
||||
}
|
||||
/// <summary>
|
||||
/// GET request for retrieving survey responses.
|
||||
/// </summary>
|
||||
|
||||
[Route("responses/{employeeid:int}")]
|
||||
[Route("responses")]
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetSurveyResponsesAsync(int? employeeid)
|
||||
[HttpGet("Responses")]
|
||||
public async Task<ActionResult> GetSurveyResponsesAsync()
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesAsync(employeeid ?? 0);
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesAsync();
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.surveyResponses);
|
||||
@ -38,12 +36,11 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
/// <summary>
|
||||
/// GET request for retrieving survey responses by survey ID.
|
||||
/// </summary>
|
||||
[Route("responses/bysurvey/{surveyid:int}/{employeeid:int}")]
|
||||
[Route("responses/bysurvey/{surveyid:int}")]
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid, int? employeeid)
|
||||
|
||||
[HttpGet("Responses/BySurvey/{surveyid}")]
|
||||
public async Task<ActionResult> GetSurveyResponsesAsync(int surveyid)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyid, employeeid ?? 0);
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAsync(surveyid);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponses);
|
||||
@ -56,16 +53,15 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
/// <param name="surveyid">The ID of the survey for which responses are to be retrieved.</param>
|
||||
/// <param name="locationid">The ID of the location for which responses are to be retrieved.</param>
|
||||
|
||||
[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)
|
||||
[HttpGet("Responses/{surveyid}/{locationid}")]
|
||||
public async Task<ActionResult> GetSurveyResponsesBySurveyAndLocationAsync(int surveyid, int locationid)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid, employeeid ?? 0);
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesBySurveyAndLocationAsync(surveyid, locationid);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponses);
|
||||
}
|
||||
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
@ -75,12 +71,10 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
/// <param name="questionId">The ID of the question for which responses are to be retrieved.</param>
|
||||
/// <param name="answer">The answer for which responses are to be retrieved.</param>
|
||||
|
||||
[Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}/{employeeid:int}")]
|
||||
[Route("responses/byanswer/{surveyid:int}/{questionid:int}/{answer:alpha}")]
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer, int? employeeid)
|
||||
{
|
||||
var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyid, questionid, answer, employeeid ?? 0);
|
||||
[HttpGet("Responses/ByAnswer/{surveyid}/{questionid}/{answer}")]
|
||||
public async Task<ActionResult> GetSurveyResponsesByAnswerAsyncAsync(int surveyid, int questionid, string answer)
|
||||
{
|
||||
var result = await surveyResponseProvider.GetResponsesByAnswerAsync(surveyid, questionid, answer);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponses);
|
||||
@ -93,12 +87,10 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
/// </summary>
|
||||
/// <param name="surveyId">The ID of the survey for which answers are to be retrieved.</param>
|
||||
|
||||
[Route("responses/byregion/{surveyid:int}")]
|
||||
[Route("responses/byregion/{surveyid:int}/{employeeid}")]
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid, int? employeeid)
|
||||
[HttpGet("Responses/ByRegion/{surveyid}")]
|
||||
public async Task<ActionResult> GetAnswersByRegionAsync(int surveyid)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyid, employeeid ?? 0);
|
||||
var result = await this.surveyResponseProvider.GetAnswersByRegionAsync(surveyid);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Answers);
|
||||
@ -109,12 +101,11 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
/// GET request for retrieving survey responses by survey ID and maintenance center.
|
||||
/// </summary>
|
||||
/// <param name="surveyId">The ID of the survey for which responses are to be retrieved.</param>
|
||||
[Route("responses/bymaintenancecenter/{surveyid:int}/{employeeid:int}")]
|
||||
[Route("responses/bymaintenancecenter/{surveyid:int}")]
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid, int? employeeid)
|
||||
|
||||
[HttpGet("Responses/ByMaintenanceCenter/{surveyid}")]
|
||||
public async Task<ActionResult> GetAnswersByMaintenaceCentersync(int surveyid)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyid, employeeid ?? 0);
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponsesByMaintenanceCenterAsync(surveyid);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.SurveyResponses);
|
||||
@ -126,7 +117,7 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
/// </summary>
|
||||
/// <param name="responseId">The ID of the survey response to be retrieved.</param>
|
||||
|
||||
[HttpGet("responses/{id}")]
|
||||
[HttpGet("Responses/{id}")]
|
||||
public async Task<ActionResult> GetSurveyResponseByIdAsync(int id)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetSurveyResponseByIdAsync(id);
|
||||
@ -142,7 +133,7 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
/// </summary>
|
||||
/// <param name="surveyResponse">The survey response object to be created.</param>
|
||||
|
||||
[HttpPost("responses")]
|
||||
[HttpPost("Responses")]
|
||||
public async Task<ActionResult> PostSurveysAsync(Models.SurveyResponse surveyResponse)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.PostSurveyResponseAsync(surveyResponse);
|
||||
@ -158,7 +149,7 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
/// <param name="Id">The ID of the survey response to be updated.</param>
|
||||
/// <param name="surveyResponse">The updated survey response object.</param>
|
||||
|
||||
[HttpPut("responses/{id}")]
|
||||
[HttpPut("Responses/{id}")]
|
||||
public async Task<ActionResult> PutSurveyResponseAsync(int id, Models.SurveyResponse surveyResponse)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.PutSurveyResponseAsync(id, surveyResponse);
|
||||
@ -174,8 +165,8 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
/// <summary>
|
||||
/// DELETE request for deleting an existing survey response.
|
||||
/// </summary>
|
||||
|
||||
[HttpDelete("responses/{id}")]
|
||||
|
||||
[HttpDelete("Responses/{id}")]
|
||||
public async Task<ActionResult> DeleteSurveyResponseAsync(int id)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.DeleteSurveyResponseAsync(id);
|
||||
@ -190,7 +181,7 @@ namespace DamageAssesment.Api.Responses.Controllers
|
||||
/// </summary>
|
||||
/// <param name="request">The answers to be submitted for the survey.</param>
|
||||
|
||||
[HttpPost("responses/answers")]
|
||||
[HttpPost("Responses/Answers")]
|
||||
public async Task<ActionResult> PostSurveyAnswersAsync(Request request)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.PostSurveyAnswersAsync(request);
|
||||
@ -200,69 +191,5 @@ 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}")]
|
||||
[Route("responses/surveys/active/{employeeid:int}/{language:alpha}")]
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetActiveSurveysAsync(int? employeeid, string? language)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetActiveSurveysAsync(employeeid, language);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Surveys);
|
||||
}
|
||||
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]
|
||||
//public async Task<ActionResult> GetActiveSurveysAsync( string? language)
|
||||
//{
|
||||
// var result = await this.surveyResponseProvider.GetActiveSurveysAsync(null, language);
|
||||
// if (result.IsSuccess)
|
||||
// {
|
||||
// return Ok(result.Surveys);
|
||||
// }
|
||||
// return NoContent();
|
||||
//}
|
||||
|
||||
/// <summary>
|
||||
/// Get all historical surveys .
|
||||
/// </summary>
|
||||
[Route("responses/surveys/historic")]
|
||||
[Route("responses/surveys/historic/{language:alpha}")]
|
||||
[Route("responses/surveys/historic/{employeeid:int}")]
|
||||
[Route("responses/surveys/historic/{employeeid:int}/{language:alpha}")]
|
||||
[HttpGet]
|
||||
public async Task<ActionResult> GetHistoricSurveysAsync(int? employeeid, string? language)
|
||||
{
|
||||
var result = await this.surveyResponseProvider.GetHistoricSurveysAsync(employeeid, language);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Surveys);
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
}
|
||||
}
|
@ -9,7 +9,6 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
|
||||
<PackageReference Include="EPPlus" Version="7.0.0" />
|
||||
<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" />
|
@ -1,9 +1,8 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Db
|
||||
namespace DamageAssesment.Api.SurveyResponses.Db
|
||||
{
|
||||
[Table("SurveyResponses")]
|
||||
public class SurveyResponse
|
||||
{
|
||||
[Key]
|
@ -1,6 +1,6 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Db
|
||||
namespace DamageAssesment.Api.SurveyResponses.Db
|
||||
{
|
||||
public class SurveyResponseDbContext:DbContext
|
||||
{
|
@ -1,6 +1,6 @@
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
{
|
||||
public interface IAnswerServiceProvider
|
||||
{
|
@ -1,6 +1,6 @@
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
{
|
||||
public interface IAttachmentServiceProvider
|
||||
{
|
@ -1,6 +1,6 @@
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
{
|
||||
public interface IEmployeeServiceProvider
|
||||
{
|
@ -1,6 +1,6 @@
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
{
|
||||
public interface IHttpUtil
|
||||
{
|
@ -1,6 +1,6 @@
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
{
|
||||
public interface ILocationServiceProvider
|
||||
{
|
@ -0,0 +1,11 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
{
|
||||
public interface IQuestionServiceProvider
|
||||
{
|
||||
Task<List<Question>> getQuestionsAsync();
|
||||
Task<List<SurveyQuestions>> getSurveyQuestionsAsync(int surveyId);
|
||||
Task<Question> getQuestionsAsync(int questionId);
|
||||
}
|
||||
}
|
@ -0,0 +1,9 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
{
|
||||
public interface IRegionServiceProvider
|
||||
{
|
||||
Task<List<Region>> getRegionsAsync();
|
||||
}
|
||||
}
|
@ -0,0 +1,10 @@
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
|
||||
namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
{
|
||||
public interface ISurveyServiceProvider
|
||||
{
|
||||
Task<List<Survey>> getSurveysAsync();
|
||||
Task<Survey> getSurveyAsync(int surveyId);
|
||||
}
|
||||
}
|
@ -1,24 +1,22 @@
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Interfaces
|
||||
namespace DamageAssesment.Api.SurveyResponses.Interfaces
|
||||
{
|
||||
public interface ISurveysResponse
|
||||
{
|
||||
Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId, int employeeid);
|
||||
Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId);
|
||||
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)> 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,dynamic surveyResponses, string ErrorMessage)> GetSurveyResponseAsync(int responseId);
|
||||
Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync();
|
||||
Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PutSurveyResponseAsync(int Id, Models.SurveyResponse surveyResponse);
|
||||
Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> DeleteSurveyResponseAsync(int Id);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponse, string ErrorMessage)> GetSurveyResponseByIdAsync(int responseId);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAsync(int surveyId, int employeeid);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId, int employeeid);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId, int employeeid);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer, int employeeid);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAsync(int surveyId);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId);
|
||||
Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer);
|
||||
|
||||
Task<(bool IsSuccess, Models.SurveyResponse SurveyResponse, string ErrorMessage)> PostSurveyAnswersAsync(Request request);
|
||||
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Answer
|
||||
{
|
@ -1,4 +1,4 @@
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class AnswerRequest
|
||||
{
|
@ -1,6 +1,6 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Attachment
|
||||
{
|
||||
@ -11,7 +11,6 @@ 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)
|
||||
{
|
@ -1,4 +1,4 @@
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class AttachmentInfo
|
||||
{
|
@ -1,6 +1,6 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Employee
|
||||
{
|
@ -0,0 +1,11 @@
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Location
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int RegionId { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string MaintenanceCenter { get; set; }
|
||||
public string SchoolType { get; set; }
|
||||
}
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Question
|
||||
{
|
@ -1,6 +1,6 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Region
|
||||
{
|
@ -1,4 +1,4 @@
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class Request
|
||||
{
|
@ -1,21 +1,14 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.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; }
|
||||
}
|
||||
}
|
@ -1,11 +1,10 @@
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class SurveyQuestions
|
||||
{
|
||||
public int CategoryId { get; set; }
|
||||
public string CategoryName { get; set; }
|
||||
public string CategoryImage { get; set; }
|
||||
public object CategoryNames { get; set; }
|
||||
public List<Question> Questions { get; set; }
|
||||
}
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class SurveyResponse
|
||||
{
|
@ -1,4 +1,4 @@
|
||||
namespace DamageAssesment.Api.Responses.Models
|
||||
namespace DamageAssesment.Api.SurveyResponses.Models
|
||||
{
|
||||
public class SurveyTranslation
|
||||
{
|
@ -1,4 +1,4 @@
|
||||
namespace DamageAssesment.Api.Responses.Profiles
|
||||
namespace DamageAssesment.Api.SurveyResponses.Profiles
|
||||
{
|
||||
public class SurveyResponsesProvider : AutoMapper.Profile
|
||||
{
|
@ -1,7 +1,7 @@
|
||||
using DamageAssesment.Api.Responses.Db;
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Services;
|
||||
using DamageAssesment.Api.Responses.Providers;
|
||||
using DamageAssesment.Api.SurveyResponses.Db;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Services;
|
||||
using DamageAssesment.Api.SurveyResponses.Providers;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Polly;
|
||||
using System.Reflection;
|
||||
@ -26,7 +26,6 @@ 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))).
|
||||
@ -45,7 +44,7 @@ builder.Services.AddSwaggerGen(c =>
|
||||
});
|
||||
builder.Services.AddDbContext<SurveyResponseDbContext>(option =>
|
||||
{
|
||||
option.UseInMemoryDatabase("Responses");
|
||||
option.UseInMemoryDatabase("SurveyResponses");
|
||||
});
|
||||
var app = builder.Build();
|
||||
|
@ -1,13 +1,10 @@
|
||||
using AutoMapper;
|
||||
using DamageAssesment.Api.Responses.Db;
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Db;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Metadata.Internal;
|
||||
using System.Reflection;
|
||||
using System.Text.Json;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Providers
|
||||
namespace DamageAssesment.Api.SurveyResponses.Providers
|
||||
{
|
||||
public class SurveyResponsesProvider : ISurveysResponse
|
||||
{
|
||||
@ -34,42 +31,30 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
this.questionServiceProvider = questionServiceProvider;
|
||||
this.surveyServiceProvider = surveyServiceProvider;
|
||||
this.mapper = mapper;
|
||||
SeedData();
|
||||
// seedData();
|
||||
}
|
||||
|
||||
public void SeedData()
|
||||
private void seedData()
|
||||
{
|
||||
// Check if SurveyResponses exist, if not, seed data
|
||||
if (!surveyResponseDbContext.SurveyResponses.Any())
|
||||
{
|
||||
|
||||
// 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.SurveyResponses.Add(new Db.SurveyResponse { Id = 1, 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 { Id = 2, SurveyId = 1, EmployeeId = 2, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 3, SurveyId = 3, EmployeeId = 4, LocationId = 1, ClientDevice = "Mobile", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 4, SurveyId = 4, EmployeeId = 1, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 6, SurveyId = 1, EmployeeId = 4, LocationId = 2, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "true", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SurveyResponses.Add(new Db.SurveyResponse { Id = 7, SurveyId = 1, EmployeeId = 4, LocationId = 3, ClientDevice = "Desktop", Latitude = 98.8767, Longitute = -129.9897, KeyAnswerResult = "false", CreatedDate = DateTime.Now });
|
||||
surveyResponseDbContext.SaveChanges();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public async Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId, int employeeid)
|
||||
public async Task<(bool IsSuccess, dynamic Answers, string ErrorMessage)> GetAnswersByRegionAsync(int surveyId)
|
||||
{
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Querying to get SurveyResponse object from DB");
|
||||
List<Db.SurveyResponse> listSurveyResponse = null;
|
||||
if (employeeid == 0)
|
||||
{
|
||||
listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId).ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid).ToList();
|
||||
}
|
||||
listSurveyResponse = listSurveyResponse
|
||||
.OrderByDescending(obj => obj.Id)
|
||||
.GroupBy(obj => new { obj.SurveyId, obj.LocationId })//obj.EmployeeId,
|
||||
.Select(group => group.FirstOrDefault()) // or .FirstOrDefault() if you want to handle empty groups
|
||||
.ToList();
|
||||
var listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId);
|
||||
|
||||
if (listSurveyResponse.Any())
|
||||
{
|
||||
var answers = await getAnswersByRegionAndSurveyIdAsync(listSurveyResponse);
|
||||
@ -118,54 +103,9 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetActiveSurveysAsync(int? employeeid, string language)
|
||||
{
|
||||
try
|
||||
{
|
||||
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.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();
|
||||
var activeSurveys = surveys.Where(s => !listOfsurveysId.Contains(s.Id));
|
||||
return (true, activeSurveys, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, dynamic Surveys, string ErrorMessage)> GetHistoricSurveysAsync(int? employeeid, string language)
|
||||
{
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Querying to get SurveyResponse object from DB");
|
||||
|
||||
var surveys = await surveyServiceProvider.getSurveysAsync(language);
|
||||
// returning only historic data: end date is less than current date.
|
||||
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
|
||||
select s;
|
||||
return (true, historicSurveys, null);
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAsync(int surveyId, int employeeid)
|
||||
public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAsync(int surveyId)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -174,7 +114,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
if (survey != null)
|
||||
{
|
||||
var answers = await getSurveyResponsesBySurveyIdAsync(surveyId, employeeid);
|
||||
var answers = await getSurveyResponsesBySurveyIdAsync(surveyId);
|
||||
|
||||
if (answers != null)
|
||||
return (true, answers, "Request Successful.");
|
||||
@ -196,7 +136,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId, int employeeid)
|
||||
public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesBySurveyAndLocationAsync(int surveyId, int locationId)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -205,7 +145,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
if (survey != null)
|
||||
{
|
||||
var answers = await getSurveyResponsesBySurveyIdLocationIdAsync(surveyId, locationId, employeeid);
|
||||
var answers = await getSurveyResponsesBySurveyIdLocationIdAsync(surveyId, locationId);
|
||||
|
||||
if (answers != null)
|
||||
return (true, answers, "Request Successful.");
|
||||
@ -227,7 +167,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId, int employeeid)
|
||||
public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetSurveyResponsesByMaintenanceCenterAsync(int surveyId)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -236,7 +176,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
if (survey != null)
|
||||
{
|
||||
var answers = await getResultsByMaintenanceCenterAsync(surveyId, employeeid);
|
||||
var answers = await getResultsByMaintenanceCenterAsync(surveyId);
|
||||
|
||||
if (answers != null)
|
||||
return (true, answers, "Request Successful.");
|
||||
@ -258,7 +198,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
}
|
||||
|
||||
public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer, int employeeid)
|
||||
public async Task<(bool IsSuccess, dynamic SurveyResponses, string ErrorMessage)> GetResponsesByAnswerAsync(int surveyId, int questionId, string answer)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -270,7 +210,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
if (survey != null && question != null && IsCorrectAnswer)
|
||||
{
|
||||
var answers = await getSurveyResponsesByAnswerAsync(survey, question, answer, employeeid);
|
||||
var answers = await getSurveyResponsesByAnswerAsync(survey, question, answer);
|
||||
|
||||
if (answers != null)
|
||||
return (true, answers, "Request Successful.");
|
||||
@ -293,38 +233,18 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
|
||||
|
||||
public async Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync(int employeeid)
|
||||
public async Task<(bool IsSuccess, dynamic surveyResponses, string ErrorMessage)> GetSurveyResponsesAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
var responses = await getAllSurveyResponsesAsync(employeeid);
|
||||
var answers = await getAllSurveyResponsesAsync();
|
||||
|
||||
if (responses != null)
|
||||
return (true, responses, "Request Successful.");
|
||||
if (answers != null)
|
||||
return (true, answers, "Request Successful.");
|
||||
else
|
||||
{
|
||||
responses = new List<Models.SurveyResponse>();
|
||||
return (true, responses, "Empty object returned");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex.ToString());
|
||||
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");
|
||||
answers = new List<Models.SurveyResponse>();
|
||||
return (true, answers, "Empty object returned");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -421,20 +341,21 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
|
||||
//Method to get Answers by region with surveyId as input parameter
|
||||
private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(List<Db.SurveyResponse> surveyResponses)
|
||||
private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(IQueryable<Db.SurveyResponse> surveyResponses)
|
||||
{
|
||||
try
|
||||
{
|
||||
var answersList = await answerServiceProvider.getAnswersAsync();
|
||||
if (answersList == null || !answersList.Any())
|
||||
return null;
|
||||
|
||||
//get all the answers for the particular survey
|
||||
var surveyAnswers = answersList.Join(
|
||||
surveyResponses,
|
||||
answer => answer.SurveyResponseId,
|
||||
surveyResponse => surveyResponse.Id,
|
||||
(answer, surveyResponse) => new
|
||||
|
||||
|
||||
{
|
||||
answer.Id,
|
||||
answer.QuestionId,
|
||||
@ -458,18 +379,18 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
var result = from answer in surveyAnswers
|
||||
from location in locations
|
||||
where answer.LocationId.Equals(location.Id)
|
||||
select new
|
||||
select new
|
||||
{
|
||||
answer.Id,
|
||||
answer.QuestionId,
|
||||
answer.AnswerText,
|
||||
answer.Comment,
|
||||
location.RegionId,
|
||||
LocationId = location.Id,
|
||||
answer.SurveyResponseId
|
||||
answer.Id,
|
||||
answer.QuestionId,
|
||||
answer.AnswerText,
|
||||
answer.Comment,
|
||||
location.RegionId,
|
||||
LocationId = location.Id,
|
||||
answer.SurveyResponseId
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
//group records by answer and region
|
||||
var q = from e in result
|
||||
@ -477,13 +398,13 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
select new
|
||||
{
|
||||
g.Key.RegionId,
|
||||
Answers = new
|
||||
Answers = new
|
||||
{
|
||||
g.Key.AnswerText,
|
||||
Counter = g.Count()
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
//build the result
|
||||
|
||||
List<dynamic> resultList = new List<dynamic>();
|
||||
@ -491,9 +412,9 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
{
|
||||
var answers = from u in q.ToList()
|
||||
where u.RegionId.Equals(region.Id)
|
||||
select u.Answers;
|
||||
|
||||
resultList.Add(new { RegionId = region.Id, region.Name, region.Abbreviation, Answers = answers });
|
||||
select u.Answers;
|
||||
|
||||
resultList.Add(new { RegionId = region.Id, region.Name, region.Abbreviation, Answers = answers});
|
||||
}
|
||||
//return the object result
|
||||
return new { Regions = resultList };
|
||||
@ -512,22 +433,20 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
{
|
||||
var employee = await employeeServiceProvider.getEmployeeAsync(surveyResponse.EmployeeId);
|
||||
var answers = await answerServiceProvider.GetAnswersByResponseIdAsync(surveyResponse.Id);
|
||||
var allQuestions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var allQuestions = await questionServiceProvider.getQuestionsAsync();
|
||||
var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var location = Locations.Where(a => a.Id == surveyResponse.LocationId).FirstOrDefault();
|
||||
var result = new{
|
||||
|
||||
var result = new
|
||||
{
|
||||
surveyResponse.Id,
|
||||
surveyResponse.SurveyId,
|
||||
surveyResponse.LocationId,
|
||||
surveyResponse.EmployeeId,
|
||||
surveyResponse.ClientDevice,
|
||||
surveyResponse.KeyAnswerResult,
|
||||
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),
|
||||
surveyResponse.Longitute,
|
||||
surveyResponse.Latitude,
|
||||
Employee = employee,
|
||||
answers = from ans in answers
|
||||
select new
|
||||
@ -551,106 +470,46 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
|
||||
//Method to get Survey Responses by surveyId
|
||||
private async Task<dynamic> getSurveyResponsesBySurveyIdAsync(int surveyId, int employeeid)
|
||||
private async Task<dynamic> getSurveyResponsesBySurveyIdAsync(int surveyId)
|
||||
{
|
||||
try
|
||||
{
|
||||
List<Db.SurveyResponse> surveyResonses = null;
|
||||
Employee employee = null;
|
||||
List<Employee> employees = null;
|
||||
if (employeeid == 0)
|
||||
{
|
||||
surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
|
||||
employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
}
|
||||
else
|
||||
{
|
||||
surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
|
||||
employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
|
||||
}
|
||||
surveyResonses = surveyResonses
|
||||
.OrderByDescending(obj => obj.Id)
|
||||
.GroupBy(obj => new { obj.SurveyId, obj.LocationId })//obj.EmployeeId,
|
||||
.Select(group => group.FirstOrDefault()) // or .FirstOrDefault() if you want to handle empty groups
|
||||
.ToList();
|
||||
var surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
|
||||
|
||||
var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync();
|
||||
var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
|
||||
|
||||
//var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId);
|
||||
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
var result = from r in surveyResonses
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
r.SurveyId,
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.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
|
||||
select new
|
||||
{
|
||||
ans.Id,
|
||||
ans.QuestionId,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
|
||||
Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
|
||||
|
||||
if (employeeid == 0)
|
||||
{
|
||||
var result = from r in surveyResonses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
r.SurveyId,
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
// r.KeyAnswerResult,
|
||||
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
|
||||
select new
|
||||
{
|
||||
ans.Id,
|
||||
// ans.QuestionId,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
Questions = (from q in surveyQuestions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
|
||||
Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
|
||||
|
||||
}
|
||||
};
|
||||
return result;
|
||||
}
|
||||
else
|
||||
{
|
||||
object _employee = new { };
|
||||
if (employee != null)
|
||||
{
|
||||
_employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
|
||||
}
|
||||
var result = from r in surveyResonses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
r.SurveyId,
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
// r.KeyAnswerResult,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
// Employee = _employee,
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
select new
|
||||
{
|
||||
ans.Id,
|
||||
// ans.QuestionId,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
|
||||
Attachments = from att in attachments where att.AnswerId == ans.Id select new { att.Id, att.URI }
|
||||
}
|
||||
};
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
};
|
||||
return result;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -661,38 +520,18 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
|
||||
//Method to get All Survey Responses
|
||||
private async Task<dynamic> getAllSurveyResponsesAsync(int employeeid)
|
||||
private async Task<dynamic> getAllSurveyResponsesAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
List<Db.SurveyResponse> surveyResonses = null;
|
||||
Employee employee = null;
|
||||
List<Employee> employees = null;
|
||||
object _employee = new { };
|
||||
if (employeeid == 0)
|
||||
{
|
||||
surveyResonses = await surveyResponseDbContext.SurveyResponses.ToListAsync();
|
||||
employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
}
|
||||
else
|
||||
{
|
||||
surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.EmployeeId == employeeid).ToListAsync();
|
||||
employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
|
||||
|
||||
if (employee != null)
|
||||
{
|
||||
_employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
|
||||
}
|
||||
}
|
||||
|
||||
var surveyResonses = await surveyResponseDbContext.SurveyResponses.ToListAsync();
|
||||
|
||||
var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var questions = await questionServiceProvider.getQuestionsAsync();
|
||||
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,
|
||||
@ -700,18 +539,16 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
// r.KeyAnswerResult,
|
||||
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(),
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
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
|
||||
select new
|
||||
{
|
||||
ans.Id,
|
||||
// ans.QuestionId,
|
||||
ans.QuestionId,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
Questions = (from q in questions where q.Id == ans.QuestionId select new { q.Id, q.QuestionNumber, q.CategoryId, q.Text }).SingleOrDefault(),
|
||||
@ -719,8 +556,6 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
};
|
||||
return result;
|
||||
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -728,151 +563,14 @@ 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)
|
||||
private async Task<dynamic> getResultsByMaintenanceCenterAsync(int surveyId)
|
||||
{
|
||||
try
|
||||
{
|
||||
List<Db.SurveyResponse> surveyResponses = null;
|
||||
if (employeeid == 0)
|
||||
{
|
||||
surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
|
||||
}
|
||||
else
|
||||
{
|
||||
surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
|
||||
}
|
||||
var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId).ToListAsync();
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var locations = await locationServiceProvider.getLocationsAsync();
|
||||
var maintenanceCenters = locations.DistinctBy(m => m.MaintenanceCenter);
|
||||
@ -903,7 +601,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
select new
|
||||
{
|
||||
g.Key.MaintenanceCenter,
|
||||
Answers = new
|
||||
Answers = new
|
||||
{
|
||||
g.Key.AnswerText,
|
||||
Counter = g.Count()
|
||||
@ -928,43 +626,19 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
|
||||
//Method to get Survey Responses by surveyId and LocationId
|
||||
private async Task<dynamic> getSurveyResponsesBySurveyIdLocationIdAsync(int surveyId, int locationId, int employeeid)
|
||||
private async Task<dynamic> getSurveyResponsesBySurveyIdLocationIdAsync(int surveyId, int locationId)
|
||||
{
|
||||
try
|
||||
{
|
||||
List<Db.SurveyResponse> surveyResonses = null;
|
||||
Employee employee = null;
|
||||
List<Employee> employees = null;
|
||||
object _employee = new { };
|
||||
var surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.LocationId.Equals(locationId)).ToListAsync();
|
||||
|
||||
if (employeeid == 0)
|
||||
{
|
||||
surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.LocationId == locationId).ToListAsync();
|
||||
employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
}
|
||||
else
|
||||
{
|
||||
surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid && x.LocationId == locationId).ToListAsync();
|
||||
employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
|
||||
|
||||
if (employee != null)
|
||||
{
|
||||
_employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
|
||||
}
|
||||
}
|
||||
surveyResonses = surveyResonses
|
||||
.OrderByDescending(obj => obj.Id)
|
||||
.GroupBy(obj => new { obj.SurveyId, obj.LocationId }) //obj.EmployeeId,
|
||||
.Select(group => group.FirstOrDefault()) // or .FirstOrDefault() if you want to handle empty groups
|
||||
.ToList();
|
||||
var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var questions = await questionServiceProvider.getQuestionsAsync();
|
||||
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,
|
||||
@ -972,18 +646,16 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
// r.KeyAnswerResult,
|
||||
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(),
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
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
|
||||
|
||||
select new
|
||||
{
|
||||
// ans.QuestionId,
|
||||
ans.QuestionId,
|
||||
ans.Id,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
@ -992,7 +664,6 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
};
|
||||
return result;
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -1003,42 +674,16 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
|
||||
//Method to get Survey Responses by surveyId questionId and answer
|
||||
private async Task<dynamic> getSurveyResponsesByAnswerAsync(Survey survey, Question question, string answer, int employeeid)
|
||||
private async Task<dynamic> getSurveyResponsesByAnswerAsync(Survey survey, Question question, string answer)
|
||||
{
|
||||
try
|
||||
{
|
||||
List<Db.SurveyResponse> surveyResponses = null;
|
||||
Employee employee = null;
|
||||
List<Employee> employees = null;
|
||||
object _employee = new { };
|
||||
|
||||
if (employeeid == 0)
|
||||
{
|
||||
surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync();
|
||||
employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
}
|
||||
else
|
||||
{
|
||||
surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id && x.EmployeeId == employeeid).ToListAsync();
|
||||
employee = await employeeServiceProvider.getEmployeeAsync(employeeid);
|
||||
|
||||
if (employee != null)
|
||||
{
|
||||
_employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
|
||||
}
|
||||
}
|
||||
surveyResponses = surveyResponses
|
||||
.OrderByDescending(obj => obj.Id)
|
||||
.GroupBy(obj => new { obj.SurveyId, obj.LocationId })//, obj.EmployeeId
|
||||
.Select(group => group.FirstOrDefault()) // or .FirstOrDefault() if you want to handle empty groups
|
||||
.ToList();
|
||||
//var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync();
|
||||
// var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
var surveyResponses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == survey.Id).ToListAsync();
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
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,
|
||||
@ -1046,12 +691,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.LocationId,
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
// r.KeyAnswerResult,
|
||||
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(),
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
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
|
||||
&& ans.QuestionId == question.Id
|
||||
@ -1059,7 +702,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
select new
|
||||
{
|
||||
// ans.QuestionId,
|
||||
ans.QuestionId,
|
||||
AnswerId = ans.Id,
|
||||
ans.AnswerText,
|
||||
ans.Comment,
|
||||
@ -1114,7 +757,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
{
|
||||
if (request != null)
|
||||
{
|
||||
var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId, ClientDevice = request.ClientDevice, KeyAnswerResult = request.KeyAnswerResult, Latitude = Convert.ToDouble(request.Latitude), Longitute = Convert.ToDouble(request.Longitute), CreatedDate = DateTime.Now });
|
||||
var response = await PostSurveyResponseAsync(new Models.SurveyResponse { SurveyId = request.SurveyId, EmployeeId = request.EmployeeId, LocationId = request.LocationId, ClientDevice = request.ClientDevice, KeyAnswerResult = request.KeyAnswerResult, Latitude = Convert.ToDouble(request.Latitude), Longitute = Convert.ToDouble(request.Longitute), CreatedDate=DateTime.Now });
|
||||
if (response.IsSuccess)
|
||||
{
|
||||
var surveyResponse = response.SurveyResponse;
|
@ -1,9 +1,9 @@
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Services
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class AnswerServiceProvider : ServiceProviderBase, IAnswerServiceProvider
|
||||
{
|
@ -1,8 +1,8 @@
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Services
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class AttachmentServiceProvider : ServiceProviderBase, IAttachmentServiceProvider
|
||||
{
|
@ -1,9 +1,9 @@
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Microsoft.AspNetCore.Mvc.Routing;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Services
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class EmployeeServiceProvider : ServiceProviderBase, IEmployeeServiceProvider
|
||||
{
|
@ -1,8 +1,8 @@
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using System.Net.Http.Headers;
|
||||
using System.Text;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Services
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class HttpUtil : IHttpUtil
|
||||
{
|
@ -1,8 +1,8 @@
|
||||
using DamageAssesment.Api.Responses.Interfaces;
|
||||
using DamageAssesment.Api.Responses.Models;
|
||||
using DamageAssesment.Api.SurveyResponses.Interfaces;
|
||||
using DamageAssesment.Api.SurveyResponses.Models;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace DamageAssesment.Api.Responses.Services
|
||||
namespace DamageAssesment.Api.SurveyResponses.Services
|
||||
{
|
||||
public class LocationServiceProvider :ServiceProviderBase, ILocationServiceProvider
|
||||
{
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user