diff --git a/Marco.Pms.DataAccess/Migrations/20250514103249_Added_Directory_Related_Tables.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250514103249_Added_Directory_Related_Tables.Designer.cs index f50346e..aad7361 100644 --- a/Marco.Pms.DataAccess/Migrations/20250514103249_Added_Directory_Related_Tables.Designer.cs +++ b/Marco.Pms.DataAccess/Migrations/20250514103249_Added_Directory_Related_Tables.Designer.cs @@ -493,9 +493,6 @@ namespace Marco.Pms.DataAccess.Migrations b.Property("ContactTagId") .HasColumnType("char(36)"); - b.Property("ContactTagtId") - .HasColumnType("char(36)"); - b.HasKey("Id"); b.HasIndex("ContactId"); 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 879f54b..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 @@ -289,8 +288,7 @@ namespace Marco.Pms.DataAccess.Migrations { Id = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), ContactId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), - ContactTagtId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), - ContactTagId = table.Column(type: "char(36)", nullable: true, collation: "ascii_general_ci") + ContactTagId = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci") }, constraints: table => { diff --git a/Marco.Pms.DataAccess/Migrations/20250517063809_Added_ContactProjectMapping_Table.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250517063809_Added_ContactProjectMapping_Table.Designer.cs index 18a4be6..492cf00 100644 --- a/Marco.Pms.DataAccess/Migrations/20250517063809_Added_ContactProjectMapping_Table.Designer.cs +++ b/Marco.Pms.DataAccess/Migrations/20250517063809_Added_ContactProjectMapping_Table.Designer.cs @@ -516,8 +516,6 @@ namespace Marco.Pms.DataAccess.Migrations b.Property("ContactTagId") .HasColumnType("char(36)"); - b.Property("ContactTagtId") - .HasColumnType("char(36)"); b.HasKey("Id"); diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs index 329b474..5662c46 100644 --- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs @@ -513,9 +513,6 @@ namespace Marco.Pms.DataAccess.Migrations b.Property("ContactTagId") .HasColumnType("char(36)"); - b.Property("ContactTagtId") - .HasColumnType("char(36)"); - b.HasKey("Id"); b.HasIndex("ContactId"); diff --git a/Marco.Pms.Model/Directory/ContactTagMapping.cs b/Marco.Pms.Model/Directory/ContactTagMapping.cs index a3d7e9e..91c2835 100644 --- a/Marco.Pms.Model/Directory/ContactTagMapping.cs +++ b/Marco.Pms.Model/Directory/ContactTagMapping.cs @@ -5,7 +5,7 @@ public Guid Id { get; set; } public Guid ContactId { get; set; } public Contact? Contact { get; set; } - public Guid ContactTagtId { get; set; } + public Guid ContactTagId { get; set; } public ContactTagMaster? ContactTag { get; set; } } } diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs index 980fb68..5920cbd 100644 --- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs +++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs @@ -44,7 +44,7 @@ namespace Marco.Pms.Services.Helpers var Tags = await _context.ContactTagMappings.Where(t => contactIds.Contains(t.ContactId)).ToListAsync(); var contactProjects = await _context.ContactProjectMappings.Where(p => contactIds.Contains(p.ContactId)).ToListAsync(); - List TagIds = Tags.Select(t => t.ContactTagtId).ToList(); + List TagIds = Tags.Select(t => t.ContactTagId).ToList(); var TagList = await _context.ContactTagMasters.Where(t => TagIds.Contains(t.Id)).ToListAsync(); @@ -89,7 +89,7 @@ namespace Marco.Pms.Services.Helpers foreach (var tagMapping in tagMappingss) { 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(); conatctTagVms.Add(tagVM); @@ -147,7 +147,7 @@ namespace Marco.Pms.Services.Helpers List tagMasters = new List(); 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(); } @@ -188,7 +188,7 @@ namespace Marco.Pms.Services.Helpers { 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) { ContactTagVM tagVM = tagMaster.ToContactTagVMFromContactTagMaster(); @@ -307,7 +307,7 @@ namespace Marco.Pms.Services.Helpers _context.ContactTagMappings.Add(new ContactTagMapping { 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) @@ -320,7 +320,7 @@ namespace Marco.Pms.Services.Helpers _context.ContactTagMasters.Add(newtag); ContactTagMapping tagMapping = new ContactTagMapping { - ContactTagtId = newtag.Id, + ContactTagId = newtag.Id, ContactId = contact.Id }; contactTagMappings.Add(tagMapping); @@ -336,7 +336,7 @@ namespace Marco.Pms.Services.Helpers List phoneVMs = new List(); 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(); List contactProjects = await _context.ContactProjectMappings.Where(cp => cp.ContactId == contact.Id).ToListAsync(); List bucketMappings = await _context.ContactBucketMappings.Where(cb => cb.ContactId == contact.Id).ToListAsync(); @@ -355,7 +355,7 @@ namespace Marco.Pms.Services.Helpers foreach (var contactTagMapping in contactTagMappings) { 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(); tagVMs.Add(tagVM); } @@ -404,7 +404,7 @@ namespace Marco.Pms.Services.Helpers var bucketIds = contactBuckets.Select(b => b.BucketId).Distinct().ToList(); List 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 contactProjects = await _context.ContactProjectMappings.AsNoTracking().Where(m => m.ContactId == contact.Id).ToListAsync(); @@ -537,7 +537,7 @@ namespace Marco.Pms.Services.Helpers _context.ContactTagMappings.Add(new ContactTagMapping { ContactId = contact.Id, - ContactTagtId = tag.Id ?? existingTag.Id + ContactTagId = tag.Id ?? existingTag.Id }); } else if (tag.Id == null || tag.Id == Guid.Empty) @@ -553,7 +553,7 @@ namespace Marco.Pms.Services.Helpers _context.ContactTagMappings.Add(new ContactTagMapping { ContactId = contact.Id, - ContactTagtId = contactTag.Id + ContactTagId = contactTag.Id }); } } @@ -584,7 +584,7 @@ namespace Marco.Pms.Services.Helpers contactTags = await _context.ContactTagMappings.AsNoTracking().Where(m => m.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(); - 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(); ContactVM contactVM = new ContactVM(); @@ -604,7 +604,7 @@ namespace Marco.Pms.Services.Helpers foreach (var contactTagMapping in contactTags) { 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(); tagVMs.Add(tagVM); } diff --git a/Marco.Pms.Services/Helpers/MasterHelper.cs b/Marco.Pms.Services/Helpers/MasterHelper.cs index 11015c8..4d29908 100644 --- a/Marco.Pms.Services/Helpers/MasterHelper.cs +++ b/Marco.Pms.Services/Helpers/MasterHelper.cs @@ -161,7 +161,7 @@ namespace Marco.Pms.Services.Helpers ContactTagMaster? contactTag = await _context.ContactTagMasters.FirstOrDefaultAsync(c => c.Id == id && c.TenantId == tenantId); if (contactTag != null) { - List? tagMappings = await _context.ContactTagMappings.Where(t => t.ContactTagtId == contactTag.Id).ToListAsync(); + List? tagMappings = await _context.ContactTagMappings.Where(t => t.ContactTagId == contactTag.Id).ToListAsync(); _context.ContactTagMasters.Remove(contactTag); if (tagMappings.Any())