From de4d62ba78dc59ed2c288a066def7393b414be67 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Mon, 1 Sep 2025 20:56:25 +0530 Subject: [PATCH] added tags in documents details API --- .../DocumentManager/DocumentAttachmentDetailsVM.cs | 4 +++- .../ViewModels/DocumentManager/DocumentListVM.cs | 1 + Marco.Pms.Services/Controllers/DocumentController.cs | 12 ++++++++++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Marco.Pms.Model/ViewModels/DocumentManager/DocumentAttachmentDetailsVM.cs b/Marco.Pms.Model/ViewModels/DocumentManager/DocumentAttachmentDetailsVM.cs index 26d3e78..38806ec 100644 --- a/Marco.Pms.Model/ViewModels/DocumentManager/DocumentAttachmentDetailsVM.cs +++ b/Marco.Pms.Model/ViewModels/DocumentManager/DocumentAttachmentDetailsVM.cs @@ -1,4 +1,5 @@ -using Marco.Pms.Model.ViewModels.Activities; +using Marco.Pms.Model.Dtos.DocumentManager; +using Marco.Pms.Model.ViewModels.Activities; namespace Marco.Pms.Model.ViewModels.DocumentManager { @@ -20,6 +21,7 @@ namespace Marco.Pms.Model.ViewModels.DocumentManager public BasicEmployeeVM? VerifiedBy { get; set; } public Guid EntityId { get; set; } public DocumentTypeVM? DocumentType { get; set; } + public List? Tags { get; set; } public bool IsActive { get; set; } = true; } } diff --git a/Marco.Pms.Model/ViewModels/DocumentManager/DocumentListVM.cs b/Marco.Pms.Model/ViewModels/DocumentManager/DocumentListVM.cs index b27358c..32646f9 100644 --- a/Marco.Pms.Model/ViewModels/DocumentManager/DocumentListVM.cs +++ b/Marco.Pms.Model/ViewModels/DocumentManager/DocumentListVM.cs @@ -10,6 +10,7 @@ namespace Marco.Pms.Model.ViewModels.DocumentManager public string? Description { get; set; } public DateTime UploadedAt { get; set; } public Guid? ParentAttachmentId { get; set; } + public bool IsCurrentVersion { get; set; } public int Version { get; set; } public bool IsActive { get; set; } public bool? IsVerified { get; set; } diff --git a/Marco.Pms.Services/Controllers/DocumentController.cs b/Marco.Pms.Services/Controllers/DocumentController.cs index 0779a38..ed71155 100644 --- a/Marco.Pms.Services/Controllers/DocumentController.cs +++ b/Marco.Pms.Services/Controllers/DocumentController.cs @@ -273,12 +273,20 @@ namespace Marco.Pms.Services.Controllers loggedInEmployee.Id, versionMapping.ChildAttachment.EntityId); return StatusCode(403, ApiResponse.ErrorResponse("Access Denied.", "You do not have permission to view documents", 403)); } - + var tags = await _context.AttachmentTagMappings + .Include(at => at.DocumentTag) + .Where(at => at.AttachmentId == versionMapping.ChildAttachmentId && at.TenantId == tenantId && at.DocumentTag != null) + .Select(at => new DocumentTagDto + { + Name = at.DocumentTag!.Name, + IsActive = true + }) + .ToListAsync(); // Map the domain entity to the view model var documentAttachmentVM = _mapper.Map(versionMapping.ChildAttachment); documentAttachmentVM.Version = versionMapping.Version; documentAttachmentVM.ParentAttachmentId = versionMapping.ParentAttachmentId; - + documentAttachmentVM.Tags = tags; _logger.LogInfo("Document details fetched successfully for AttachmentId: {AttachmentId}", id); // Return success response with document details