diff --git a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs index 20250a2..21c656c 100644 --- a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs +++ b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs @@ -86,6 +86,7 @@ namespace Marco.Pms.DataAccess.Data public DbSet MailLogs { get; set; } + protected override void OnModelCreating(ModelBuilder modelBuilder) { base.OnModelCreating(modelBuilder); diff --git a/Marco.Pms.DataAccess/Migrations/20250514103249_Added_Directory_Related_Tables.cs b/Marco.Pms.DataAccess/Migrations/20250514103249_Added_Directory_Related_Tables.cs index 3dc4b68..7ef6da4 100644 --- a/Marco.Pms.DataAccess/Migrations/20250514103249_Added_Directory_Related_Tables.cs +++ b/Marco.Pms.DataAccess/Migrations/20250514103249_Added_Directory_Related_Tables.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable diff --git a/Marco.Pms.Model/Mapper/DirectoryMapper.cs b/Marco.Pms.Model/Mapper/DirectoryMapper.cs index 4732542..381c4b0 100644 --- a/Marco.Pms.Model/Mapper/DirectoryMapper.cs +++ b/Marco.Pms.Model/Mapper/DirectoryMapper.cs @@ -234,7 +234,8 @@ namespace Marco.Pms.Model.Mapper Note = note.Note, ContactId = note.ContactId, CreatedAt = note.CreatedAt, - CreatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null + CreatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null, + IsActive = note.IsActive }; } } diff --git a/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs b/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs index c3ca209..c00b0de 100644 --- a/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs +++ b/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs @@ -11,5 +11,6 @@ namespace Marco.Pms.Model.ViewModels.Directory public DateTime? UpdatedAt { get; set; } public BasicEmployeeVM? UpdatedBy { get; set; } public Guid ContactId { get; set; } + public bool IsActive { get; set; } } } diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs index 69b0b5d..90380ac 100644 --- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs +++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs @@ -697,7 +697,7 @@ namespace Marco.Pms.Services.Helpers try { - await _context.SaveChangesAsync(); + await _context.SaveChangesAsync(); } catch (DbUpdateException dbEx) { @@ -847,7 +847,7 @@ namespace Marco.Pms.Services.Helpers if (notes.Any()) { List? noteIds = notes.Select(n => n.Id).ToList(); - List? noteUpdateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.Id)).OrderByDescending(l => l.UpdateAt).ToListAsync(); + List? noteUpdateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.RefereanceId)).OrderByDescending(l => l.UpdateAt).ToListAsync(); List? noteVMs = new List(); foreach (var note in notes) { @@ -1034,10 +1034,6 @@ namespace Marco.Pms.Services.Helpers return ApiResponse.SuccessResponse(new { }, "Note deleted successfully", 200); } - - - - // -------------------------------- Bucket -------------------------------- public async Task> GetBucketList()