Revert "added an API to get list of contacts by bucket id and added project- contact mapping table"

This reverts commit 22f777ca87053d2c79db610a27b8d7a5169e57bc.

Marco.Pms.DataAccess/Data/ApplicationDbContext.cs

@@ -78,7 +78,6 @@ namespace Marco.Pms.DataAccess.Data
         public DbSet<ContactTagMapping> ContactTagMappings { get; set; }
         public DbSet<EmployeeBucketMapping> EmployeeBucketMappings { get; set; }
         public DbSet<ContactBucketMapping> ContactBucketMappings { get; set; }
-        public DbSet<ContactProjectMapping> ContactProjectMappings { get; set; }
         public DbSet<DirectoryUpdateLog> DirectoryUpdateLogs { get; set; }
         public DbSet<ContactProjectMapping> ContactProjectMappings { get; set; }
 

Marco.Pms.DataAccess/Migrations/20250517050718_Added_ContactProjectMapping_Table.cs

@@ -1,81 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace Marco.Pms.DataAccess.Migrations
-{
-    /// <inheritdoc />
-    public partial class Added_ContactProjectMapping_Table : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "ProjectId",
-                table: "Contacts");
-
-            migrationBuilder.CreateTable(
-                name: "ContactProjectMappings",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
-                    ProjectId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
-                    ContactId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
-                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_ContactProjectMappings", x => x.Id);
-                    table.ForeignKey(
-                        name: "FK_ContactProjectMappings_Contacts_ContactId",
-                        column: x => x.ContactId,
-                        principalTable: "Contacts",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ContactProjectMappings_Projects_ProjectId",
-                        column: x => x.ProjectId,
-                        principalTable: "Projects",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                    table.ForeignKey(
-                        name: "FK_ContactProjectMappings_Tenants_TenantId",
-                        column: x => x.TenantId,
-                        principalTable: "Tenants",
-                        principalColumn: "Id",
-                        onDelete: ReferentialAction.Cascade);
-                })
-                .Annotation("MySql:CharSet", "utf8mb4");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ContactProjectMappings_ContactId",
-                table: "ContactProjectMappings",
-                column: "ContactId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ContactProjectMappings_ProjectId",
-                table: "ContactProjectMappings",
-                column: "ProjectId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_ContactProjectMappings_TenantId",
-                table: "ContactProjectMappings",
-                column: "TenantId");
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "ContactProjectMappings");
-
-            migrationBuilder.AddColumn<Guid>(
-                name: "ProjectId",
-                table: "Contacts",
-                type: "char(36)",
-                nullable: true,
-                collation: "ascii_general_ci");
-        }
-    }
-}

Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs

@@ -328,6 +328,9 @@ namespace Marco.Pms.DataAccess.Migrations
                         .IsRequired()
                         .HasColumnType("longtext");
 
+                    b.Property<Guid?>("ProjectId")
+                        .HasColumnType("char(36)");
+
                     b.Property<Guid>("TenantId")
                         .HasColumnType("char(36)");
 
@@ -483,32 +486,6 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.ToTable("ContactsPhones");
                 });
 
-            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactProjectMapping", b =>
-                {
-                    b.Property<Guid>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("char(36)");
-
-                    b.Property<Guid>("ContactId")
-                        .HasColumnType("char(36)");
-
-                    b.Property<Guid>("ProjectId")
-                        .HasColumnType("char(36)");
-
-                    b.Property<Guid>("TenantId")
-                        .HasColumnType("char(36)");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("ContactId");
-
-                    b.HasIndex("ProjectId");
-
-                    b.HasIndex("TenantId");
-
-                    b.ToTable("ContactProjectMappings");
-                });
-
             modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMapping", b =>
                 {
                     b.Property<Guid>("Id")
@@ -2609,33 +2586,6 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Navigation("Contact");
                 });
 
-            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactProjectMapping", b =>
-                {
-                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
-                        .WithMany()
-                        .HasForeignKey("ContactId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Marco.Pms.Model.Projects.Project", "Project")
-                        .WithMany()
-                        .HasForeignKey("ProjectId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
-                        .WithMany()
-                        .HasForeignKey("TenantId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Contact");
-
-                    b.Navigation("Project");
-
-                    b.Navigation("Tenant");
-                });
-
             modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMapping", b =>
                 {
                     b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")

Marco.Pms.Model/Directory/Contact.cs

@@ -9,7 +9,7 @@ namespace Marco.Pms.Model.Directory
     public class Contact : TenantRelation
     {
         public Guid Id { get; set; }
-        //public Guid? ProjectId { get; set; }
+        public Guid? ProjectId { get; set; }
         public string Name { get; set; } = string.Empty;
         public string Description { get; set; } = string.Empty;
         public string Organization { get; set; } = string.Empty;

Marco.Pms.Model/Directory/ContactProjectMapping.cs

@@ -1,20 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using Marco.Pms.Model.Projects;
-using Marco.Pms.Model.Utilities;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-
-namespace Marco.Pms.Model.Directory
-{
-    public class ContactProjectMapping : TenantRelation
-    {
-        public Guid Id { get; set; }
-        public Guid ProjectId { get; set; }
-        [ValidateNever]
-        [ForeignKey("ProjectId")]
-        public Project? Project { get; set; }
-        public Guid ContactId { get; set; }
-        [ValidateNever]
-        [ForeignKey("ContactId")]
-        public Contact? Contact { get; set; }
-    }
-}

Marco.Pms.Model/Dtos/Directory/CreateContactDto.cs

@@ -2,7 +2,7 @@
 {
     public class CreateContactDto
     {
-        public List<Guid>? ProjectIds { get; set; }
+        public Guid? ProjectId { get; set; }
         public string? Name { get; set; }
         public List<CreateContactPhoneDto>? ContactPhones { get; set; }
         public List<CreateContactEmailDto>? ContactEmails { get; set; }

Marco.Pms.Model/Dtos/Directory/UpdateContactDto.cs

@@ -3,7 +3,7 @@
     public class UpdateContactDto
     {
         public Guid Id { get; set; }
-        public List<Guid>? ProjectIds { get; set; }
+        public Guid? ProjectId { get; set; }
         public string? Name { get; set; }
         public List<UpdateContactPhoneDto>? ContactPhones { get; set; }
         public List<UpdateContactEmailDto>? ContactEmails { get; set; }

Marco.Pms.Model/Mapper/DirectoryMapper.cs

@@ -13,6 +13,7 @@ namespace Marco.Pms.Model.Mapper
 
             return new Contact
             {
+                ProjectId = createContactDto.ProjectId,
                 Name = createContactDto.Name ?? string.Empty,
                 ContactCategoryId = createContactDto.ContactCategoryId,
                 Description = createContactDto.Description ?? string.Empty,
@@ -29,6 +30,7 @@ namespace Marco.Pms.Model.Mapper
             return new Contact
             {
                 Id = updateContactDto.Id,
+                ProjectId = updateContactDto.ProjectId,
                 Name = updateContactDto.Name ?? string.Empty,
                 ContactCategoryId = updateContactDto.ContactCategoryId,
                 CreatedAt = contact.CreatedAt,
@@ -44,6 +46,7 @@ namespace Marco.Pms.Model.Mapper
             return new ContactVM
             {
                 Id = contact.Id,
+                ProjectId = contact.ProjectId,
                 Name = contact.Name,
                 ContactCategory = contact.ContactCategory != null ? contact.ContactCategory.ToContactCategoryVMFromContactCategoryMaster() : null,
                 Description = contact.Description ?? string.Empty,

Marco.Pms.Model/ViewModels/Directory/ContactVM.cs

@@ -5,12 +5,11 @@ namespace Marco.Pms.Model.ViewModels.Directory
     public class ContactVM
     {
         public Guid Id { get; set; }
-        public List<Guid>? ProjectIds { get; set; }
+        public Guid? ProjectId { get; set; }
         public string? Name { get; set; }
         public List<ContactPhoneVM>? ContactPhones { get; set; }
         public List<ContactEmailVM>? ContactEmails { get; set; }
         public ContactCategoryVM? ContactCategory { get; set; }
-        public List<Guid>? BucketIds { get; set; }
         public string? Description { get; set; }
         public string? Organization { get; set; }
         public string? Address { get; set; }

Marco.Pms.Services/Controllers/DirectoryController.cs

@@ -63,24 +63,6 @@ namespace Marco.Pms.Services.Controllers
             }
         }
 
-        [HttpGet("contact-bucket/{bucketId}")]
-        public async Task<IActionResult> GetContactsListByBucketId(Guid bucketId)
-        {
-            var response = await _directoryHelper.GetContactsListByBucketId(bucketId);
-            if (response.StatusCode == 200)
-            {
-                return Ok(response);
-            }
-            else if (response.StatusCode == 401)
-            {
-                return Unauthorized(response);
-            }
-            else
-            {
-                return BadRequest(response);
-            }
-        }
-
         [HttpPost]
         public async Task<IActionResult> CreateContact([FromBody] CreateContactDto createContact)
         {

Marco.Pms.Services/Helpers/DirectoryHelper.cs

@@ -112,7 +112,7 @@ namespace Marco.Pms.Services.Helpers
                     }
                 }
 
-                if (phones != null && phones.Count > 0)
+                if (phones != null)
                 {
                     foreach (var phone in phones)
                     {
@@ -122,7 +122,7 @@ namespace Marco.Pms.Services.Helpers
                     }
 
                 }
-                if (tagMappingss != null && tagMappingss.Count > 0)
+                if (tagMappingss != null)
                 {
                     foreach (var tagMapping in tagMappingss)
                     {
@@ -311,7 +311,7 @@ namespace Marco.Pms.Services.Helpers
                         }
                     }
                     _context.ContactBucketMappings.AddRange(contactBucketMappings);
-                    _logger.LogInfo("Contact with ID {ContactId} added to {count} number of buckets by employee with ID {LoggedEmployeeId}", contact.Id, contactBucketMappings.Count, LoggedInEmployee.Id);
+                    _logger.LogInfo("Contact with ID {ContactId} added to {count} number of buckets by employee with ID {LoggedEmployeeId}", contact.Id, LoggedInEmployee.Id);
                 }
 
                 if (createContact.ProjectIds != null)