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

Feature_Directory #90

Merged
vikas.nale merged 501 commits from Feature_Directory into main 2025-06-10 14:44:36 +00:00
Conversation 0 Commits 501 Files Changed 60 +15 -16
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 928886ac72 - Show all commits

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

2
Marco.Pms.Model/Directory/ContactTagMapping.cs
View File

@ -5,7 +5,7 @@
public Guid Id { get; set; } public Guid Id { get; set; }
public Guid ContactId { get; set; } public Guid ContactId { get; set; }
public Contact? Contact { get; set; } public Contact? Contact { get; set; }
public Guid ContactTagtId { get; set; } public Guid ContactTagId { get; set; }
public ContactTagMaster? ContactTag { get; set; } public ContactTagMaster? ContactTag { get; set; }
} }
} }

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

@ -1383,7 +1383,7 @@ namespace Marco.Pms.Services.Helpers
var Tags = await _context.ContactTagMappings.Where(t => contactIds.Contains(t.ContactId)).ToListAsync(); var Tags = await _context.ContactTagMappings.Where(t => contactIds.Contains(t.ContactId)).ToListAsync();
var contactProjects = await _context.ContactProjectMappings.Where(p => contactIds.Contains(p.ContactId)).ToListAsync(); var contactProjects = await _context.ContactProjectMappings.Where(p => contactIds.Contains(p.ContactId)).ToListAsync();
List<Guid> TagIds = Tags.Select(t => t.ContactTagtId).ToList(); List<Guid> TagIds = Tags.Select(t => t.ContactTagId).ToList();
var TagList = await _context.ContactTagMasters.Where(t => TagIds.Contains(t.Id)).ToListAsync(); var TagList = await _context.ContactTagMasters.Where(t => TagIds.Contains(t.Id)).ToListAsync();
@ -1428,7 +1428,7 @@ namespace Marco.Pms.Services.Helpers
foreach (var tagMapping in tagMappingss) foreach (var tagMapping in tagMappingss)
{ {
ContactTagVM tagVM = new ContactTagVM(); ; ContactTagVM tagVM = new ContactTagVM(); ;
var tag = TagList.Find(t => t.Id == tagMapping.ContactTagtId); var tag = TagList.Find(t => t.Id == tagMapping.ContactTagId);
tagVM = tag != null ? tag.ToContactTagVMFromContactTagMaster() : new ContactTagVM(); tagVM = tag != null ? tag.ToContactTagVMFromContactTagMaster() : new ContactTagVM();
conatctTagVms.Add(tagVM); conatctTagVms.Add(tagVM);
@ -1486,7 +1486,7 @@ namespace Marco.Pms.Services.Helpers
List<ContactTagMaster> tagMasters = new List<ContactTagMaster>(); List<ContactTagMaster> tagMasters = new List<ContactTagMaster>();
if (tags.Count > 0) if (tags.Count > 0)
{ {
tagIds = tags.Select(ct => ct.ContactTagtId).ToList(); tagIds = tags.Select(ct => ct.ContactTagId).ToList();
tagMasters = await _context.ContactTagMasters.Where(t => tagIds.Contains(t.Id)).ToListAsync(); tagMasters = await _context.ContactTagMasters.Where(t => tagIds.Contains(t.Id)).ToListAsync();
} }
@ -1527,7 +1527,7 @@ namespace Marco.Pms.Services.Helpers
{ {
foreach (var contactTag in contactTags) foreach (var contactTag in contactTags)
{ {
ContactTagMaster? tagMaster = tagMasters.Find(t => t.Id == contactTag.ContactTagtId); ContactTagMaster? tagMaster = tagMasters.Find(t => t.Id == contactTag.ContactTagId);
if (tagMaster != null) if (tagMaster != null)
{ {
ContactTagVM tagVM = tagMaster.ToContactTagVMFromContactTagMaster(); ContactTagVM tagVM = tagMaster.ToContactTagVMFromContactTagMaster();
@ -1646,7 +1646,7 @@ namespace Marco.Pms.Services.Helpers
_context.ContactTagMappings.Add(new ContactTagMapping _context.ContactTagMappings.Add(new ContactTagMapping
{ {
ContactId = contact.Id, ContactId = contact.Id,
ContactTagtId = tag.Id ?? existingTag.Id ContactTagId = tag.Id ?? existingTag.Id
}); });
} }
else if (tag.Id == null || tags.Where(t => t.Name == tag.Name) == null) else if (tag.Id == null || tags.Where(t => t.Name == tag.Name) == null)
@ -1659,7 +1659,7 @@ namespace Marco.Pms.Services.Helpers
_context.ContactTagMasters.Add(newtag); _context.ContactTagMasters.Add(newtag);
ContactTagMapping tagMapping = new ContactTagMapping ContactTagMapping tagMapping = new ContactTagMapping
{ {
ContactTagtId = newtag.Id, ContactTagId = newtag.Id,
ContactId = contact.Id ContactId = contact.Id
}; };
contactTagMappings.Add(tagMapping); contactTagMappings.Add(tagMapping);
@ -1675,7 +1675,7 @@ namespace Marco.Pms.Services.Helpers
List<ContactPhoneVM> phoneVMs = new List<ContactPhoneVM>(); List<ContactPhoneVM> phoneVMs = new List<ContactPhoneVM>();
contact = await _context.Contacts.Include(c => c.ContactCategory).FirstOrDefaultAsync(c => c.Id == contact.Id) ?? new Contact(); contact = await _context.Contacts.Include(c => c.ContactCategory).FirstOrDefaultAsync(c => c.Id == contact.Id) ?? new Contact();
var tagIds = contactTagMappings.Select(t => t.ContactTagtId).ToList(); var tagIds = contactTagMappings.Select(t => t.ContactTagId).ToList();
tags = await _context.ContactTagMasters.Where(t => t.TenantId == tenantId && tagIds.Contains(t.Id)).ToListAsync(); tags = await _context.ContactTagMasters.Where(t => t.TenantId == tenantId && tagIds.Contains(t.Id)).ToListAsync();
List<ContactProjectMapping> contactProjects = await _context.ContactProjectMappings.Where(cp => cp.ContactId == contact.Id).ToListAsync(); List<ContactProjectMapping> contactProjects = await _context.ContactProjectMappings.Where(cp => cp.ContactId == contact.Id).ToListAsync();
List<ContactBucketMapping> bucketMappings = await _context.ContactBucketMappings.Where(cb => cb.ContactId == contact.Id).ToListAsync(); List<ContactBucketMapping> bucketMappings = await _context.ContactBucketMappings.Where(cb => cb.ContactId == contact.Id).ToListAsync();
@ -1694,7 +1694,7 @@ namespace Marco.Pms.Services.Helpers
foreach (var contactTagMapping in contactTagMappings) foreach (var contactTagMapping in contactTagMappings)
{ {
ContactTagVM tagVM = new ContactTagVM(); ContactTagVM tagVM = new ContactTagVM();
var tag = tags.Find(t => t.Id == contactTagMapping.ContactTagtId); var tag = tags.Find(t => t.Id == contactTagMapping.ContactTagId);
tagVM = tag != null ? tag.ToContactTagVMFromContactTagMaster() : new ContactTagVM(); tagVM = tag != null ? tag.ToContactTagVMFromContactTagMaster() : new ContactTagVM();
tagVMs.Add(tagVM); tagVMs.Add(tagVM);
} }
@ -1743,7 +1743,7 @@ namespace Marco.Pms.Services.Helpers
var bucketIds = contactBuckets.Select(b => b.BucketId).Distinct().ToList(); var bucketIds = contactBuckets.Select(b => b.BucketId).Distinct().ToList();
List<ContactTagMapping> contactTags = await _context.ContactTagMappings.AsNoTracking().Where(m => m.ContactId == contact.Id).ToListAsync(); List<ContactTagMapping> contactTags = await _context.ContactTagMappings.AsNoTracking().Where(m => m.ContactId == contact.Id).ToListAsync();
var tagIds = contactTags.Select(t => t.ContactTagtId).Distinct().ToList(); var tagIds = contactTags.Select(t => t.ContactTagId).Distinct().ToList();
List<ContactProjectMapping> contactProjects = await _context.ContactProjectMappings.AsNoTracking().Where(m => m.ContactId == contact.Id).ToListAsync(); List<ContactProjectMapping> contactProjects = await _context.ContactProjectMappings.AsNoTracking().Where(m => m.ContactId == contact.Id).ToListAsync();
@ -1876,7 +1876,7 @@ namespace Marco.Pms.Services.Helpers
_context.ContactTagMappings.Add(new ContactTagMapping _context.ContactTagMappings.Add(new ContactTagMapping
{ {
ContactId = contact.Id, ContactId = contact.Id,
ContactTagtId = tag.Id ?? existingTag.Id ContactTagId = tag.Id ?? existingTag.Id
}); });
} }
else if (tag.Id == null || tag.Id == Guid.Empty) else if (tag.Id == null || tag.Id == Guid.Empty)
@ -1892,7 +1892,7 @@ namespace Marco.Pms.Services.Helpers
_context.ContactTagMappings.Add(new ContactTagMapping _context.ContactTagMappings.Add(new ContactTagMapping
{ {
ContactId = contact.Id, ContactId = contact.Id,
ContactTagtId = contactTag.Id ContactTagId = contactTag.Id
}); });
} }
} }
@ -1923,7 +1923,7 @@ namespace Marco.Pms.Services.Helpers
contactTags = await _context.ContactTagMappings.AsNoTracking().Where(m => m.ContactId == contact.Id).ToListAsync(); contactTags = await _context.ContactTagMappings.AsNoTracking().Where(m => m.ContactId == contact.Id).ToListAsync();
contactBuckets = await _context.ContactBucketMappings.AsNoTracking().Where(cb => cb.ContactId == contact.Id).ToListAsync(); contactBuckets = await _context.ContactBucketMappings.AsNoTracking().Where(cb => cb.ContactId == contact.Id).ToListAsync();
contactProjects = await _context.ContactProjectMappings.AsNoTracking().Where(cp => cp.ContactId == contact.Id).ToListAsync(); contactProjects = await _context.ContactProjectMappings.AsNoTracking().Where(cp => cp.ContactId == contact.Id).ToListAsync();
tagIds = contactTags.Select(t => t.ContactTagtId).Distinct().ToList(); tagIds = contactTags.Select(t => t.ContactTagId).Distinct().ToList();
tags = await _context.ContactTagMasters.Where(t => tagIds.Contains(t.Id)).ToListAsync(); tags = await _context.ContactTagMasters.Where(t => tagIds.Contains(t.Id)).ToListAsync();
ContactVM contactVM = new ContactVM(); ContactVM contactVM = new ContactVM();
@ -1943,7 +1943,7 @@ namespace Marco.Pms.Services.Helpers
foreach (var contactTagMapping in contactTags) foreach (var contactTagMapping in contactTags)
{ {
ContactTagVM tagVM = new ContactTagVM(); ContactTagVM tagVM = new ContactTagVM();
var tag = tags.Find(t => t.Id == contactTagMapping.ContactTagtId); var tag = tags.Find(t => t.Id == contactTagMapping.ContactTagId);
tagVM = tag != null ? tag.ToContactTagVMFromContactTagMaster() : new ContactTagVM(); tagVM = tag != null ? tag.ToContactTagVMFromContactTagMaster() : new ContactTagVM();
tagVMs.Add(tagVM); tagVMs.Add(tagVM);
} }