Compare commits
7 Commits
dev
...
local-dock
Author | SHA1 | Date | |
---|---|---|---|
|
adadc32a34 | ||
|
3b9697cb75 | ||
|
101ed7ee04 | ||
|
a2b6e078e2 | ||
|
dbabc10e7c | ||
|
2c7d4e6138 | ||
|
f7ccc89d53 |
@ -136,6 +136,80 @@ namespace DamageAssesment.Api.Attachments.Controllers
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <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.
|
/// Delete an existing attachment.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[HttpDelete("attachments/{id}")]
|
[HttpDelete("attachments/{id}")]
|
||||||
|
@ -9,6 +9,7 @@ namespace DamageAssesment.Api.Attachments.Interfaces
|
|||||||
Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments);
|
Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PostAttachmentAsync(List<Models.Attachment> Attachments);
|
||||||
Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments);
|
Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> PutAttachmentAsync(List<Models.Attachment> Attachments);
|
||||||
Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> DeleteAttachmentAsync(int Id);
|
Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> DeleteAttachmentAsync(int Id);
|
||||||
|
Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id);
|
||||||
Task<(bool IsSuccess, int counter, string Path)> DeleteAttachmentsAsync(int responseId, int answerId);
|
Task<(bool IsSuccess, int counter, string Path)> DeleteAttachmentsAsync(int responseId, int answerId);
|
||||||
Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds);
|
Task<(bool IsSuccess, int counter, string Path)> DeleteBulkAttachmentsAsync(int responseId, List<int> answerIds);
|
||||||
Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter();
|
Task<(bool IsSuccess, int counter, string message)> GetAttachmentCounter();
|
||||||
|
@ -7,6 +7,8 @@ namespace DamageAssesment.Api.Attachments.Interfaces
|
|||||||
List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
|
List<Models.Attachment> UploadAttachment(int responseId,int answerId, int counter, List<IFormFile> postedFile);
|
||||||
List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
|
List<Models.Attachment> UploadAttachment(int responseId, int counter, List<AnswerInfo> answers);
|
||||||
public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
|
public List<Models.Attachment> UpdateAttachments(int responseId, List<AnswerInfo> answers, IEnumerable<Models.Attachment> attachments);
|
||||||
|
Task<byte[]> DownloadFile(string path);
|
||||||
|
Task<string> GetFile(string path);
|
||||||
void Deletefile(string path);
|
void Deletefile(string path);
|
||||||
void Movefile(string path);
|
void Movefile(string path);
|
||||||
}
|
}
|
||||||
|
@ -21,6 +21,7 @@ builder.Services.AddSwaggerGen(c =>
|
|||||||
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
|
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
|
||||||
c.IncludeXmlComments(xmlPath);
|
c.IncludeXmlComments(xmlPath);
|
||||||
});
|
});
|
||||||
|
builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
|
||||||
builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
|
builder.Services.AddScoped<IAttachmentsProvider, AttachmentsProvider>();
|
||||||
builder.Services.AddScoped<IUploadService, UploadService>();
|
builder.Services.AddScoped<IUploadService, UploadService>();
|
||||||
builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
|
builder.Services.AddScoped<IAzureBlobService,AzureBlobService>();
|
||||||
|
@ -13,25 +13,33 @@ namespace DamageAssesment.Api.Attachments.Providers
|
|||||||
private AttachmentsDbContext AttachmentDbContext;
|
private AttachmentsDbContext AttachmentDbContext;
|
||||||
private ILogger<AttachmentsProvider> logger;
|
private ILogger<AttachmentsProvider> logger;
|
||||||
private IUploadService uploadservice;
|
private IUploadService uploadservice;
|
||||||
private IMapper mapper;
|
private IMapper mapper;
|
||||||
|
private readonly IHttpContextAccessor httpContextAccessor;
|
||||||
public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice)
|
private string baseUrl;
|
||||||
|
public AttachmentsProvider(AttachmentsDbContext AttachmentDbContext, ILogger<AttachmentsProvider> logger, IMapper mapper,IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
|
||||||
{
|
{
|
||||||
this.AttachmentDbContext = AttachmentDbContext;
|
this.AttachmentDbContext = AttachmentDbContext;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.mapper = mapper;
|
this.mapper = mapper;
|
||||||
this.uploadservice = uploadservice;
|
this.uploadservice = uploadservice;
|
||||||
|
this.httpContextAccessor = httpContextAccessor;
|
||||||
|
baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
|
||||||
|
baseUrl = baseUrl + "/attachments/download";
|
||||||
SeedData();
|
SeedData();
|
||||||
}
|
}
|
||||||
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
|
public async Task<(bool IsSuccess, IEnumerable<Models.Attachment> Attachments, string ErrorMessage)> GetAttachmentsAsync()
|
||||||
{
|
{
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger?.LogInformation("Query Question");
|
logger?.LogInformation("Query Question");
|
||||||
var Attachment = await AttachmentDbContext.Attachments.AsNoTracking().Where(a => !a.IsDeleted).ToListAsync();
|
var Attachment = await AttachmentDbContext.Attachments.AsNoTracking().Where(a => !a.IsDeleted).ToListAsync();
|
||||||
if (Attachment != null)
|
if (Attachment != null)
|
||||||
{
|
{
|
||||||
|
foreach (var attachment in Attachment)
|
||||||
|
{
|
||||||
|
attachment.URI = $"{baseUrl}/{attachment.Id}";
|
||||||
|
}
|
||||||
logger?.LogInformation($"{Attachment.Count} Attachments(s) found");
|
logger?.LogInformation($"{Attachment.Count} Attachments(s) found");
|
||||||
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachment);
|
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(Attachment);
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
@ -54,6 +62,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
|||||||
if (Attachment != null)
|
if (Attachment != null)
|
||||||
{
|
{
|
||||||
logger?.LogInformation($"{Attachment} customer(s) found");
|
logger?.LogInformation($"{Attachment} customer(s) found");
|
||||||
|
Attachment.URI = $"{baseUrl}/{Attachment.Id}";
|
||||||
var result = mapper.Map<Db.Attachment, Models.Attachment>(Attachment);
|
var result = mapper.Map<Db.Attachment, Models.Attachment>(Attachment);
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
}
|
}
|
||||||
@ -73,6 +82,10 @@ namespace DamageAssesment.Api.Attachments.Providers
|
|||||||
List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
|
List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
|
||||||
AttachmentDbContext.Attachments.AddRange(attachments);
|
AttachmentDbContext.Attachments.AddRange(attachments);
|
||||||
await AttachmentDbContext.SaveChangesAsync();
|
await AttachmentDbContext.SaveChangesAsync();
|
||||||
|
foreach (var attachment in attachments)
|
||||||
|
{
|
||||||
|
attachment.URI = $"{baseUrl}/{attachment.Id}";
|
||||||
|
}
|
||||||
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
|
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
}
|
}
|
||||||
@ -91,6 +104,10 @@ namespace DamageAssesment.Api.Attachments.Providers
|
|||||||
List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
|
List<Db.Attachment> attachments = mapper.Map<List<Models.Attachment>, List<Db.Attachment>>(Attachments);
|
||||||
AttachmentDbContext.Attachments.UpdateRange(attachments);
|
AttachmentDbContext.Attachments.UpdateRange(attachments);
|
||||||
await AttachmentDbContext.SaveChangesAsync();
|
await AttachmentDbContext.SaveChangesAsync();
|
||||||
|
foreach (var attachment in attachments)
|
||||||
|
{
|
||||||
|
attachment.URI = $"{baseUrl}/{attachment.Id}";
|
||||||
|
}
|
||||||
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
|
var result = mapper.Map<IEnumerable<Db.Attachment>, IEnumerable<Models.Attachment>>(attachments);
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
}
|
}
|
||||||
@ -197,6 +214,24 @@ namespace DamageAssesment.Api.Attachments.Providers
|
|||||||
{
|
{
|
||||||
return AttachmentDbContext.Attachments.AsNoTracking().Count(e => e.Id == id && !e.IsDeleted) > 0;
|
return AttachmentDbContext.Attachments.AsNoTracking().Count(e => e.Id == id && !e.IsDeleted) > 0;
|
||||||
}
|
}
|
||||||
|
public async Task<(bool IsSuccess, Models.Attachment Attachment, string Path)> GetDownloadAttachmentAsync(int Id)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Db.Attachment Attachment = AttachmentDbContext.Attachments.Where(a => a.Id == Id).AsNoTracking().FirstOrDefault();
|
||||||
|
if (Attachment == null)
|
||||||
|
{
|
||||||
|
return (false, null, "Not Found");
|
||||||
|
}
|
||||||
|
return (true, mapper.Map<Db.Attachment, Models.Attachment>(Attachment), $"Attachment {Id}");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
|
||||||
|
logger?.LogError(ex.ToString());
|
||||||
|
return (false, null, ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void SeedData()
|
private void SeedData()
|
||||||
{
|
{
|
||||||
|
@ -24,6 +24,41 @@ namespace DamageAssesment.Api.Attachments.Providers
|
|||||||
uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
|
uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
|
||||||
Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
|
Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
|
||||||
}
|
}
|
||||||
|
public async Task<string> GetFile(string path)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (System.IO.File.Exists(path))
|
||||||
|
{
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null; // File not found
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
// Handle or log the exception as needed
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
public async Task<byte[]> DownloadFile(string path)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (System.IO.File.Exists(path))
|
||||||
|
{
|
||||||
|
return await System.IO.File.ReadAllBytesAsync(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null; // File not found
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
// Handle or log the exception as needed
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
|
public List<Models.Attachment> UploadAttachment(int responseId,int answerId,int counter, List<IFormFile> postedFile)
|
||||||
{
|
{
|
||||||
var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
|
var pathToSave = Path.Combine(Directory.GetCurrentDirectory(), uploadpath);
|
||||||
@ -89,7 +124,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
|||||||
{
|
{
|
||||||
counter++;
|
counter++;
|
||||||
|
|
||||||
var UserfileName = Path.GetFileName(file.FileName);
|
var UserfileName = Path.GetFileName(file.FileName+ file.FileExtension);
|
||||||
var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
|
var fileName = String.Format("Attachment_{0}{1}", counter, file.FileExtension);
|
||||||
var dbPath = Path.Combine(fullDirectoryPath, fileName);
|
var dbPath = Path.Combine(fullDirectoryPath, fileName);
|
||||||
File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
|
File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
|
||||||
@ -126,7 +161,7 @@ namespace DamageAssesment.Api.Attachments.Providers
|
|||||||
foreach (var file in item.postedFiles)
|
foreach (var file in item.postedFiles)
|
||||||
{
|
{
|
||||||
Models.Attachment attachment= attachments.Where(a=>a.Id == file.AttachmentId).FirstOrDefault();
|
Models.Attachment attachment= attachments.Where(a=>a.Id == file.AttachmentId).FirstOrDefault();
|
||||||
var UserfileName = Path.GetFileName(file.FileName);
|
var UserfileName = Path.GetFileName(file.FileName + file.FileExtension);
|
||||||
var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
|
var fileName = String.Format("Attachment_{0}{1}", attachment?.Id, file.FileExtension);
|
||||||
var dbPath = Path.Combine(fullDirectoryPath, fileName);
|
var dbPath = Path.Combine(fullDirectoryPath, fileName);
|
||||||
File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
|
File.WriteAllBytes(dbPath, Convert.FromBase64String(file.FileContent));
|
||||||
|
@ -197,7 +197,29 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
|||||||
var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1);
|
var result = (NotFoundResult)await DocumentProvider.DeleteDocument(1);
|
||||||
Assert.Equal(404, result.StatusCode);
|
Assert.Equal(404, result.StatusCode);
|
||||||
}
|
}
|
||||||
|
[Fact(DisplayName = "Update Document IsActive- Ok case")]
|
||||||
|
public async Task UpdateDocumentAsync_ShouldReturnStatusCode200()
|
||||||
|
{
|
||||||
|
var mockDocumentService = new Mock<IDoculinkProvider>();
|
||||||
|
var mockUploadService = new Mock<IUploadService>();
|
||||||
|
var mockResponse = await MockData.getOkResponse(1);
|
||||||
|
mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
|
||||||
|
var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
|
||||||
|
var result = (OkObjectResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
|
||||||
|
|
||||||
|
Assert.Equal(200, result.StatusCode);
|
||||||
|
}
|
||||||
|
[Fact(DisplayName = "Update Document IsActive - NotFound case")]
|
||||||
|
public async Task UpdateDocumentAsync_ShouldReturnStatusCode404()
|
||||||
|
{
|
||||||
|
var mockDocumentService = new Mock<IDoculinkProvider>();
|
||||||
|
var mockUploadService = new Mock<IUploadService>();
|
||||||
|
var mockResponse = await MockData.getNotFoundResponse();
|
||||||
|
mockDocumentService.Setup(service => service.UpdateDocumentAsync(1,true)).ReturnsAsync(mockResponse);
|
||||||
|
var DocumentProvider = new DoculinkController(mockDocumentService.Object, mockUploadService.Object);
|
||||||
|
var result = (NotFoundResult)await DocumentProvider.UpdateIsActiveDocument(1,true);
|
||||||
|
Assert.Equal(404, result.StatusCode);
|
||||||
|
}
|
||||||
|
|
||||||
// Link Type Test cases
|
// Link Type Test cases
|
||||||
|
|
||||||
|
@ -32,7 +32,8 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
|||||||
doclinksAttachments.Add(new DoculinkAttachments()
|
doclinksAttachments.Add(new DoculinkAttachments()
|
||||||
{
|
{
|
||||||
docName = "",Path="www.google.com",
|
docName = "",Path="www.google.com",
|
||||||
IsAttachments=false,CustomOrder=1
|
Language = "en",
|
||||||
|
IsAttachments =false,CustomOrder=1
|
||||||
});
|
});
|
||||||
list.Add(new DocuLinks.Models.ResDoculink()
|
list.Add(new DocuLinks.Models.ResDoculink()
|
||||||
{
|
{
|
||||||
@ -74,6 +75,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
|||||||
docName = "",
|
docName = "",
|
||||||
Path = "www.google.com",
|
Path = "www.google.com",
|
||||||
IsAttachments = false,
|
IsAttachments = false,
|
||||||
|
Language = "en",
|
||||||
CustomOrder = 1
|
CustomOrder = 1
|
||||||
});
|
});
|
||||||
list.Add(new DocuLinks.Models.ResDoculink()
|
list.Add(new DocuLinks.Models.ResDoculink()
|
||||||
@ -138,6 +140,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
|||||||
docName = "",
|
docName = "",
|
||||||
Path = "www.google.com",
|
Path = "www.google.com",
|
||||||
IsAttachments = false,
|
IsAttachments = false,
|
||||||
|
Language = "en",
|
||||||
CustomOrder = 1
|
CustomOrder = 1
|
||||||
});
|
});
|
||||||
return new Models.Doculink
|
return new Models.Doculink
|
||||||
@ -165,6 +168,7 @@ namespace DamageAssesment.Api.DocuLinks.Test
|
|||||||
docName = "",
|
docName = "",
|
||||||
Path = "www.google.com",
|
Path = "www.google.com",
|
||||||
IsAttachments = false,
|
IsAttachments = false,
|
||||||
|
Language = "en",
|
||||||
CustomOrder = 1
|
CustomOrder = 1
|
||||||
});
|
});
|
||||||
List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();
|
List<DocuLinks.Models.Doculink> DocuLinks = new List<Models.Doculink>();
|
||||||
|
@ -13,11 +13,11 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
private readonly IDoculinkProvider documentsProvider;
|
private readonly IDoculinkProvider documentsProvider;
|
||||||
private readonly IUploadService uploadService;
|
private readonly IUploadService uploadService;
|
||||||
|
|
||||||
public DoculinkController(IDoculinkProvider documentsProvider,IUploadService uploadService)
|
public DoculinkController(IDoculinkProvider documentsProvider, IUploadService uploadService)
|
||||||
{
|
{
|
||||||
|
|
||||||
this.documentsProvider = documentsProvider;
|
this.documentsProvider = documentsProvider;
|
||||||
this.uploadService = uploadService;
|
this.uploadService = uploadService;
|
||||||
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -41,7 +41,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
[HttpGet]
|
[HttpGet]
|
||||||
[Route("doculinks/types/{id}")]
|
[Route("doculinks/types/{id}")]
|
||||||
[Route("doculinks/types/{id}/{language:alpha}")]
|
[Route("doculinks/types/{id}/{language:alpha}")]
|
||||||
public async Task<IActionResult> GetLinkTypeAsync(int id,string? language)
|
public async Task<IActionResult> GetLinkTypeAsync(int id, string? language)
|
||||||
{
|
{
|
||||||
var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
|
var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
@ -55,11 +55,11 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[HttpPut]
|
[HttpPut]
|
||||||
[Route("doculinks/types/{id}")]
|
[Route("doculinks/types/{id}")]
|
||||||
public async Task<IActionResult> UpdateLinkType(int id,Models.LinkType linkType)
|
public async Task<IActionResult> UpdateLinkType(int id, Models.LinkType linkType)
|
||||||
{
|
{
|
||||||
if (linkType != null)
|
if (linkType != null)
|
||||||
{
|
{
|
||||||
var result = await this.documentsProvider.UpdateLinkTypeAsync(id,linkType);
|
var result = await this.documentsProvider.UpdateLinkTypeAsync(id, linkType);
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
{
|
{
|
||||||
return Ok(result.LinkType);
|
return Ok(result.LinkType);
|
||||||
@ -104,6 +104,80 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
return NotFound();
|
return NotFound();
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <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.
|
/// Get all Doculink.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
///
|
///
|
||||||
@ -111,7 +185,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
[Route("doculinks/{linktype:alpha}")]
|
[Route("doculinks/{linktype:alpha}")]
|
||||||
[Route("doculinks/{linktype:alpha}/{language:alpha}")]
|
[Route("doculinks/{linktype:alpha}/{language:alpha}")]
|
||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language,bool? isactive)
|
public async Task<IActionResult> GetDocumentsAsync(string? linktype, string? language, bool? isactive)
|
||||||
{
|
{
|
||||||
var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive);
|
var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, isactive);
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
@ -129,7 +203,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
[HttpGet]
|
[HttpGet]
|
||||||
public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
|
public async Task<IActionResult> GetDocumentsByActiveAsync(string? linktype, string? language)
|
||||||
{
|
{
|
||||||
var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language,true);
|
var result = await this.documentsProvider.GetdocumentsByLinkAsync(linktype, language, true);
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
{
|
{
|
||||||
return Ok(result.documents);
|
return Ok(result.documents);
|
||||||
@ -158,7 +232,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
[Route("doculinks/{id}")]
|
[Route("doculinks/{id}")]
|
||||||
[Route("doculinks/{id}/{linktype:alpha}")]
|
[Route("doculinks/{id}/{linktype:alpha}")]
|
||||||
[Route("doculinks/{id}/{linktype:alpha}/{language:alpha}")]
|
[Route("doculinks/{id}/{linktype:alpha}/{language:alpha}")]
|
||||||
public async Task<IActionResult> GetDocumentAsync(int id,string? linktype, string? language)
|
public async Task<IActionResult> GetDocumentAsync(int id, string? linktype, string? language)
|
||||||
{
|
{
|
||||||
var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
|
var result = await this.documentsProvider.GetDocumentAsync(id, linktype, language);
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
@ -172,7 +246,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[HttpPut]
|
[HttpPut]
|
||||||
[Route("doculinks/{id}")]
|
[Route("doculinks/{id}")]
|
||||||
public async Task<IActionResult> UpdateDocument(int id,ReqDoculink documentInfo)
|
public async Task<IActionResult> UpdateDocument(int id, ReqDoculink documentInfo)
|
||||||
{
|
{
|
||||||
if (documentInfo != null)
|
if (documentInfo != null)
|
||||||
{
|
{
|
||||||
@ -180,7 +254,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
if (dbdoc.IsSuccess)
|
if (dbdoc.IsSuccess)
|
||||||
{
|
{
|
||||||
var documents = await this.documentsProvider.GetDocumentCounter();
|
var documents = await this.documentsProvider.GetDocumentCounter();
|
||||||
Models.Doculink DocuLink= uploadService.UpdateDocuments(documents.counter,dbdoc.Document, documentInfo);
|
Models.Doculink DocuLink = uploadService.UpdateDocuments(documents.counter, dbdoc.Document, documentInfo);
|
||||||
var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
|
var result = await this.documentsProvider.UpdateDocumentAsync(id, DocuLink);
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
{
|
{
|
||||||
@ -193,6 +267,20 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
return BadRequest(documentInfo);
|
return BadRequest(documentInfo);
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// update existing doclink isactive field.
|
||||||
|
/// </summary>
|
||||||
|
[HttpPut]
|
||||||
|
[Route("doculinks/{id}/{isactive}")]
|
||||||
|
public async Task<IActionResult> UpdateIsActiveDocument(int id, bool isactive)
|
||||||
|
{
|
||||||
|
var result = await this.documentsProvider.UpdateDocumentAsync(id, isactive);
|
||||||
|
if (result.IsSuccess)
|
||||||
|
{
|
||||||
|
return Ok(result.Document);
|
||||||
|
}
|
||||||
|
return NotFound();
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
/// Create new doclink.
|
/// Create new doclink.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
@ -204,7 +292,7 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
if (documentInfo != null)
|
if (documentInfo != null)
|
||||||
{
|
{
|
||||||
var documents = await this.documentsProvider.GetDocumentCounter();
|
var documents = await this.documentsProvider.GetDocumentCounter();
|
||||||
Models.Doculink DocuLink= uploadService.UploadDocument(documents.counter, documentInfo);
|
Models.Doculink DocuLink = uploadService.UploadDocument(documents.counter, documentInfo);
|
||||||
var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
|
var result = await this.documentsProvider.PostDocumentAsync(DocuLink);
|
||||||
if (result.IsSuccess)
|
if (result.IsSuccess)
|
||||||
{
|
{
|
||||||
@ -239,6 +327,6 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
|||||||
}
|
}
|
||||||
return NotFound();
|
return NotFound();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,5 +14,6 @@ namespace DamageAssesment.Api.DocuLinks.Db
|
|||||||
public string Path { get; set; }
|
public string Path { get; set; }
|
||||||
public bool IsAttachments { get; set; }
|
public bool IsAttachments { get; set; }
|
||||||
public int CustomOrder { get; set; }
|
public int CustomOrder { get; set; }
|
||||||
|
public string Language { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,9 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
|
|||||||
Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
|
Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive);
|
||||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document);
|
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> PostDocumentAsync(Models.Doculink Document);
|
||||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document);
|
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, Models.Doculink Document);
|
||||||
|
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id, bool isactive);
|
||||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
|
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id);
|
||||||
|
Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id);
|
||||||
Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
|
Task<(bool IsSuccess, int counter, string message)> GetDocumentCounter();
|
||||||
|
|
||||||
|
|
||||||
|
@ -7,6 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
|
|||||||
Models.Doculink UploadDocument( int counter, ReqDoculink documentInfo);
|
Models.Doculink UploadDocument( int counter, ReqDoculink documentInfo);
|
||||||
public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
|
public Models.Doculink UpdateDocuments(int counter, Models.Doculink document, ReqDoculink documentInfo);
|
||||||
void Deletefile(string path);
|
void Deletefile(string path);
|
||||||
|
Task<byte[]> DownloadFile(string path);
|
||||||
|
Task<string> GetFile(string path);
|
||||||
void Movefile(string path);
|
void Movefile(string path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,7 @@ namespace DamageAssesment.Api.DocuLinks.Models
|
|||||||
public string docName { get; set; }
|
public string docName { get; set; }
|
||||||
public string Path { get; set; }
|
public string Path { get; set; }
|
||||||
public bool IsAttachments { get; set; }
|
public bool IsAttachments { get; set; }
|
||||||
|
public string Language { get; set; }
|
||||||
public int CustomOrder { get; set; }
|
public int CustomOrder { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,5 +18,6 @@ namespace DamageAssesment.Api.DocuLinks.Models
|
|||||||
public int CustomOrder { get; set; }
|
public int CustomOrder { get; set; }
|
||||||
public string url { get;set; }
|
public string url { get;set; }
|
||||||
public bool IsAttachments { get; set; }
|
public bool IsAttachments { get; set; }
|
||||||
|
public string Language { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,6 +19,7 @@ builder.Services.AddSwaggerGen(c =>
|
|||||||
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
|
||||||
builder.Services.AddEndpointsApiExplorer();
|
builder.Services.AddEndpointsApiExplorer();
|
||||||
builder.Services.AddSwaggerGen();
|
builder.Services.AddSwaggerGen();
|
||||||
|
builder.Services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
|
||||||
builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>();
|
builder.Services.AddScoped<IDoculinkProvider, DoculinkProvider>();
|
||||||
builder.Services.AddScoped<IUploadService, UploadService>();
|
builder.Services.AddScoped<IUploadService, UploadService>();
|
||||||
builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
|
builder.Services.AddScoped<IAzureBlobService, AzureBlobService>();
|
||||||
|
@ -2,13 +2,16 @@
|
|||||||
using DamageAssesment.Api.DocuLinks.Db;
|
using DamageAssesment.Api.DocuLinks.Db;
|
||||||
using DamageAssesment.Api.DocuLinks.Interfaces;
|
using DamageAssesment.Api.DocuLinks.Interfaces;
|
||||||
using DamageAssesment.Api.DocuLinks.Models;
|
using DamageAssesment.Api.DocuLinks.Models;
|
||||||
|
using Microsoft.AspNetCore.Http;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Microsoft.EntityFrameworkCore.Metadata.Internal;
|
using Microsoft.EntityFrameworkCore.Metadata.Internal;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Collections.Immutable;
|
using System.Collections.Immutable;
|
||||||
using System.Diagnostics.Eventing.Reader;
|
using System.Diagnostics.Eventing.Reader;
|
||||||
using System.Reflection.Metadata;
|
using System.Reflection.Metadata;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
|
||||||
@ -22,13 +25,18 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
private ILogger<DoculinkProvider> logger;
|
private ILogger<DoculinkProvider> logger;
|
||||||
private IUploadService uploadservice;
|
private IUploadService uploadservice;
|
||||||
private IMapper mapper;
|
private IMapper mapper;
|
||||||
|
private readonly IHttpContextAccessor httpContextAccessor;
|
||||||
|
private string baseUrl;
|
||||||
|
|
||||||
public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice)
|
public DoculinkProvider(DoculinkDbContext DocumentDbContext, ILogger<DoculinkProvider> logger, IMapper mapper, IUploadService uploadservice, IHttpContextAccessor httpContextAccessor)
|
||||||
{
|
{
|
||||||
this.DocumentDbContext = DocumentDbContext;
|
this.DocumentDbContext = DocumentDbContext;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.mapper = mapper;
|
this.mapper = mapper;
|
||||||
this.uploadservice = uploadservice;
|
this.uploadservice = uploadservice;
|
||||||
|
this.httpContextAccessor = httpContextAccessor;
|
||||||
|
baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
|
||||||
|
baseUrl = baseUrl + "/doculinks/download";
|
||||||
SeedData();
|
SeedData();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,11 +79,11 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
{
|
{
|
||||||
linkTypeId = 1;
|
linkTypeId = 1;
|
||||||
|
|
||||||
fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 };
|
fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1, Language = "en" };
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
|
fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1,Language="en" };
|
||||||
ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = linkTypeId, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
|
ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
|
||||||
Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
|
Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
|
||||||
DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
|
DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
|
||||||
DocumentDbContext.SaveChanges();
|
DocumentDbContext.SaveChanges();
|
||||||
@ -170,7 +178,42 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
MultiLanguage = dicttitle;
|
MultiLanguage = dicttitle;
|
||||||
return MultiLanguage;
|
return MultiLanguage;
|
||||||
}
|
}
|
||||||
|
private List<Models.DoculinkAttachments> GetDocumentAttachment(int id,string? language)
|
||||||
|
{
|
||||||
|
List<Db.DoculinkAttachments> doculinkAttachments = null;
|
||||||
|
if (string.IsNullOrEmpty(language))
|
||||||
|
{
|
||||||
|
doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
doculinkAttachments = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id && a.Language == language).ToList();
|
||||||
|
}
|
||||||
|
foreach (var attachment in doculinkAttachments)
|
||||||
|
{
|
||||||
|
if (attachment.IsAttachments)
|
||||||
|
attachment.Path = $"{baseUrl}/{attachment.Id}";
|
||||||
|
}
|
||||||
|
return mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(doculinkAttachments);
|
||||||
|
}
|
||||||
|
public async Task<(bool IsSuccess, Models.DoculinkAttachments DoculinkAttachments, string Path)> GetDownloadAttachmentAsync(int id)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Db.DoculinkAttachments Attachment = DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.Id == id).AsNoTracking().FirstOrDefault();
|
||||||
|
if (Attachment == null)
|
||||||
|
{
|
||||||
|
return (false, null, "Not Found");
|
||||||
|
}
|
||||||
|
return (true, mapper.Map<Db.DoculinkAttachments, Models.DoculinkAttachments>(Attachment), $"Attachment {id}");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
|
||||||
|
logger?.LogError(ex.ToString());
|
||||||
|
return (false, null, ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
|
public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -192,8 +235,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
item.titles = multilan.titles;
|
item.titles = multilan.titles;
|
||||||
item.description = multilan.description;
|
item.description = multilan.description;
|
||||||
item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
|
item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
|
||||||
item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
item.doclinksAttachments = GetDocumentAttachment(item.Id,language);
|
||||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
|
|
||||||
}
|
}
|
||||||
// List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
|
// List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
@ -228,8 +270,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
item.titles = multilan.titles;
|
item.titles = multilan.titles;
|
||||||
item.description = multilan.description;
|
item.description = multilan.description;
|
||||||
item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
|
item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
|
||||||
item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
item.doclinksAttachments = GetDocumentAttachment(item.Id, language);
|
||||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
|
|
||||||
}
|
}
|
||||||
//List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
|
//List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
@ -284,8 +325,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
|
result.documentsTranslations = mapper.Map<List<Db.DoculinkTranslation>, List<Models.DoculinkTranslation>>(
|
||||||
DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
|
DocumentDbContext.DocumentsTranslations.Where(a => a.DocumentId == result.Id).ToList());
|
||||||
|
|
||||||
result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
result.doclinksAttachments = GetDocumentAttachment(id, "");
|
||||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
|
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
}
|
}
|
||||||
return (false, null, "Not found");
|
return (false, null, "Not found");
|
||||||
@ -317,8 +357,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
|
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, language));
|
||||||
result.titles = multilan.titles;
|
result.titles = multilan.titles;
|
||||||
result.description = multilan.description;
|
result.description = multilan.description;
|
||||||
result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
result.doclinksAttachments = GetDocumentAttachment(id, language);
|
||||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
|
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
}
|
}
|
||||||
return (false, null, "Not found");
|
return (false, null, "Not found");
|
||||||
@ -349,7 +388,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, ""));
|
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(Document.linkTypeId, ""));
|
||||||
result.titles = multilan.titles;
|
result.titles = multilan.titles;
|
||||||
result.description = multilan.description;
|
result.description = multilan.description;
|
||||||
result.doclinksAttachments = Document.doclinksAttachments;
|
result.doclinksAttachments = GetDocumentAttachment(document.Id,"");
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@ -391,7 +430,7 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, ""));
|
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(document.linkTypeId, ""));
|
||||||
result.titles = multilan.titles;
|
result.titles = multilan.titles;
|
||||||
result.description = multilan.description;
|
result.description = multilan.description;
|
||||||
result.doclinksAttachments = Document.doclinksAttachments;
|
result.doclinksAttachments = GetDocumentAttachment(document.Id, "");
|
||||||
return (true, result, "Successful");
|
return (true, result, "Successful");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -414,6 +453,35 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
return (false, null, ex.Message);
|
return (false, null, ex.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> UpdateDocumentAsync(int id,bool isactive)
|
||||||
|
{
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Db.Doculink Document = DocumentDbContext.Documents.AsNoTracking().Where(a => a.Id == id).FirstOrDefault();
|
||||||
|
if (Document == null)
|
||||||
|
{
|
||||||
|
return (false, null, "Not Found");
|
||||||
|
}
|
||||||
|
Document.IsActive = isactive;
|
||||||
|
DocumentDbContext.Documents.Update(Document);
|
||||||
|
DocumentDbContext.SaveChanges();
|
||||||
|
var result = mapper.Map<Db.Doculink, Models.ResDoculink>(Document);
|
||||||
|
var multilan = CreateMultiLanguageObject(GetDocumentTranslations(Document.Id, ""));
|
||||||
|
result.titles = multilan.titles;
|
||||||
|
result.description = multilan.description;
|
||||||
|
result.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(result.linkTypeId, ""));
|
||||||
|
result.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||||
|
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == id).ToList());
|
||||||
|
return (true, result, $"DocumentId {id} deleted Successfuly");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
|
||||||
|
logger?.LogError(ex.ToString());
|
||||||
|
return (false, null, ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id)
|
public async Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> DeleteDocumentAsync(int id)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -25,6 +25,41 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
|
uploadpath = configuration.GetValue<string>("Fileupload:folderpath");
|
||||||
Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
|
Deletepath = configuration.GetValue<string>("Fileupload:Deletepath");
|
||||||
}
|
}
|
||||||
|
public async Task<string> GetFile(string path)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (System.IO.File.Exists(path))
|
||||||
|
{
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null; // File not found
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
// Handle or log the exception as needed
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
public async Task<byte[]> DownloadFile(string path)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (System.IO.File.Exists(path))
|
||||||
|
{
|
||||||
|
return await System.IO.File.ReadAllBytesAsync(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null; // File not found
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
// Handle or log the exception as needed
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
|
public Models.Doculink UploadDocument(int counter, ReqDoculink documentInfo)
|
||||||
{
|
{
|
||||||
@ -44,14 +79,14 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
counter++;
|
counter++;
|
||||||
if (item.IsAttachments)
|
if (item.IsAttachments)
|
||||||
{
|
{
|
||||||
UserfileName = Path.GetFileName(item.FileName);
|
UserfileName = Path.GetFileName(item.FileName + item.FileExtension);
|
||||||
var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
|
var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
|
||||||
path = Path.Combine(fullDirectoryPath, fileName);
|
path = Path.Combine(fullDirectoryPath, fileName);
|
||||||
File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
|
File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
path = item.url;
|
path = item.url;
|
||||||
attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
|
attachments.Add(new Models.DoculinkAttachments { docName=UserfileName,Path=path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
|
Documents=new Models.Doculink (){ linkTypeId = documentInfo.linkTypeId,
|
||||||
@ -85,14 +120,14 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
|||||||
counter++;
|
counter++;
|
||||||
if (item.IsAttachments)
|
if (item.IsAttachments)
|
||||||
{
|
{
|
||||||
UserfileName = Path.GetFileName(item.FileName);
|
UserfileName = Path.GetFileName(item.FileName+item.FileExtension);
|
||||||
var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
|
var fileName = String.Format("Document_{0}{1}", counter, item.FileExtension);
|
||||||
path = Path.Combine(fullDirectoryPath, fileName);
|
path = Path.Combine(fullDirectoryPath, fileName);
|
||||||
File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
|
File.WriteAllBytes(path, Convert.FromBase64String(item.FileContent));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
path = item.url;
|
path = item.url;
|
||||||
attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder });
|
attachments.Add(new Models.DoculinkAttachments { docName = UserfileName, Path = path,IsAttachments=item.IsAttachments,CustomOrder=item.CustomOrder,Language=item.Language });
|
||||||
}
|
}
|
||||||
Models.Doculink Documents = new Models.Doculink()
|
Models.Doculink Documents = new Models.Doculink()
|
||||||
{
|
{
|
||||||
|
@ -77,7 +77,8 @@ namespace DamageAssesment.Api.Employees.Providers
|
|||||||
EmployeeDbContext.Employees.Add(_employee);
|
EmployeeDbContext.Employees.Add(_employee);
|
||||||
Employee.Id = _employee.Id;
|
Employee.Id = _employee.Id;
|
||||||
EmployeeDbContext.SaveChanges();
|
EmployeeDbContext.SaveChanges();
|
||||||
return (true, Employee, null);
|
//return (true, Employee, null);
|
||||||
|
return (true, mapper.Map<Db.Employee, Models.Employee>(_employee), null);
|
||||||
}
|
}
|
||||||
return (false, null, "Employee code is already exits");
|
return (false, null, "Employee code is already exits");
|
||||||
}
|
}
|
||||||
|
@ -20,6 +20,10 @@ namespace DamageAssesment.Api.Locations.Db
|
|||||||
|
|
||||||
[StringLength(2)]
|
[StringLength(2)]
|
||||||
public string SchoolType { 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; }
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -11,5 +11,9 @@ namespace DamageAssesment.Api.Locations.Models
|
|||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public string MaintenanceCenter { get; set; }
|
public string MaintenanceCenter { get; set; }
|
||||||
public string SchoolType { 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.locationDbContext = locationDbContext;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.mapper = mapper;
|
this.mapper = mapper;
|
||||||
// SeedData();
|
// SeedData();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(bool IsSuccess, IEnumerable<Models.Location> Locations, string ErrorMessage)> GetLocationsAsync()
|
public async Task<(bool IsSuccess, IEnumerable<Models.Location> Locations, string ErrorMessage)> GetLocationsAsync()
|
||||||
@ -28,6 +28,8 @@ namespace DamageAssesment.Api.Locations.Providers
|
|||||||
var locations = await locationDbContext.Locations.AsNoTracking().ToListAsync();
|
var locations = await locationDbContext.Locations.AsNoTracking().ToListAsync();
|
||||||
if (locations != null)
|
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");
|
logger?.LogInformation($"{locations.Count} Locations(s) found");
|
||||||
var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(locations);
|
var result = mapper.Map<IEnumerable<Db.Location>, IEnumerable<Models.Location>>(locations);
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
@ -46,9 +48,12 @@ namespace DamageAssesment.Api.Locations.Providers
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger?.LogInformation("Query Location");
|
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);
|
var location = await locationDbContext.Locations.AsNoTracking().FirstOrDefaultAsync(q => q.Id == Id);
|
||||||
if (location != null)
|
if (location != null)
|
||||||
{
|
{if(maxenrollment>0)
|
||||||
|
location.DataValue = GetHeatmapdata(location.Enrollment, maxenrollment);
|
||||||
logger?.LogInformation($"{location} found");
|
logger?.LogInformation($"{location} found");
|
||||||
var result = mapper.Map<Db.Location, Models.Location>(location);
|
var result = mapper.Map<Db.Location, Models.Location>(location);
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
@ -61,6 +66,10 @@ namespace DamageAssesment.Api.Locations.Providers
|
|||||||
return (false, null, ex.Message);
|
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)
|
public async Task<(bool IsSuccess, Models.Location Location, string ErrorMessage)> PostLocationAsync(Models.Location location)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@ -139,9 +148,9 @@ namespace DamageAssesment.Api.Locations.Providers
|
|||||||
{
|
{
|
||||||
if (!locationDbContext.Locations.Any())
|
if (!locationDbContext.Locations.Any())
|
||||||
{
|
{
|
||||||
locationDbContext.Locations.Add(new Db.Location() { LocationCode = "0091", RegionId = 5, Name = "BOB GRAHAM EDUCATION CENTER", MaintenanceCenter = "1", SchoolType = "K8" });
|
locationDbContext.Locations.Add(new Db.Location() { LocationCode = "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" });
|
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" });
|
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 = 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 = 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 = 5, LocationCode = "Loc5", RegionId = 2, Name = "BOB GRAHAM EDUCATION CENTER 5", MaintenanceCenter = "1", SchoolType = "US" });
|
||||||
|
@ -89,6 +89,26 @@ namespace DamageAssesment.Api.Questions.Controllers
|
|||||||
return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
|
return CreatedAtRoute("DefaultApi", new { id = question.Id }, question);
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
/// POST request for creating a multiple question (multilingual).
|
||||||
|
/// </summary>
|
||||||
|
[HttpPost("questions/multiple")]
|
||||||
|
public async Task<IActionResult> CreateQuestions(List<Models.Question> questions)
|
||||||
|
{
|
||||||
|
if (questions != null)
|
||||||
|
{
|
||||||
|
var result = await this.questionsProvider.PostQuestionsAsync(questions);
|
||||||
|
if (result.IsSuccess)
|
||||||
|
{
|
||||||
|
return Ok(result.Question);
|
||||||
|
}
|
||||||
|
if (result.ErrorMessage == "Not Found")
|
||||||
|
return NotFound(result.ErrorMessage);
|
||||||
|
|
||||||
|
return BadRequest(result.ErrorMessage);
|
||||||
|
}
|
||||||
|
return CreatedAtRoute("DefaultApi",questions);
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
/// POST request for creating a new question (multilingual).
|
/// POST request for creating a new question (multilingual).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
||||||
|
@ -8,6 +8,7 @@ namespace DamageAssesment.Api.Questions.Interfaces
|
|||||||
Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language);
|
Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Questions, string ErrorMessage)> GetQuestionsAsync(string language);
|
||||||
Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string language);
|
Task<(bool IsSuccess, List<SurveyQuestions> SurveyQuestions, string ErrorMessage)> GetSurveyQuestionAsync(int surveyId,string language);
|
||||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
|
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> PostQuestionAsync(Models.Question Question);
|
||||||
|
Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions);
|
||||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
|
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question);
|
||||||
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id);
|
Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> DeleteQuestionAsync(int id);
|
||||||
|
|
||||||
|
@ -239,16 +239,7 @@ namespace DamageAssesment.Api.Questions.Providers
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
logger?.LogInformation("Query Question");
|
logger?.LogInformation("Query Question");
|
||||||
var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
|
var result = InsertQuestion(Question);
|
||||||
var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
|
|
||||||
dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
|
|
||||||
questionDbContext.Questions.Add(dbquestion);
|
|
||||||
dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
|
|
||||||
questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
|
|
||||||
questionDbContext.SaveChanges();
|
|
||||||
Question.Id = dbquestion.Id;
|
|
||||||
var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
|
|
||||||
result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id,""));
|
|
||||||
return (true, result, null);
|
return (true, result, null);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@ -257,6 +248,39 @@ namespace DamageAssesment.Api.Questions.Providers
|
|||||||
return (false, null, ex.Message);
|
return (false, null, ex.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private Models.MultiLanguage InsertQuestion(Models.Question Question)
|
||||||
|
{
|
||||||
|
var dbquestion = mapper.Map<Models.Question, Db.Question>(Question);
|
||||||
|
var dbquestiontranslation = mapper.Map<List<Models.QuestionsTranslation>, List<Db.QuestionsTranslation>>(Question.Questions);
|
||||||
|
dbquestion.QuestionTypeId = questionDbContext.QuestionTypes.Where(a => a.TypeText == Question.TypeText).Select(a => a.Id).FirstOrDefault();
|
||||||
|
questionDbContext.Questions.Add(dbquestion);
|
||||||
|
questionDbContext.SaveChanges();
|
||||||
|
dbquestiontranslation.ForEach(i => i.QuestionId = dbquestion.Id);
|
||||||
|
questionDbContext.QuestionsTranslations.AddRange(dbquestiontranslation);
|
||||||
|
questionDbContext.SaveChanges();
|
||||||
|
Question.Id = dbquestion.Id;
|
||||||
|
var result = mapper.Map<Db.Question, Models.MultiLanguage>(dbquestion);
|
||||||
|
result.Text = CreateMultiLanguageObject(GetQuestionsTranslations(result.Id, ""));
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
public async Task<(bool IsSuccess, IEnumerable<Models.MultiLanguage> Question, string ErrorMessage)> PostQuestionsAsync(List<Models.Question> Questions)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
List<Models.MultiLanguage> results = new List<MultiLanguage>();
|
||||||
|
logger?.LogInformation("Query Question");
|
||||||
|
foreach (Models.Question Question in Questions)
|
||||||
|
{
|
||||||
|
results.Add(InsertQuestion(Question));
|
||||||
|
}
|
||||||
|
return (true, results, null);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger?.LogError(ex.ToString());
|
||||||
|
return (false, null, ex.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
|
public async Task<(bool IsSuccess, Models.MultiLanguage Question, string ErrorMessage)> UpdateQuestionAsync(Models.Question Question)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
|
@ -75,8 +75,19 @@ namespace DamageAssesment.Api.Questions.Test
|
|||||||
return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1};
|
return new Questions.Models.Question { Id = 1, Questions=QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId=1};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
public static async Task<List<Questions.Models.Question>> getInputQuestionsData()
|
||||||
|
{
|
||||||
|
Models.QuestionsTranslation QuestionsTranslation = new Models.QuestionsTranslation()
|
||||||
|
{
|
||||||
|
Language = "en",
|
||||||
|
QuestionText = "Sample question"
|
||||||
|
};
|
||||||
|
List<Models.QuestionsTranslation> QuestionsTranslations = new List<Models.QuestionsTranslation>();
|
||||||
|
List<Models.Question> Questions = new List<Models.Question>();
|
||||||
|
QuestionsTranslations.Add(QuestionsTranslation);
|
||||||
|
Questions.Models.Question question = new Questions.Models.Question() { Id = 1, Questions = QuestionsTranslations, TypeText = "Text 1", SurveyId = 1, QuestionNumber = 1, IsRequired = true, Comment = false, Key = true, CategoryId = 1 };
|
||||||
|
Questions.Add(question);
|
||||||
|
return Questions;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -110,6 +110,33 @@ namespace DamageAssesment.Api.Questions.Test
|
|||||||
|
|
||||||
Assert.Equal(400, result.StatusCode);
|
Assert.Equal(400, result.StatusCode);
|
||||||
}
|
}
|
||||||
|
[Fact(DisplayName = "Post Questions - Ok case")]
|
||||||
|
public async Task PostQuestionsAsync_ShouldReturnStatusCode200()
|
||||||
|
{
|
||||||
|
var mockQuestionService = new Mock<IQuestionsProvider>();
|
||||||
|
var mockResponse = await MockData.getOkResponse();
|
||||||
|
var mockInputQuestion = await MockData.getInputQuestionsData();
|
||||||
|
mockQuestionService.Setup(service => service.PostQuestionsAsync(mockInputQuestion)).ReturnsAsync(mockResponse);
|
||||||
|
|
||||||
|
var QuestionProvider = new QuestionsController(mockQuestionService.Object);
|
||||||
|
var result = (OkObjectResult)await QuestionProvider.CreateQuestions(mockInputQuestion);
|
||||||
|
|
||||||
|
Assert.Equal(200, result.StatusCode);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact(DisplayName = "Post Questions - BadRequest case")]
|
||||||
|
public async Task PostQuestionsAsync_ShouldReturnStatusCode400()
|
||||||
|
{
|
||||||
|
var mockQuestionService = new Mock<IQuestionsProvider>();
|
||||||
|
var mockInputQuestion = await MockData.getInputQuestionData();
|
||||||
|
var mockResponse = await MockData.getBadRequestResponse();
|
||||||
|
mockQuestionService.Setup(service => service.UpdateQuestionAsync(mockInputQuestion)).ReturnsAsync(mockResponse);
|
||||||
|
|
||||||
|
var QuestionProvider = new QuestionsController(mockQuestionService.Object);
|
||||||
|
var result = (BadRequestObjectResult)await QuestionProvider.UpdateQuestion(mockInputQuestion);
|
||||||
|
|
||||||
|
Assert.Equal(400, result.StatusCode);
|
||||||
|
}
|
||||||
|
|
||||||
[Fact(DisplayName = "Put Question - Ok case")]
|
[Fact(DisplayName = "Put Question - Ok case")]
|
||||||
public async Task PutQuestionAsync_ShouldReturnStatusCode200()
|
public async Task PutQuestionAsync_ShouldReturnStatusCode200()
|
||||||
|
@ -8,5 +8,9 @@
|
|||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public string MaintenanceCenter { get; set; }
|
public string MaintenanceCenter { get; set; }
|
||||||
public string SchoolType { 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; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -512,17 +512,19 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
var allQuestions = await questionServiceProvider.getQuestionsAsync(null);
|
var allQuestions = await questionServiceProvider.getQuestionsAsync(null);
|
||||||
var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
|
var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
|
||||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||||
|
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||||
var result = new
|
var location = Locations.Where(a => a.Id == surveyResponse.LocationId).FirstOrDefault();
|
||||||
{
|
var result = new{
|
||||||
surveyResponse.Id,
|
surveyResponse.Id,
|
||||||
surveyResponse.SurveyId,
|
surveyResponse.SurveyId,
|
||||||
surveyResponse.LocationId,
|
surveyResponse.LocationId,
|
||||||
surveyResponse.EmployeeId,
|
surveyResponse.EmployeeId,
|
||||||
surveyResponse.ClientDevice,
|
surveyResponse.ClientDevice,
|
||||||
surveyResponse.KeyAnswerResult,
|
surveyResponse.KeyAnswerResult,
|
||||||
surveyResponse.Longitute,
|
DataValue=(location!=null?location.DataValue:0),
|
||||||
surveyResponse.Latitude,
|
Enrollment= (location != null ? location.Enrollment : 0),
|
||||||
|
Longitute = (location != null ? location.Longitute : surveyResponse.Longitute),
|
||||||
|
Latitude=(location != null ? location.Latitude : surveyResponse.Latitude),
|
||||||
Employee = employee,
|
Employee = employee,
|
||||||
answers = from ans in answers
|
answers = from ans in answers
|
||||||
select new
|
select new
|
||||||
@ -566,6 +568,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
|
|
||||||
var answers = await answerServiceProvider.getAnswersAsync();
|
var answers = await answerServiceProvider.getAnswersAsync();
|
||||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||||
|
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||||
var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
|
var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
|
||||||
|
|
||||||
//var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId);
|
//var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId);
|
||||||
@ -575,6 +578,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
if (employeeid == 0)
|
if (employeeid == 0)
|
||||||
{
|
{
|
||||||
var result = from r in surveyResonses
|
var result = from r in surveyResonses
|
||||||
|
join loc in Locations on r.LocationId equals loc.Id
|
||||||
select new
|
select new
|
||||||
{
|
{
|
||||||
r.Id,
|
r.Id,
|
||||||
@ -583,8 +587,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
r.EmployeeId,
|
r.EmployeeId,
|
||||||
r.ClientDevice,
|
r.ClientDevice,
|
||||||
r.KeyAnswerResult,
|
r.KeyAnswerResult,
|
||||||
r.Longitute,
|
loc.DataValue,
|
||||||
r.Latitude,
|
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(),
|
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
|
answers = from ans in answers
|
||||||
where ans.SurveyResponseId == r.Id
|
where ans.SurveyResponseId == r.Id
|
||||||
@ -609,6 +615,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
_employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
|
_employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
|
||||||
}
|
}
|
||||||
var result = from r in surveyResonses
|
var result = from r in surveyResonses
|
||||||
|
join loc in Locations on r.LocationId equals loc.Id
|
||||||
select new
|
select new
|
||||||
{
|
{
|
||||||
r.Id,
|
r.Id,
|
||||||
@ -617,8 +624,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
r.EmployeeId,
|
r.EmployeeId,
|
||||||
r.ClientDevice,
|
r.ClientDevice,
|
||||||
r.KeyAnswerResult,
|
r.KeyAnswerResult,
|
||||||
r.Longitute,
|
loc.DataValue,
|
||||||
r.Latitude,
|
loc.Enrollment,
|
||||||
|
loc.Longitute,
|
||||||
|
loc.Latitude,
|
||||||
Employee = _employee,
|
Employee = _employee,
|
||||||
answers = from ans in answers
|
answers = from ans in answers
|
||||||
where ans.SurveyResponseId == r.Id
|
where ans.SurveyResponseId == r.Id
|
||||||
@ -674,7 +683,9 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||||
|
|
||||||
|
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||||
var result = from r in surveyResonses
|
var result = from r in surveyResonses
|
||||||
|
join loc in Locations on r.LocationId equals loc.Id
|
||||||
select new
|
select new
|
||||||
{
|
{
|
||||||
r.Id,
|
r.Id,
|
||||||
@ -683,8 +694,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
r.EmployeeId,
|
r.EmployeeId,
|
||||||
r.ClientDevice,
|
r.ClientDevice,
|
||||||
r.KeyAnswerResult,
|
r.KeyAnswerResult,
|
||||||
r.Longitute,
|
loc.DataValue,
|
||||||
r.Latitude,
|
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(),
|
Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||||
answers = from ans in answers
|
answers = from ans in answers
|
||||||
where ans.SurveyResponseId == r.Id
|
where ans.SurveyResponseId == r.Id
|
||||||
@ -938,7 +951,9 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
|
var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
|
||||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||||
|
|
||||||
|
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||||
var result = from r in surveyResonses
|
var result = from r in surveyResonses
|
||||||
|
join loc in Locations on r.LocationId equals loc.Id
|
||||||
select new
|
select new
|
||||||
{
|
{
|
||||||
r.Id,
|
r.Id,
|
||||||
@ -947,8 +962,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
r.EmployeeId,
|
r.EmployeeId,
|
||||||
r.ClientDevice,
|
r.ClientDevice,
|
||||||
r.KeyAnswerResult,
|
r.KeyAnswerResult,
|
||||||
r.Longitute,
|
loc.DataValue,
|
||||||
r.Latitude,
|
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(),
|
Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||||
answers = from ans in answers
|
answers = from ans in answers
|
||||||
where ans.SurveyResponseId == r.Id
|
where ans.SurveyResponseId == r.Id
|
||||||
@ -1004,8 +1021,9 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
// var employees = await employeeServiceProvider.getEmployeesAsync();
|
// var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||||
var answers = await answerServiceProvider.getAnswersAsync();
|
var answers = await answerServiceProvider.getAnswersAsync();
|
||||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||||
|
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||||
var result = from r in surveyResponses
|
var result = from r in surveyResponses
|
||||||
|
join loc in Locations on r.LocationId equals loc.Id
|
||||||
select new
|
select new
|
||||||
{
|
{
|
||||||
r.Id,
|
r.Id,
|
||||||
@ -1014,8 +1032,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
|||||||
r.EmployeeId,
|
r.EmployeeId,
|
||||||
r.ClientDevice,
|
r.ClientDevice,
|
||||||
r.KeyAnswerResult,
|
r.KeyAnswerResult,
|
||||||
r.Longitute,
|
loc.DataValue,
|
||||||
r.Latitude,
|
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(),
|
Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||||
answers = from ans in answers
|
answers = from ans in answers
|
||||||
where ans.SurveyResponseId == r.Id
|
where ans.SurveyResponseId == r.Id
|
||||||
|
Loading…
Reference in New Issue
Block a user