forked from MDCPS/DamageAssessment_Backend
Compare commits
11 Commits
user-acces
...
user-acces
Author | SHA1 | Date | |
---|---|---|---|
fe5e3129b5 | |||
86dea1b942 | |||
5507bd7999 | |||
d2627645b0 | |||
e93168f1df | |||
1bf92fe95d | |||
2604c6fd4a | |||
42295d68df | |||
b7ba8c499c | |||
f8912ce31a | |||
eb0df19522 |
@ -138,6 +138,81 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// download an existing attachment.
|
||||
/// </summary>
|
||||
[Authorize(Roles = "admin")]
|
||||
[HttpGet("attachments/download/{id}")]
|
||||
public async Task<IActionResult> downloadfile(int id)
|
||||
{
|
||||
try
|
||||
{
|
||||
var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id);
|
||||
if (!result.IsSuccess)
|
||||
return NotFound();
|
||||
string path = await UploadService.GetFile(result.Attachment.URI);
|
||||
if (path == null)
|
||||
return NotFound();
|
||||
var contentType = GetContentType(result.Attachment.FileName);
|
||||
if (contentType == "application/octet-stream")
|
||||
return PhysicalFile(path, contentType, result.Attachment.FileName);
|
||||
return PhysicalFile(path, contentType, enableRangeProcessing: true);// result.Attachment.FileName);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Handle the exception here or log it
|
||||
return StatusCode(500, "An error occurred: " + ex.Message);
|
||||
}
|
||||
//try
|
||||
//{
|
||||
// var result = await this.AttachmentProvider.GetDownloadAttachmentAsync(id);
|
||||
// if(!result.IsSuccess)
|
||||
// return NotFound();
|
||||
// byte[] fileContent = await UploadService.DownloadFile(result.Attachment.URI);
|
||||
// if (fileContent == null || fileContent.Length == 0)
|
||||
// return NotFound();
|
||||
// var contentType = "application/octet-stream";
|
||||
// return File(fileContent, contentType, result.Attachment.FileName);
|
||||
//}
|
||||
//catch (Exception ex)
|
||||
//{
|
||||
// // Handle the exception here or log it
|
||||
// return StatusCode(500, "An error occurred: " + ex.Message);
|
||||
//}
|
||||
}
|
||||
private string GetContentType(string fileName)
|
||||
{
|
||||
// You can add more content types based on the file extensions
|
||||
switch (Path.GetExtension(fileName).ToLower())
|
||||
{
|
||||
//case ".txt":
|
||||
// return "text/plain";
|
||||
case ".jpg":
|
||||
case ".jpeg":
|
||||
return "image/jpeg";
|
||||
case ".png":
|
||||
return "image/png";
|
||||
case ".gif":
|
||||
return "image/gif";
|
||||
case ".bmp":
|
||||
return "image/bmp";
|
||||
case ".webp":
|
||||
return "image/webp";
|
||||
case ".csv":
|
||||
return "text/csv";
|
||||
case ".pdf":
|
||||
return "application/pdf";
|
||||
case ".docx":
|
||||
case ".doc":
|
||||
return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
|
||||
case ".xlsx":
|
||||
case ".xls":
|
||||
return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
||||
// Add more cases as needed
|
||||
default:
|
||||
return "application/octet-stream";
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Delete an existing attachment.
|
||||
/// </summary>
|
||||
[Authorize(Roles = "admin")]
|
||||
|
@ -9,6 +9,7 @@ namespace DamageAssesment.Api.Attachments.Interfaces
|
||||
Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> 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,6 +7,8 @@ namespace DamageAssesment.Api.Attachments.Interfaces
|
||||
List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
|
||||
List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
|
||||
public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
|
||||
Task<byte[]> DownloadFile(string path);
|
||||
Task<string> GetFile(string path);
|
||||
void Deletefile(string path);
|
||||
void Movefile(string path);
|
||||
}
|
||||
|
@ -71,6 +71,7 @@ builder.Services.AddSwaggerGen(options =>
|
||||
|
||||
options.AddSecurityRequirement(securityRequirements);
|
||||
});
|
||||
builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
|
||||
builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
|
||||
builder.Services.AddScoped<IUploadService, UploadService>();
|
||||
builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
|
||||
|
@ -14,13 +14,17 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
private ILogger<AttachmentsProvider> logger;
|
||||
private IUploadService uploadservice;
|
||||
private IMapper mapper;
|
||||
|
||||
public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice)
|
||||
private readonly IHttpContextAccessor httpContextAccessor;
|
||||
private string baseUrl;
|
||||
public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
|
||||
{
|
||||
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();
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
|
||||
@ -32,6 +36,10 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
var Attachment = await AttachmentDbContext.Attachments.AsNoTracking().Where(a => !a.IsDeleted).ToListAsync();
|
||||
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);
|
||||
@ -54,6 +62,7 @@ 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);
|
||||
}
|
||||
@ -73,6 +82,10 @@ 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);
|
||||
}
|
||||
@ -91,6 +104,10 @@ 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);
|
||||
}
|
||||
@ -197,6 +214,24 @@ 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,6 +24,41 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
|
||||
Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
|
||||
}
|
||||
public async Task<string> GetFile(string path)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (System.IO.File.Exists(path))
|
||||
{
|
||||
return path;
|
||||
}
|
||||
|
||||
return null; // File not found
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Handle or log the exception as needed
|
||||
throw;
|
||||
}
|
||||
|
||||
}
|
||||
public async Task<byte[]> DownloadFile(string path)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (System.IO.File.Exists(path))
|
||||
{
|
||||
return await System.IO.File.ReadAllBytesAsync(path);
|
||||
}
|
||||
|
||||
return null; // File not found
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Handle or log the exception as needed
|
||||
throw;
|
||||
}
|
||||
}
|
||||
public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
|
||||
{
|
||||
var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
|
||||
@ -89,7 +124,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
||||
{
|
||||
counter++;
|
||||
|
||||
var UserfileName = Path.GetFileName(file.FileName);
|
||||
var UserfileName = Path.GetFileName(file.FileName+ file.FileExtension);
|
||||
var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
|
||||
var dbPath = Path.Combine(fullDirectoryPath, fileName);
|
||||
File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
|
||||
@ -126,7 +161,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);
|
||||
var UserfileName = Path.GetFileName(file.FileName + file.FileExtension);
|
||||
var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
|
||||
var dbPath = Path.Combine(fullDirectoryPath, fileName);
|
||||
File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
|
||||
|
@ -197,7 +197,29 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1);
|
||||
Assert.Equal(404, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Update Document IsActive- Ok case")]
|
||||
public async Task UpdateDocumentAsync_ShouldReturnStatusCode200()
|
||||
{
|
||||
var mockDocumentService = new Mock<IDoculinkProvider>();
|
||||
var mockUploadService = new Mock<IUploadService>();
|
||||
var mockResponse = await MockData.getOkResponse(1);
|
||||
mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
|
||||
var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
|
||||
var result = (OkObjectResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
|
||||
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Update Document IsActive - NotFound case")]
|
||||
public async Task UpdateDocumentAsync_ShouldReturnStatusCode404()
|
||||
{
|
||||
var mockDocumentService = new Mock<IDoculinkProvider>();
|
||||
var mockUploadService = new Mock<IUploadService>();
|
||||
var mockResponse = await MockData.getNotFoundResponse();
|
||||
mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
|
||||
var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
|
||||
var result = (NotFoundResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
|
||||
Assert.Equal(404, result.StatusCode);
|
||||
}
|
||||
|
||||
// Link Type Test cases
|
||||
|
||||
|
@ -32,7 +32,8 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
doclinksAttachments.Add(new DoculinkAttachments()
|
||||
{
|
||||
docName = "",Path="www.google.com",
|
||||
IsAttachments=false,CustomOrder=1
|
||||
Language = "en",
|
||||
IsAttachments =false,CustomOrder=1
|
||||
});
|
||||
list.Add(new DocuLinks.Models.ResDoculink()
|
||||
{
|
||||
@ -74,6 +75,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
docName = "",
|
||||
Path = "www.google.com",
|
||||
IsAttachments = false,
|
||||
Language = "en",
|
||||
CustomOrder = 1
|
||||
});
|
||||
list.Add(new DocuLinks.Models.ResDoculink()
|
||||
@ -138,6 +140,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
||||
docName = "",
|
||||
Path = "www.google.com",
|
||||
IsAttachments = false,
|
||||
Language = "en",
|
||||
CustomOrder = 1
|
||||
});
|
||||
return new Models.Doculink
|
||||
@ -165,6 +168,7 @@ 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>();
|
||||
|
@ -15,7 +15,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
private readonly IDoculinkProvider documentsProvider;
|
||||
private readonly IUploadService uploadService;
|
||||
|
||||
public DoculinkController(IDoculinkProvider documentsProvider,IUploadService uploadService)
|
||||
public DoculinkController(IDoculinkProvider documentsProvider, IUploadService uploadService)
|
||||
{
|
||||
|
||||
this.documentsProvider = documentsProvider;
|
||||
@ -60,11 +60,11 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
[Authorize(Roles = "admin")]
|
||||
[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);
|
||||
@ -111,7 +111,82 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
return NotFound();
|
||||
}
|
||||
/// <summary>
|
||||
/// Get all documents.
|
||||
/// download an existing attachment.
|
||||
/// </summary>
|
||||
[Authorize(Roles = "admin")]
|
||||
[HttpGet("doculinks/download/{id}")]
|
||||
public async Task<IActionResult> downloadfile(int id)
|
||||
{
|
||||
try
|
||||
{
|
||||
var result = await this.documentsProvider.GetDownloadAttachmentAsync(id);
|
||||
if (!result.IsSuccess)
|
||||
return NotFound();
|
||||
string path = await uploadService.GetFile(result.DoculinkAttachments.Path);
|
||||
if (path == null)
|
||||
return NotFound();
|
||||
var contentType = GetContentType(result.DoculinkAttachments.docName);
|
||||
if (contentType == "application/octet-stream")
|
||||
return PhysicalFile(path, contentType, result.DoculinkAttachments.docName);
|
||||
return PhysicalFile(path, contentType, enableRangeProcessing: true);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Handle the exception here or log it
|
||||
return StatusCode(500, "An error occurred: " + ex.Message);
|
||||
}
|
||||
//try
|
||||
//{
|
||||
// var result = await this.documentsProvider.GetDownloadAttachmentAsync(id);
|
||||
// if (!result.IsSuccess)
|
||||
// return NotFound();
|
||||
// byte[] fileContent = await uploadService.DownloadFile(result.DoculinkAttachments.Path);
|
||||
// if (fileContent == null || fileContent.Length == 0)
|
||||
// return NotFound();
|
||||
// var contentType = "application/octet-stream";
|
||||
// return File(fileContent, contentType, result.DoculinkAttachments.docName);
|
||||
//}
|
||||
//catch (Exception ex)
|
||||
//{
|
||||
// // Handle the exception here or log it
|
||||
// return StatusCode(500, "An error occurred: " + ex.Message);
|
||||
//}
|
||||
}
|
||||
private string GetContentType(string fileName)
|
||||
{
|
||||
// You can add more content types based on the file extensions
|
||||
switch (Path.GetExtension(fileName).ToLower())
|
||||
{
|
||||
//case ".txt":
|
||||
// return "text/plain";
|
||||
case ".jpg":
|
||||
case ".jpeg":
|
||||
return "image/jpeg";
|
||||
case ".png":
|
||||
return "image/png";
|
||||
case ".gif":
|
||||
return "image/gif";
|
||||
case ".bmp":
|
||||
return "image/bmp";
|
||||
case ".webp":
|
||||
return "image/webp";
|
||||
case ".csv":
|
||||
return "text/csv";
|
||||
case ".pdf":
|
||||
return "application/pdf";
|
||||
case ".docx":
|
||||
case ".doc":
|
||||
return "application/vnd.openxmlformats-officedocument.wordprocessingml.document";
|
||||
case ".xlsx":
|
||||
case ".xls":
|
||||
return "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
||||
// Add more cases as needed
|
||||
default:
|
||||
return "application/octet-stream";
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Get all Doculink.
|
||||
/// </summary>
|
||||
|
||||
[Authorize(Roles = "admin")]
|
||||
@ -119,7 +194,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)
|
||||
@ -138,7 +213,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
|
||||
{
|
||||
var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language,true);
|
||||
var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, true);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.documents);
|
||||
@ -169,7 +244,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)
|
||||
@ -184,7 +259,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
[Authorize(Roles = "admin")]
|
||||
[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)
|
||||
{
|
||||
@ -192,7 +267,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)
|
||||
{
|
||||
@ -205,6 +280,20 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
return BadRequest(documentInfo);
|
||||
}
|
||||
/// <summary>
|
||||
/// update existing doclink isactive field.
|
||||
/// </summary>
|
||||
[HttpPut]
|
||||
[Route("doculinks/{id}/{isactive}")]
|
||||
public async Task<IActionResult> UpdateIsActiveDocument(int id, bool isactive)
|
||||
{
|
||||
var result = await this.documentsProvider.UpdateDocumentAsync(id, isactive);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Document);
|
||||
}
|
||||
return NotFound();
|
||||
}
|
||||
/// <summary>
|
||||
/// Create new doclink.
|
||||
/// </summary>
|
||||
[Authorize(Roles = "admin")]
|
||||
@ -217,7 +306,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)
|
||||
{
|
||||
|
@ -14,5 +14,6 @@ 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; }
|
||||
}
|
||||
}
|
||||
|
@ -11,7 +11,9 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
|
||||
Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, bool isactive);
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
|
||||
Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id);
|
||||
Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
|
||||
|
||||
|
||||
|
@ -7,6 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
|
||||
Models.Doculink UploadDocument( int counter, ReqDoculink documentInfo);
|
||||
public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
|
||||
void Deletefile(string path);
|
||||
Task<byte[]> DownloadFile(string path);
|
||||
Task<string> GetFile(string path);
|
||||
void Movefile(string path);
|
||||
}
|
||||
}
|
||||
|
@ -8,6 +8,7 @@ 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,6 +7,7 @@ namespace DamageAssesment.Api.DocuLinks.Models
|
||||
public int Id { get; set; }
|
||||
public int linkTypeId { get; set; }
|
||||
public List<DoculinkTranslation> documentsTranslations { get; set; }
|
||||
public bool IsActive { get; set; }
|
||||
public int CustomOrder { get; set; }
|
||||
public List<FileModel>? Files { get; set; }
|
||||
}
|
||||
@ -18,5 +19,6 @@ 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; }
|
||||
}
|
||||
}
|
||||
|
@ -69,6 +69,7 @@ builder.Services.AddSwaggerGen(options =>
|
||||
// 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,13 +2,16 @@
|
||||
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;
|
||||
|
||||
@ -22,13 +25,18 @@ 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)
|
||||
public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
|
||||
{
|
||||
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();
|
||||
}
|
||||
|
||||
@ -71,11 +79,11 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
{
|
||||
linkTypeId = 1;
|
||||
|
||||
fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 };
|
||||
fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1, Language = "en" };
|
||||
}
|
||||
else
|
||||
fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
|
||||
ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = linkTypeId, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
|
||||
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 } };
|
||||
Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
|
||||
DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
|
||||
DocumentDbContext.SaveChanges();
|
||||
@ -170,7 +178,42 @@ 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)
|
||||
{
|
||||
|
||||
@ -192,8 +235,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
item.titles = multilan.titles;
|
||||
item.description = multilan.description;
|
||||
item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
|
||||
item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
|
||||
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);
|
||||
@ -228,8 +270,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
item.titles = multilan.titles;
|
||||
item.description = multilan.description;
|
||||
item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
|
||||
item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
|
||||
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);
|
||||
@ -284,8 +325,7 @@ 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 = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
|
||||
result.doclinksAttachments = GetDocumentAttachment(id, "");
|
||||
return (true, result, null);
|
||||
}
|
||||
return (false, null, "Not found");
|
||||
@ -317,8 +357,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
|
||||
result.titles = multilan.titles;
|
||||
result.description = multilan.description;
|
||||
result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
|
||||
result.doclinksAttachments = GetDocumentAttachment(id, language);
|
||||
return (true, result, null);
|
||||
}
|
||||
return (false, null, "Not found");
|
||||
@ -349,7 +388,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, ""));
|
||||
result.titles = multilan.titles;
|
||||
result.description = multilan.description;
|
||||
result.doclinksAttachments = Document.doclinksAttachments;
|
||||
result.doclinksAttachments = GetDocumentAttachment(document.Id,"");
|
||||
return (true, result, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -391,7 +430,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, ""));
|
||||
result.titles = multilan.titles;
|
||||
result.description = multilan.description;
|
||||
result.doclinksAttachments = Document.doclinksAttachments;
|
||||
result.doclinksAttachments = GetDocumentAttachment(document.Id, "");
|
||||
return (true, result, "Successful");
|
||||
}
|
||||
else
|
||||
@ -414,6 +453,35 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id,bool isactive)
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
Db.Doculink Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
|
||||
if (Document == null)
|
||||
{
|
||||
return (false, null, "Not Found");
|
||||
}
|
||||
Document.IsActive = isactive;
|
||||
DocumentDbContext.Documents.Update(Document);
|
||||
DocumentDbContext.SaveChanges();
|
||||
var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document);
|
||||
var multilan = CreateMultiLanguageObject(GetDocumentTranslations(Document.Id, ""));
|
||||
result.titles = multilan.titles;
|
||||
result.description = multilan.description;
|
||||
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, ""));
|
||||
result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
|
||||
return (true, result, $"DocumentId {id} deleted Successfuly");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id)
|
||||
{
|
||||
|
||||
|
@ -25,6 +25,41 @@ 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)
|
||||
{
|
||||
@ -44,19 +79,20 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
counter++;
|
||||
if (item.IsAttachments)
|
||||
{
|
||||
UserfileName = Path.GetFileName(item.FileName);
|
||||
UserfileName = Path.GetFileName(item.FileName + item.FileExtension);
|
||||
var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
|
||||
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 });
|
||||
attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
|
||||
}
|
||||
}
|
||||
Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
|
||||
documentsTranslations = documentInfo.documentsTranslations,doclinksAttachments=attachments,
|
||||
IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =true};
|
||||
IsDeleted=false,CustomOrder=documentInfo.CustomOrder, IsActive =documentInfo.IsActive
|
||||
};
|
||||
|
||||
return Documents;
|
||||
}
|
||||
@ -85,21 +121,21 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
counter++;
|
||||
if (item.IsAttachments)
|
||||
{
|
||||
UserfileName = Path.GetFileName(item.FileName);
|
||||
UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
|
||||
var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
|
||||
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 });
|
||||
attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
|
||||
}
|
||||
Models.Doculink Documents = new Models.Doculink()
|
||||
{
|
||||
Id = documentInfo.Id,
|
||||
linkTypeId = documentInfo.linkTypeId,
|
||||
documentsTranslations=documentInfo.documentsTranslations,
|
||||
IsActive = true,
|
||||
IsActive = documentInfo.IsActive,
|
||||
IsDeleted=false,
|
||||
CustomOrder = documentInfo.CustomOrder,
|
||||
doclinksAttachments = attachments
|
||||
|
@ -77,7 +77,8 @@ namespace DamageAssesment.Api.Employees.Providers
|
||||
EmployeeDbContext.Employees.Add(_employee);
|
||||
Employee.Id = _employee.Id;
|
||||
EmployeeDbContext.SaveChanges();
|
||||
return (true, Employee, null);
|
||||
//return (true, Employee, null);
|
||||
return (true, mapper.Map<Db.Employee, Models.Employee>(_employee), null);
|
||||
}
|
||||
return (false, null, "Employee code is already exits");
|
||||
}
|
||||
|
@ -1,4 +1,5 @@
|
||||
using DamageAssesment.Api.Questions.Interfaces;
|
||||
using DamageAssesment.Api.Questions.Models;
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
@ -90,6 +91,47 @@ namespace DamageAssesment.Api.Questions.Controllers
|
||||
return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
|
||||
}
|
||||
/// <summary>
|
||||
/// POST request for creating a multiple question (multilingual).
|
||||
/// </summary>
|
||||
[Authorize(Roles = "admin")]
|
||||
[HttpPost("questions/multiple")]
|
||||
public async Task<IActionResult> CreateQuestions(List<Models.Question> questions)
|
||||
{
|
||||
if (questions != null)
|
||||
{
|
||||
var result = await this.questionsProvider.PostQuestionsAsync(questions);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Question);
|
||||
}
|
||||
if (result.ErrorMessage == "Not Found")
|
||||
return NotFound(result.ErrorMessage);
|
||||
|
||||
return BadRequest(result.ErrorMessage);
|
||||
}
|
||||
return CreatedAtRoute("DefaultApi",questions);
|
||||
}
|
||||
/// <summary>
|
||||
/// PUT request for update a multiple question (multilingual) for survey.
|
||||
/// </summary>
|
||||
[HttpPut("questions/multiple/{surveyid}")]
|
||||
public async Task<IActionResult> CreateQuestions(int surveyid, List<Models.Question> questions)
|
||||
{
|
||||
if (questions != null)
|
||||
{
|
||||
var result = await this.questionsProvider.PutQuestionsAsync(surveyid,questions);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.Question);
|
||||
}
|
||||
if (result.ErrorMessage == "Not Found")
|
||||
return NotFound(result.ErrorMessage);
|
||||
|
||||
return BadRequest(result.ErrorMessage);
|
||||
}
|
||||
return CreatedAtRoute("DefaultApi", questions);
|
||||
}
|
||||
/// <summary>
|
||||
/// POST request for creating a new question (multilingual).
|
||||
/// </summary>
|
||||
|
||||
|
@ -8,6 +8,8 @@ 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);
|
||||
|
||||
|
@ -334,16 +334,7 @@ namespace DamageAssesment.Api.Questions.Providers
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Question");
|
||||
var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
|
||||
var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
|
||||
dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
|
||||
questionDbContext.Questions.Add(dbquestion);
|
||||
dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
|
||||
questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
|
||||
questionDbContext.SaveChanges();
|
||||
Question.Id = dbquestion.Id;
|
||||
var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
|
||||
result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
|
||||
var result = InsertQuestion(Question);
|
||||
return (true, result, null);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@ -352,6 +343,69 @@ 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
|
||||
@ -385,8 +439,11 @@ 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");
|
||||
|
@ -75,8 +75,19 @@ namespace DamageAssesment.Api.Questions.Test
|
||||
return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1};
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static async Task<List<Questions.Models.Question>> getInputQuestionsData()
|
||||
{
|
||||
Models.QuestionsTranslation QuestionsTranslation = new Models.QuestionsTranslation()
|
||||
{
|
||||
Language = "en",
|
||||
QuestionText = "Sample question"
|
||||
};
|
||||
List<Models.QuestionsTranslation> QuestionsTranslations = new List<Models.QuestionsTranslation>();
|
||||
List<Models.Question> Questions = new List<Models.Question>();
|
||||
QuestionsTranslations.Add(QuestionsTranslation);
|
||||
Questions.Models.Question question = new Questions.Models.Question() { Id = 1, Questions = QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
|
||||
Questions.Add(question);
|
||||
return Questions;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -110,6 +110,33 @@ namespace DamageAssesment.Api.Questions.Test
|
||||
|
||||
Assert.Equal(400, result.StatusCode);
|
||||
}
|
||||
[Fact(DisplayName = "Post Questions - Ok case")]
|
||||
public async Task PostQuestionsAsync_ShouldReturnStatusCode200()
|
||||
{
|
||||
var mockQuestionService = new Mock<IQuestionsProvider>();
|
||||
var mockResponse = await MockData.getOkResponse();
|
||||
var mockInputQuestion = await MockData.getInputQuestionsData();
|
||||
mockQuestionService.Setup(service => service.PostQuestionsAsync(mockInputQuestion)).ReturnsAsync(mockResponse);
|
||||
|
||||
var QuestionProvider = new QuestionsController(mockQuestionService.Object);
|
||||
var result = (OkObjectResult)await QuestionProvider.CreateQuestions(mockInputQuestion);
|
||||
|
||||
Assert.Equal(200, result.StatusCode);
|
||||
}
|
||||
|
||||
[Fact(DisplayName = "Post Questions - BadRequest case")]
|
||||
public async Task PostQuestionsAsync_ShouldReturnStatusCode400()
|
||||
{
|
||||
var mockQuestionService = new Mock<IQuestionsProvider>();
|
||||
var mockInputQuestion = await MockData.getInputQuestionData();
|
||||
var mockResponse = await MockData.getBadRequestResponse();
|
||||
mockQuestionService.Setup(service => service.UpdateQuestionAsync(mockInputQuestion)).ReturnsAsync(mockResponse);
|
||||
|
||||
var QuestionProvider = new QuestionsController(mockQuestionService.Object);
|
||||
var result = (BadRequestObjectResult)await QuestionProvider.UpdateQuestion(mockInputQuestion);
|
||||
|
||||
Assert.Equal(400, result.StatusCode);
|
||||
}
|
||||
|
||||
[Fact(DisplayName = "Put Question - Ok case")]
|
||||
public async Task PutQuestionAsync_ShouldReturnStatusCode200()
|
||||
|
@ -71,16 +71,20 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Querying to get SurveyResponse object from DB");
|
||||
IQueryable<Db.SurveyResponse> listSurveyResponse = null;
|
||||
List<Db.SurveyResponse> listSurveyResponse = null;
|
||||
if (employeeid == 0)
|
||||
{
|
||||
listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId);
|
||||
listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId).ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid);
|
||||
listSurveyResponse = surveyResponseDbContext.SurveyResponses.Where(s => s.SurveyId == surveyId && s.EmployeeId == employeeid).ToList();
|
||||
}
|
||||
|
||||
listSurveyResponse = listSurveyResponse
|
||||
.OrderByDescending(obj => obj.Id)
|
||||
.GroupBy(obj => new { obj.SurveyId, obj.EmployeeId, obj.LocationId })
|
||||
.Select(group => group.FirstOrDefault()) // or .FirstOrDefault() if you want to handle empty groups
|
||||
.ToList();
|
||||
if (listSurveyResponse.Any())
|
||||
{
|
||||
var answers = await getAnswersByRegionAndSurveyIdAsync(listSurveyResponse);
|
||||
@ -432,7 +436,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
}
|
||||
|
||||
//Method to get Answers by region with surveyId as input parameter
|
||||
private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(IQueryable<Db.SurveyResponse> surveyResponses)
|
||||
private async Task<dynamic> getAnswersByRegionAndSurveyIdAsync(List<Db.SurveyResponse> surveyResponses)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
@ -179,6 +179,11 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
{
|
||||
if (survey != null)
|
||||
{
|
||||
if (survey.StartDate != null && survey.EndDate != null)
|
||||
{
|
||||
if(survey.StartDate.Value>survey.EndDate.Value)
|
||||
return (false, null, $"Survey start date should be less than enddate");
|
||||
}
|
||||
survey.CreatedDate = DateTime.Now;
|
||||
Db.Survey _survey = mapper.Map<Models.Survey, Db.Survey>(survey);
|
||||
|
||||
@ -215,6 +220,11 @@ namespace DamageAssesment.Api.Surveys.Providers
|
||||
{
|
||||
if (survey != null)
|
||||
{
|
||||
if (survey.StartDate != null && survey.EndDate != null)
|
||||
{
|
||||
if (survey.StartDate.Value > survey.EndDate.Value)
|
||||
return (false, null, $"Survey start date should be less than enddate");
|
||||
}
|
||||
var _survey = await surveyDbContext.Surveys.AsNoTracking().Where(s => s.Id == Id).SingleOrDefaultAsync();
|
||||
|
||||
if (_survey != null)
|
||||
|
@ -14,6 +14,16 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
|
||||
{
|
||||
this.userAccessProvider = userAccessProvider;
|
||||
}
|
||||
[HttpPost("dadeschooltoken")]
|
||||
public async Task<ActionResult> DadeSchoolAuthenticateAsync(string username, string password)
|
||||
{
|
||||
var result = await userAccessProvider.DadeSchoolAuthenticateAsync(username, password);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.TokenResponse);
|
||||
}
|
||||
return Unauthorized(result.ErrorMessage);
|
||||
}
|
||||
[Authorize(Policy = "Dadeschools")]
|
||||
[HttpPost("token/{employecode}")]
|
||||
public async Task<ActionResult> AuthenticateAsync(string employecode)
|
||||
|
@ -11,6 +11,7 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
|
||||
public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> DeleteUserAsync(int Id);
|
||||
public Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync();
|
||||
public Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employeCode);
|
||||
public Task<(bool IsSuccess, Models.DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password);
|
||||
public Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)>RefreshTokenAsync(TokenResponse tokenResponse);
|
||||
public void seedData();
|
||||
}
|
||||
|
@ -0,0 +1,10 @@
|
||||
namespace DamageAssesment.Api.UsersAccess.Models
|
||||
{
|
||||
public class DadeSchoolToken
|
||||
{
|
||||
public string access_token { get; set; }
|
||||
public int expires_in { get; set; }
|
||||
public string token_type { get; set; }
|
||||
public string scope { get; set; }
|
||||
}
|
||||
}
|
@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using System.Data;
|
||||
using Newtonsoft.Json;
|
||||
using System.IdentityModel.Tokens.Jwt;
|
||||
using System.Security.Claims;
|
||||
using System.Text;
|
||||
@ -20,8 +21,9 @@ namespace DamageAssesment.Api.UsersAccess.Providers
|
||||
//private readonly IEmployeeServiceProvider employeeServiceProvider;
|
||||
private readonly JwtSettings jwtSettings;
|
||||
private readonly ITokenServiceProvider tokenServiceProvider;
|
||||
private readonly IConfiguration configuration;
|
||||
|
||||
public UsersAccessProvider(IOptions<JwtSettings> options, ITokenServiceProvider tokenServiceProvider, UsersAccessDbContext userAccessDbContext, IEmployeeServiceProvider employeeServiceProvider, ILogger<UsersAccessProvider> logger, IMapper mapper)
|
||||
public UsersAccessProvider(IConfiguration configuration,IOptions<JwtSettings> options, ITokenServiceProvider tokenServiceProvider, UsersAccessDbContext userAccessDbContext, IEmployeeServiceProvider employeeServiceProvider, ILogger<UsersAccessProvider> logger, IMapper mapper)
|
||||
{
|
||||
this.userAccessDbContext = userAccessDbContext;
|
||||
//this.employeeServiceProvider = employeeServiceProvider;
|
||||
@ -29,7 +31,8 @@ namespace DamageAssesment.Api.UsersAccess.Providers
|
||||
this.mapper = mapper;
|
||||
jwtSettings = options.Value;
|
||||
this.tokenServiceProvider = tokenServiceProvider;
|
||||
// seedData();
|
||||
this.configuration = configuration;
|
||||
// seedData();
|
||||
}
|
||||
|
||||
public void seedData()
|
||||
@ -187,7 +190,35 @@ namespace DamageAssesment.Api.UsersAccess.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
|
||||
{
|
||||
try
|
||||
{
|
||||
var client = new HttpClient();
|
||||
var request = new HttpRequestMessage(HttpMethod.Post, configuration.GetValue<string>("Dadeschools:TokenUrl"));
|
||||
var collection = new List<KeyValuePair<string, string>>();
|
||||
collection.Add(new("client_id", configuration.GetValue<string>("Dadeschools:TokenClientId")));
|
||||
collection.Add(new("client_secret", configuration.GetValue<string>("Dadeschools:TokenClientSecret")));
|
||||
collection.Add(new("scope", configuration.GetValue<string>("Dadeschools:scope")));
|
||||
collection.Add(new("grant_type", configuration.GetValue<string>("Dadeschools:grant_type")));
|
||||
collection.Add(new("username", username));
|
||||
collection.Add(new("password", password));
|
||||
var content = new FormUrlEncodedContent(collection);
|
||||
request.Content = content;
|
||||
var response = await client.SendAsync(request);
|
||||
var responseString = await response.Content.ReadAsStringAsync();
|
||||
if (response.IsSuccessStatusCode)
|
||||
{
|
||||
return (true, JsonConvert.DeserializeObject<DadeSchoolToken>(responseString), "");
|
||||
}
|
||||
return (false, null, responseString);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
|
||||
}
|
||||
public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employecode)
|
||||
{
|
||||
|
||||
|
@ -21,6 +21,10 @@
|
||||
"TokenUrl": "https://dev-graph.dadeschools.net/connect/token",
|
||||
"ClientId": "dmapi",
|
||||
"ClientSecret": "bfce2c8d-2064-4a02-b19d-7f1d42b16eae",
|
||||
"TokenClientId": "damage_assessment_postman",
|
||||
"TokenClientSecret": "e4774164-f018-44c9-b9d2-3a29fc21db3c",
|
||||
"scope": "openid profile",
|
||||
"grant_type": "password",
|
||||
"Name": "Dadeschools Identity Server"
|
||||
},
|
||||
"Scopes": [
|
||||
|
Reference in New Issue
Block a user