forked from MDCPS/DamageAssessment_Backend
updated latest changes from dev
This commit is contained in:
@ -136,7 +136,21 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get all active Doculink.
|
||||
/// </summary>
|
||||
[Route("doculinks/active/{linktypeid:int}")]
|
||||
[Route("doculinks/active/{linktypeid:int}/{language:alpha}")]
|
||||
[HttpGet]
|
||||
public async Task<IActionResult> GetDocumentsByActiveLinkTypeIdAsync(int? linktypeid, string? language)
|
||||
{
|
||||
var result = await this.documentsProvider.GetdocumentsByLinkTypeIdAsync(linktypeid, language, true);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.documents);
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
/// <summary>
|
||||
/// Get a Doculink by id.
|
||||
/// </summary>
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("Doculinks")]
|
||||
public class Doculink
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkAttachments")]
|
||||
public class DoculinkAttachments
|
||||
{
|
||||
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTrans")]
|
||||
public class DoculinkTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -1,7 +1,9 @@
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.ComponentModel.DataAnnotations.Schema;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTypes")]
|
||||
public class LinkType
|
||||
{
|
||||
[Key]
|
||||
|
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Db
|
||||
{
|
||||
[Table("DoculinkTypeTrans")]
|
||||
public class LinksTranslation
|
||||
{
|
||||
[Key]
|
||||
|
@ -7,7 +7,8 @@ namespace DamageAssesment.Api.DocuLinks.Interfaces
|
||||
Task<(bool IsSuccess, Models.ResDoculink Document, string ErrorMessage)> GetDocumentAsync(int id, string? linktype, string? language);
|
||||
Task<(bool IsSuccess, Models.Doculink Document, string ErrorMessage)> GetDocumentByidAsync(int id);
|
||||
// Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetDocumnetsAsync(string? language);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive);
|
||||
Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> 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)> DeleteDocumentAsync(int id);
|
||||
|
@ -7,6 +7,11 @@ namespace DamageAssesment.Api.DocuLinks.Models
|
||||
{
|
||||
public List<DoculinkTranslation> documentsTranslations { get; set; }
|
||||
}
|
||||
public class ResDoculinks
|
||||
{
|
||||
public int linkTypeId { get; set; }
|
||||
public List<ResDoculink> doculinks { get; set; }
|
||||
}
|
||||
public class ResDoculink:BaseDoculink
|
||||
{
|
||||
public object titles { get; set; }
|
||||
|
@ -6,8 +6,10 @@ using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Metadata.Internal;
|
||||
using System;
|
||||
using System.Collections.Immutable;
|
||||
using System.Diagnostics.Eventing.Reader;
|
||||
using System.Reflection.Metadata;
|
||||
using System.Xml;
|
||||
using System.Xml.Linq;
|
||||
|
||||
namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
@ -63,13 +65,20 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
int counter = 0;
|
||||
for (int i = 1; i <= 4; i++)
|
||||
{
|
||||
FileModel fileModel = new FileModel() { url = "www.google"+i+".com", IsAttachments = false, CustomOrder = 1 };
|
||||
ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i,CustomOrder=i, Files = new List<FileModel>() { fileModel } };
|
||||
Db.DoculinkTranslation documents = new Db.DoculinkTranslation { DocumentId = i, title = "Test"+i, description = "ss"+i, Language = "en" };
|
||||
int linkTypeId = 2;
|
||||
FileModel fileModel = new FileModel();
|
||||
if (i < 3)
|
||||
{
|
||||
linkTypeId = 1;
|
||||
|
||||
fileModel = new FileModel() { FileName = "Sample" + i, FileExtension = ".txt", FileContent = "c2FtcGxl", IsAttachments = true, CustomOrder = 1 };
|
||||
}
|
||||
else
|
||||
fileModel = new FileModel() { url = "www.google" + i + ".com", IsAttachments = false, CustomOrder = 1 };
|
||||
ReqDoculink documentInfo = new ReqDoculink() { linkTypeId = i, CustomOrder = i, Files = new List<FileModel>() { fileModel } };
|
||||
Models.Doculink document = uploadservice.UploadDocument(counter, documentInfo);
|
||||
DocumentDbContext.Documents.Add(mapper.Map<Models.Doculink, Db.Doculink>(document));
|
||||
DocumentDbContext.SaveChanges();
|
||||
DocumentDbContext.DocumentsTranslations.AddRange(documents);
|
||||
var dbattachments = mapper.Map<List<Models.DoculinkAttachments>, List<Db.DoculinkAttachments>>(document.doclinksAttachments);
|
||||
dbattachments.ForEach(a => a.DocumentId = i);
|
||||
DocumentDbContext.DoclinksAttachments.AddRange(dbattachments);
|
||||
@ -77,6 +86,34 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
counter++;
|
||||
}
|
||||
}
|
||||
if (!DocumentDbContext.DocumentsTranslations.Any())
|
||||
{
|
||||
string[] titles = {
|
||||
"Mobile App Damage Assessment Instructions",
|
||||
"PC Damage Assessment Instructions",
|
||||
"Emergency Evacuation centers",
|
||||
"Mobile App Damage Assessment Instructions" };
|
||||
string[] esTranslations = {
|
||||
"Instrucciones de Evaluación de Daños de la Aplicación Móvil",
|
||||
"Instrucciones de Evaluación de Daños del PC",
|
||||
"Centros de Evacuación de Emergencia",
|
||||
"Instrucciones de Evaluación de Daños de la Aplicación Móvil" };
|
||||
string[] frTranslations = {
|
||||
"Instructions d'Évaluation des Dommages de l'Application Mobile",
|
||||
"Instructions d'Évaluation des Dommages du PC",
|
||||
"Centres d'Évacuation d'Urgence",
|
||||
"Instructions d'Évaluation des Dommages de l'Application Mobile" };
|
||||
List<Db.DoculinkTranslation> documents = new List<Db.DoculinkTranslation>();
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = titles[i], description = titles[i], Language = "en" });
|
||||
documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = esTranslations[i], description = esTranslations[i], Language = "es" });
|
||||
documents.Add(new Db.DoculinkTranslation { DocumentId = i + 1, title = frTranslations[i], description = frTranslations[i], Language = "fr" });
|
||||
}
|
||||
DocumentDbContext.DocumentsTranslations.AddRange(documents);
|
||||
DocumentDbContext.SaveChanges();
|
||||
}
|
||||
|
||||
}
|
||||
public List<Models.DoculinkTranslation> GetDocumentTranslations(int id, string? language)
|
||||
{
|
||||
@ -133,7 +170,44 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
MultiLanguage = dicttitle;
|
||||
return MultiLanguage;
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculink> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
|
||||
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkTypeIdAsync(int? linkTypeId, string? language, bool? isactive)
|
||||
{
|
||||
|
||||
try
|
||||
{
|
||||
logger?.LogInformation("Query Question");
|
||||
var documents = new List<Db.Doculink>();
|
||||
if (linkTypeId==null)
|
||||
documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value)).ToListAsync();
|
||||
else
|
||||
documents = await DocumentDbContext.Documents.AsNoTracking().Where(q => (isactive == null || q.IsActive == isactive.Value) &&
|
||||
q.linkTypeId == linkTypeId.Value).ToListAsync();
|
||||
if (documents != null)
|
||||
{
|
||||
var result = mapper.Map<List<Db.Doculink>, List<Models.ResDoculink>>(documents);
|
||||
foreach (var item in result)
|
||||
{
|
||||
var multilan = CreateMultiLanguageObject(GetDocumentTranslations(item.Id, language));
|
||||
item.titles = multilan.titles;
|
||||
item.description = multilan.description;
|
||||
item.linktypes = CreateMultiLanguageLinkTypeObject(GetLinkTypeTranslations(item.linkTypeId, language));
|
||||
item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
|
||||
}
|
||||
List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
|
||||
return (true, doculinks, null);
|
||||
}
|
||||
return (false, null, "Not found");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
logger?.LogError(ex.ToString());
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
|
||||
}
|
||||
public async Task<(bool IsSuccess, IEnumerable<Models.ResDoculinks> documents, string ErrorMessage)> GetdocumentsByLinkAsync(string? linkType, string? language, bool? isactive)
|
||||
{
|
||||
|
||||
try
|
||||
@ -157,7 +231,8 @@ namespace DamageAssesment.Api.DocuLinks.Providers
|
||||
item.doclinksAttachments = mapper.Map<List<Db.DoculinkAttachments>, List<Models.DoculinkAttachments>>(
|
||||
DocumentDbContext.DoclinksAttachments.AsNoTracking().Where(a => a.DocumentId == item.Id).ToList());
|
||||
}
|
||||
return (true, result, null);
|
||||
List<ResDoculinks> doculinks = result.GroupBy(a => a.linkTypeId).Select(a => new ResDoculinks() { linkTypeId = a.Key, doculinks = a.ToList() }).ToList();
|
||||
return (true, doculinks, null);
|
||||
}
|
||||
return (false, null, "Not found");
|
||||
}
|
||||
|
@ -1,8 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user