admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

resloved rebase conflicts

Browse Source
This commit is contained in:
ashutosh.nehete 2025-05-31 18:58:20 +05:30
commit 4282966afd
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
View File

@ -86,6 +86,7 @@ namespace Marco.Pms.DataAccess.Data
public DbSet<MailLog> MailLogs { get; set; } public DbSet<MailLog> MailLogs { get; set; }
protected override void OnModelCreating(ModelBuilder modelBuilder) protected override void OnModelCreating(ModelBuilder modelBuilder)
{ {
base.OnModelCreating(modelBuilder); base.OnModelCreating(modelBuilder);

3
Marco.Pms.DataAccess/Migrations/20250514103249_Added_Directory_Related_Tables.cs
View File

@ -1,5 +1,4 @@
using System; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable #nullable disable

3
Marco.Pms.Model/Mapper/DirectoryMapper.cs
View File

@ -234,7 +234,8 @@ namespace Marco.Pms.Model.Mapper
Note = note.Note, Note = note.Note,
ContactId = note.ContactId, ContactId = note.ContactId,
CreatedAt = note.CreatedAt, CreatedAt = note.CreatedAt,
CreatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null CreatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null,
IsActive = note.IsActive
}; };
} }
} }

1
Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs
View File

@ -11,5 +11,6 @@ namespace Marco.Pms.Model.ViewModels.Directory
public DateTime? UpdatedAt { get; set; } public DateTime? UpdatedAt { get; set; }
public BasicEmployeeVM? UpdatedBy { get; set; } public BasicEmployeeVM? UpdatedBy { get; set; }
public Guid ContactId { get; set; } public Guid ContactId { get; set; }
public bool IsActive { get; set; }
} }
} }

8
Marco.Pms.Services/Helpers/DirectoryHelper.cs
View File

@ -697,7 +697,7 @@ namespace Marco.Pms.Services.Helpers
try try
{ {
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
} }
catch (DbUpdateException dbEx) catch (DbUpdateException dbEx)
{ {
@ -847,7 +847,7 @@ namespace Marco.Pms.Services.Helpers
if (notes.Any()) if (notes.Any())
{ {
List<Guid>? noteIds = notes.Select(n => n.Id).ToList(); List<Guid>? noteIds = notes.Select(n => n.Id).ToList();
List<DirectoryUpdateLog>? noteUpdateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.Id)).OrderByDescending(l => l.UpdateAt).ToListAsync(); List<DirectoryUpdateLog>? noteUpdateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.RefereanceId)).OrderByDescending(l => l.UpdateAt).ToListAsync();
List<ContactNoteVM>? noteVMs = new List<ContactNoteVM>(); List<ContactNoteVM>? noteVMs = new List<ContactNoteVM>();
foreach (var note in notes) foreach (var note in notes)
{ {
@ -1034,10 +1034,6 @@ namespace Marco.Pms.Services.Helpers
return ApiResponse<object>.SuccessResponse(new { }, "Note deleted successfully", 200); return ApiResponse<object>.SuccessResponse(new { }, "Note deleted successfully", 200);
} }
// -------------------------------- Bucket -------------------------------- // -------------------------------- Bucket --------------------------------
public async Task<ApiResponse<object>> GetBucketList() public async Task<ApiResponse<object>> GetBucketList()