From 8814dc59d92969af1fe3c6f62d9877aa25206aa7 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 11 Jun 2025 10:21:39 +0530
Subject: [PATCH 01/48] Add basic implementation and add in record attendance
 API for testing

---
 .../Controllers/AttendanceController.cs       |  7 +++-
 .../Controllers/MasterController.cs           | 10 +++---
 Marco.Pms.Services/Hub/MarcoHub.cs            | 35 +++++++++++++++++++
 Marco.Pms.Services/Marco.Pms.Services.csproj  |  1 +
 Marco.Pms.Services/Program.cs                 | 24 +++++++++++--
 .../appsettings.Development.json              |  2 +-
 6 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 Marco.Pms.Services/Hub/MarcoHub.cs

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 5c7104d..0fbc6b5 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -7,11 +7,13 @@ using Marco.Pms.Model.Mapper;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.AttendanceVM;
+using Marco.Pms.Services.Hubs;
 using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
 using Document = Marco.Pms.Model.DocumentManager.Document;
@@ -30,10 +32,11 @@ namespace MarcoBMS.Services.Controllers
         private readonly S3UploadService _s3Service;
         private readonly PermissionServices _permission;
         private readonly ILoggingService _logger;
+        private readonly IHubContext<MarcoHub> _signalR;
 
 
         public AttendanceController(
-             ApplicationDbContext context, EmployeeHelper employeeHelper, ProjectsHelper projectsHelper, UserHelper userHelper, S3UploadService s3Service, ILoggingService logger, PermissionServices permission)
+             ApplicationDbContext context, EmployeeHelper employeeHelper, ProjectsHelper projectsHelper, UserHelper userHelper, S3UploadService s3Service, ILoggingService logger, PermissionServices permission, IHubContext<MarcoHub> signalR)
         {
             _context = context;
             _employeeHelper = employeeHelper;
@@ -42,6 +45,7 @@ namespace MarcoBMS.Services.Controllers
             _s3Service = s3Service;
             _logger = logger;
             _permission = permission;
+            _signalR = signalR;
         }
 
         private Guid GetTenantId()
@@ -558,6 +562,7 @@ namespace MarcoBMS.Services.Controllers
                         Activity = attendance.Activity,
                         JobRoleName = employee.JobRole.Name
                     };
+                    await _signalR.Clients.All.SendAsync("Attendance", new { LoggedInUserId = currentEmployee.Id, ProjectId = recordAttendanceDot.ProjectID, Response = vm });
                     _logger.LogInfo("Attendance for employee {FirstName} {LastName} has been marked", employee.FirstName ?? string.Empty, employee.LastName ?? string.Empty);
                     return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
                 }
diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index 3512081..7835e8d 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -749,11 +749,11 @@ namespace Marco.Pms.Services.Controllers
             return Ok(response);
         }
 
-        [HttpGet("contact-tag/{id}")]
-        public async Task<IActionResult> GetContactTagMaster(Guid id)
-        {
-            return Ok();
-        }
+        //[HttpGet("contact-tag/{id}")]
+        //public async Task<IActionResult> GetContactTagMaster(Guid id)
+        //{
+        //    return Ok();
+        //}
 
         [HttpPost("contact-tag")]
         public async Task<IActionResult> CreateContactTagMaster([FromBody] CreateContactTagDto contactTagDto)
diff --git a/Marco.Pms.Services/Hub/MarcoHub.cs b/Marco.Pms.Services/Hub/MarcoHub.cs
new file mode 100644
index 0000000..bf6fc38
--- /dev/null
+++ b/Marco.Pms.Services/Hub/MarcoHub.cs
@@ -0,0 +1,35 @@
+using MarcoBMS.Services.Service;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.SignalR;
+
+namespace Marco.Pms.Services.Hubs
+{
+    [Authorize]
+    public class MarcoHub : Hub
+    {
+        private readonly ILoggingService _logger;
+        public MarcoHub(ILoggingService logger)
+        {
+            _logger = logger;
+        }
+        public async Task SendMessage(string user, string message)
+        {
+            _logger.LogInfo($"User: {user} Message : {message}");
+            await Clients.All.SendAsync("ReceiveMessage", user, message);
+        }
+        public override async Task OnConnectedAsync()
+        {
+            await base.OnConnectedAsync();
+            _logger.LogInfo($"Connected successfully");
+            await Clients.All.SendAsync("Connected successfully");
+        }
+
+        // Optional: override OnDisconnectedAsync
+        public override async Task OnDisconnectedAsync(Exception? exception)
+        {
+            await base.OnDisconnectedAsync(exception);
+            _logger.LogInfo($"DIsonnected successfully");
+            await Clients.All.SendAsync("Disonnected successfully");
+        }
+    }
+}
diff --git a/Marco.Pms.Services/Marco.Pms.Services.csproj b/Marco.Pms.Services/Marco.Pms.Services.csproj
index 6482198..7bef32f 100644
--- a/Marco.Pms.Services/Marco.Pms.Services.csproj
+++ b/Marco.Pms.Services/Marco.Pms.Services.csproj
@@ -17,6 +17,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.12" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.12" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.12">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Marco.Pms.Services/Program.cs b/Marco.Pms.Services/Program.cs
index e57fa15..17eb5c7 100644
--- a/Marco.Pms.Services/Program.cs
+++ b/Marco.Pms.Services/Program.cs
@@ -4,6 +4,7 @@ using Marco.Pms.Model.Authentication;
 using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Services.Helpers;
+using Marco.Pms.Services.Hubs;
 using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Middleware;
@@ -59,7 +60,8 @@ builder.Services.AddCors(options =>
     {
         policy.AllowAnyOrigin()
               .AllowAnyMethod()
-              .AllowAnyHeader();
+              .AllowAnyHeader()
+              .WithExposedHeaders("Authorization");
     });
 });
 
@@ -161,10 +163,28 @@ if (jwtSettings != null && jwtSettings.Key != null)
             ValidAudience = jwtSettings.Audience,
             IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtSettings.Key))
         };
+
+        options.Events = new JwtBearerEvents
+        {
+            OnMessageReceived = context =>
+            {
+                var accessToken = context.Request.Query["access_token"];
+                var path = context.HttpContext.Request.Path;
+
+                // Match your hub route here
+                if (!string.IsNullOrEmpty(accessToken) && path.StartsWithSegments("/hubs/marco"))
+                {
+                    context.Token = accessToken;
+                }
+
+                return Task.CompletedTask;
+            }
+        };
     });
     builder.Services.AddSingleton(jwtSettings);
 }
 
+builder.Services.AddSignalR();
 builder.WebHost.ConfigureKestrel(options =>
 {
     options.AddServerHeader = false; // Disable the "Server" header
@@ -207,7 +227,7 @@ app.UseHttpsRedirection();
 
 
 app.UseAuthorization();
-
+app.MapHub<MarcoHub>("/hubs/marco");
 app.MapControllers();
 
 app.Run();
diff --git a/Marco.Pms.Services/appsettings.Development.json b/Marco.Pms.Services/appsettings.Development.json
index 2cbcbcf..1565018 100644
--- a/Marco.Pms.Services/appsettings.Development.json
+++ b/Marco.Pms.Services/appsettings.Development.json
@@ -9,7 +9,7 @@
         "Title": "Dev"
     },
     "ConnectionStrings": {
-        "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMSGuid"
+        "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1"
     },
     "SmtpSettings": {
         "SmtpServer": "smtp.gmail.com",
-- 
2.43.0


From 712c5e2a0a764f1f9e0d65a7f59bc355bd89850e Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 11:04:24 +0530
Subject: [PATCH 02/48] Implemented signalR in project infrastructure APIs

---
 .../Controllers/AttendanceController.cs       |  8 ++-
 .../Controllers/ProjectController.cs          | 63 +++++++++++++------
 2 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 0fbc6b5..e0493af 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -562,7 +562,13 @@ namespace MarcoBMS.Services.Controllers
                         Activity = attendance.Activity,
                         JobRoleName = employee.JobRole.Name
                     };
-                    await _signalR.Clients.All.SendAsync("Attendance", new { LoggedInUserId = currentEmployee.Id, ProjectId = recordAttendanceDot.ProjectID, Response = vm });
+                    var sendActivity = 0;
+                    if (recordAttendanceDot.Id == Guid.Empty)
+                    {
+                        sendActivity = 1;
+                    }
+                    var notification = new { LoggedInUserId = currentEmployee.Id, Keyword = "Attendance", Activity = sendActivity, ProjectId = attendance.ProjectID, Response = vm };
+                    await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                     _logger.LogInfo("Attendance for employee {FirstName} {LastName} has been marked", employee.FirstName ?? string.Empty, employee.LastName ?? string.Empty);
                     return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
                 }
diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 43e7252..839a872 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -8,12 +8,13 @@ using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Employee;
 using Marco.Pms.Model.ViewModels.Projects;
+using Marco.Pms.Services.Hubs;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 
 namespace MarcoBMS.Services.Controllers
 {
@@ -27,15 +28,18 @@ namespace MarcoBMS.Services.Controllers
         private readonly ILoggingService _logger;
         private readonly RolesHelper _rolesHelper;
         private readonly ProjectsHelper _projectsHelper;
+        private readonly IHubContext<MarcoHub> _signalR;
 
 
-        public ProjectController(ApplicationDbContext context, UserHelper userHelper, ILoggingService logger, RolesHelper rolesHelper, ProjectsHelper projectHelper)
+        public ProjectController(ApplicationDbContext context, UserHelper userHelper, ILoggingService logger, RolesHelper rolesHelper, ProjectsHelper projectHelper, IHubContext<MarcoHub> signalR)
         {
             _context = context;
             _userHelper = userHelper;
             _logger = logger;
             _rolesHelper = rolesHelper;
             _projectsHelper = projectHelper;
+            _signalR = signalR;
+
         }
         [HttpGet("list")]
         public async Task<IActionResult> GetAll()
@@ -261,6 +265,7 @@ namespace MarcoBMS.Services.Controllers
         [HttpPost]
         public async Task<IActionResult> Create([FromBody] CreateProjectDto projectDto)
         {
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             if (!ModelState.IsValid)
             {
                 var errors = ModelState.Values
@@ -277,6 +282,9 @@ namespace MarcoBMS.Services.Controllers
             _context.Projects.Add(project);
 
             await _context.SaveChangesAsync();
+            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+
+            await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
             return Ok(ApiResponse<object>.SuccessResponse(project.ToProjectDto(), "Success.", 200));
         }
@@ -285,6 +293,7 @@ namespace MarcoBMS.Services.Controllers
         [Route("update/{id}")]
         public async Task<IActionResult> Update([FromRoute] Guid id, [FromBody] UpdateProjectDto updateProjectDto)
         {
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             if (!ModelState.IsValid)
             {
                 var errors = ModelState.Values
@@ -303,6 +312,10 @@ namespace MarcoBMS.Services.Controllers
 
                 await _context.SaveChangesAsync();
 
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
+
                 return Ok(ApiResponse<object>.SuccessResponse(project.ToProjectDto(), "Success.", 200));
 
             }
@@ -312,7 +325,6 @@ namespace MarcoBMS.Services.Controllers
             }
         }
 
-
         //[HttpPost("assign-employee")]
         //public async Task<IActionResult> AssignEmployee(int? allocationid, int employeeId, int projectId)
         //{
@@ -523,6 +535,7 @@ namespace MarcoBMS.Services.Controllers
         public async Task<IActionResult> CreateProjectTask(List<WorkItemDot> workItemDot)
         {
             Guid tenantId = GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             List<WorkItemVM> workItems = new List<WorkItemVM> { };
             string responseMessage = "";
             if (workItemDot != null)
@@ -554,6 +567,10 @@ namespace MarcoBMS.Services.Controllers
                 }
                 var activity = await _context.ActivityMasters.ToListAsync();
                 var category = await _context.WorkCategoryMasters.ToListAsync();
+
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = workItems };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(workItems, responseMessage, 200));
             }
 
@@ -565,6 +582,7 @@ namespace MarcoBMS.Services.Controllers
         public async Task<IActionResult> DeleteProjectTask(Guid id)
         {
             Guid tenantId = _userHelper.GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             WorkItem? task = await _context.WorkItems.AsNoTracking().FirstOrDefaultAsync(t => t.Id == id && t.TenantId == tenantId);
             if (task != null)
             {
@@ -576,6 +594,9 @@ namespace MarcoBMS.Services.Controllers
                         _context.WorkItems.Remove(task);
                         await _context.SaveChangesAsync();
                         _logger.LogInfo("Task with ID {WorkItemId} has been successfully deleted.", task.Id);
+
+                        var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = id };
+                        await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                     }
                     else
                     {
@@ -603,6 +624,8 @@ namespace MarcoBMS.Services.Controllers
         public async Task<IActionResult> ManageProjectInfra(List<InfraDot> infraDots)
         {
             Guid tenantId = GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
             var responseData = new InfraVM { };
             string responseMessage = "";
             if (infraDots != null)
@@ -678,6 +701,9 @@ namespace MarcoBMS.Services.Controllers
                         }
                     }
                 }
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = responseData };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(responseData, responseMessage, 200));
             }
             return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Infra Details are not valid.", 400));
@@ -701,46 +727,44 @@ namespace MarcoBMS.Services.Controllers
 
             if (!projectList.Any())
             {
-                return NotFound(ApiResponse<object>.SuccessResponse(new List<object>(), "No projects found.",200));
+                return NotFound(ApiResponse<object>.SuccessResponse(new List<object>(), "No projects found.", 200));
             }
 
 
-           List<Project> projectlist = await _context.Projects
-                .Where(p => projectList.Contains(p.Id))
-                .ToListAsync();
+            List<Project> projectlist = await _context.Projects
+                 .Where(p => projectList.Contains(p.Id))
+                 .ToListAsync();
 
             List<ProjectListVM> projects = new List<ProjectListVM>();
 
 
-            foreach (var project in projectlist) {
-              
+            foreach (var project in projectlist)
+            {
+
                 projects.Add(project.ToProjectListVMFromProject());
             }
 
-            
+
 
             return Ok(ApiResponse<object>.SuccessResponse(projects, "Success.", 200));
         }
 
-
-
-
         [HttpPost("assign-projects/{employeeId}")]
         public async Task<ActionResult> AssigneProjectsToEmployee([FromBody] List<ProjectsAllocationDto> projectAllocationDtos, [FromRoute] Guid employeeId)
         {
-            if(projectAllocationDtos != null && employeeId != Guid.Empty)
+            if (projectAllocationDtos != null && employeeId != Guid.Empty)
             {
                 Guid TenentID = GetTenantId();
                 List<object>? result = new List<object>();
 
-                foreach(var projectAllocationDto in projectAllocationDtos)
+                foreach (var projectAllocationDto in projectAllocationDtos)
                 {
                     try
                     {
-                        ProjectAllocation projectAllocation = projectAllocationDto.ToProjectAllocationFromProjectsAllocationDto(TenentID,employeeId);
+                        ProjectAllocation projectAllocation = projectAllocationDto.ToProjectAllocationFromProjectsAllocationDto(TenentID, employeeId);
                         ProjectAllocation? projectAllocationFromDb = await _context.ProjectAllocations.Where(c => c.EmployeeId == employeeId && c.ProjectId == projectAllocationDto.ProjectId && c.ReAllocationDate == null && c.TenantId == TenentID).SingleOrDefaultAsync();
 
-                        if(projectAllocationFromDb != null)
+                        if (projectAllocationFromDb != null)
                         {
 
 
@@ -785,7 +809,8 @@ namespace MarcoBMS.Services.Controllers
 
 
                     }
-                    catch (Exception ex) {
+                    catch (Exception ex)
+                    {
 
                         return Ok(ApiResponse<object>.ErrorResponse(ex.Message, ex, 400));
                     }
@@ -797,7 +822,7 @@ namespace MarcoBMS.Services.Controllers
             {
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "All Field is required", 400));
             }
-          
+
         }
 
 
-- 
2.43.0


From abe7870ad5d0da8b7d81ba5b6c394a9d8c4e1964 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 16:09:28 +0530
Subject: [PATCH 03/48] Implemented image storing to S3 while reporting task

---
 .../Data/ApplicationDbContext.cs              |    1 +
 ...43_Added_TaskAttachments_Table.Designer.cs | 3269 +++++++++++++++++
 ...50612094243_Added_TaskAttachments_Table.cs |   36 +
 .../ApplicationDbContextModelSnapshot.cs      |   17 +
 Marco.Pms.Model/Activities/TaskAttachment.cs  |    9 +
 Marco.Pms.Model/Activities/TaskImages.cs      |   17 -
 .../Dtos/Activities/ReportTaskDto.cs          |    5 +-
 .../Dtos/Directory/UpdateContactDto.cs        |    2 +-
 .../ViewModels/Activities/ReportTaskVM.cs     |    1 -
 .../ViewModels/Activities/TaskVM.cs           |    1 +
 .../Controllers/AttendanceController.cs       |   12 +-
 .../Controllers/ForumController.cs            |   82 +-
 .../Controllers/MasterController.cs           |   10 +-
 .../Controllers/TaskController.cs             |   56 +-
 Marco.Pms.Services/Service/S3UploadService.cs |   69 +-
 15 files changed, 3514 insertions(+), 73 deletions(-)
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.Designer.cs
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.cs
 create mode 100644 Marco.Pms.Model/Activities/TaskAttachment.cs
 delete mode 100644 Marco.Pms.Model/Activities/TaskImages.cs

diff --git a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
index 1b76adb..04cfe61 100644
--- a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
+++ b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
@@ -44,6 +44,7 @@ namespace Marco.Pms.DataAccess.Data
         public DbSet<TaskAllocation> TaskAllocations { get; set; }
         public DbSet<TaskComment> TaskComments { get; set; }
         public DbSet<TaskMembers> TaskMembers { get; set; }
+        public DbSet<TaskAttachment> TaskAttachments { get; set; }
         public DbSet<Attendance> Attendes { get; set; }
         public DbSet<AttendanceLog> AttendanceLogs { get; set; }
         public DbSet<Employee> Employees { get; set; }
diff --git a/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.Designer.cs
new file mode 100644
index 0000000..1407de2
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.Designer.cs
@@ -0,0 +1,3269 @@
+// <auto-generated />
+using System;
+using Marco.Pms.DataAccess.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250612094243_Added_TaskAttachments_Table")]
+    partial class Added_TaskAttachments_Table
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            //MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AssignedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AssignmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("CompletedTask")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("PlannedTask")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime?>("ReportedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkItemId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssignedBy");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkItemId");
+
+                    b.ToTable("TaskAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ReferenceId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CommentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CommentedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentedBy");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskMembers");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ApprovedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AttendanceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("InTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("OutTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ProjectID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Attendes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ActivityTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AttendanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Latitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Longitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("UpdatedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdatedOn")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AttendanceId");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("AttendanceLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MPIN")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MPINToken")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("MPINDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("ExpriesInSec")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OTP")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("OTPDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedByID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedByID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buckets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ContactCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Organization")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactCategoryId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Contacts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactCategoryMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EmailAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactsEmails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactNotes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    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")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactTagId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("ContactTagId");
+
+                    b.ToTable("ContactTagMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactTagMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("RefereanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdateAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("DirectoryUpdateLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("EmployeeBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Base64Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("BatchId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("S3Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ThumbS3Key")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UploadedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AadharNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CurrentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyPhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("JoiningDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MiddleName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PanNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PermanentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.HasIndex("JobRoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("RoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("EmployeeRoleMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeOnly>("EndTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkShifts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsMandatory")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityCheckLists");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("CheckListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FeatureId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeatureId");
+
+                    b.ToTable("FeaturePermissions");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"),
+                            Description = "Access all information related to the project.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "View Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"),
+                            Description = "Potentially edit the project name, description, start/end dates, or status.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"),
+                            Description = "The \"Manage Team\" feature allows authorized users to organize project personnel by adding, removing, and assigning employee to projects.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Team"
+                        },
+                        new
+                        {
+                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "View Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure.",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "Manage Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"),
+                            Description = "Grants a user comprehensive read-only access to all details associated with tasks within a project. This includes task descriptions, statuses, assignees, due dates, dependencies, progress, history, and any related attachments or discussions.",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "View Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("08752f33-3b29-4816-b76b-ea8a968ed3c5"),
+                            Description = "This allows them to create new tasks, modify existing task attributes (description, status, assignee, due date, etc.),",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2"),
+                            Description = "Grants a user the ability to designate team members responsible for specific tasks and to update the completion status or provide progress updates for those tasks",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Assign/Report Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"),
+                            Description = "Grants a user the authority to officially confirm the completion or acceptance of a task, often signifying that it meets the required standards or criteria",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Approve Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                            Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"),
+                            Description = "Grants a user the authority to create new employee profiles and modify existing employee details within the system. This typically includes adding or updating information such as names, contact details, roles, departments, skills, and potentially other personal or professional data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"),
+                            Description = "Grants a user the authority to manage employee application roles, enabling them to assign or revoke access privileges within the system.",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Assign Roles"
+                        },
+                        new
+                        {
+                            Id = new Guid("915e6bff-65f6-4e3f-aea8-3fd217d3ea9e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Team Attendance "
+                        },
+                        new
+                        {
+                            Id = new Guid("57802c4a-00aa-4a1f-a048-fd2f70dd44b6"),
+                            Description = "Grants a user the authority to approve requests from employees to adjust or correct their recorded attendance. This typically involves reviewing the reason for the regularization, verifying any supporting documentation, and then officially accepting the changes to the employee's attendance records",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Regularize Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("ccb0589f-712b-43de-92ed-5b6088e7dc4e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Self Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"),
+                            Description = "Grants a user read-only access to foundational or reference data within the system. \"Masters\" typically refer to predefined lists, categories, or templates that are used throughout the application to standardize information and maintain consistency",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("588a8824-f924-4955-82d8-fc51956cf323"),
+                            Description = "Grants a user the authority to create, modify, and delete foundational or reference data within the system. These \"masters\" are typically the core lists, categories, and configurations that other data and functionalities rely upon, such as departments, job titles, product categories",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("4286a13b-bb40-4879-8c6d-18e9e393beda"),
+                            Description = "Full control over all directories, including the ability to manage permissions for all directories in the system.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Admin"
+                        },
+                        new
+                        {
+                            Id = new Guid("62668630-13ce-4f52-a0f0-db38af2230c5"),
+                            Description = "Full control over directories they created or have been assigned. Can also manage permissions for those directories.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Manager"
+                        },
+                        new
+                        {
+                            Id = new Guid("0f919170-92d4-4337-abd3-49b66fc871bb"),
+                            Description = "Full control over directories they created. Can view contacts in directories they either created or were assigned to. Can manage permissions only for directories they created.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory User"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.Property<Guid>("ApplicationRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FeaturePermissionId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("ApplicationRoleId", "FeaturePermissionId");
+
+                    b.HasIndex("FeaturePermissionId");
+
+                    b.ToTable("RolePermissionMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DomainName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OnBoardingDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IndustryId");
+
+                    b.ToTable("Tenants");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b3466e83-7e11-464c-b93a-daf047838b26"),
+                            ContactName = "Admin",
+                            ContactNumber = "123456789",
+                            Description = "",
+                            DomainName = "www.marcobms.org",
+                            IndustryId = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            IsActive = true,
+                            Name = "MarcoBMS",
+                            OnBoardingDate = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            OragnizationSize = "100-200"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("CommentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MessageText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentMessageId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("SentAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TicketComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("LinkedActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("LinkedProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("PriorityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("StatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PriorityId");
+
+                    b.HasIndex("StatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("Tickets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketTags");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTypeMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTypeMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("c74e5480-2b71-483c-8f4a-1a9c69c32603"),
+                            Description = "An identified problem that affects the performance, reliability, or standards of a product or service",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("d1f55eab-9898-4e46-9f03-b263e33e5d38"),
+                            Description = "A support service that assists users with technical issues, requests, or inquiries.",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("MailListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Recipient")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Schedule")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MailListId");
+
+                    b.ToTable("MailDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmailId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailingList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Keywords")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailingList");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ActivityName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("UnitOfMeasurement")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ActivityMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("ModuleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModuleId");
+
+                    b.ToTable("Features");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            Description = "Manage Project",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            Description = "Manage Infra",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            Description = "Manage Tasks",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Task Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            Description = "Manage Employee",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Employee Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            Description = "Attendance",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            Description = "Global Masters",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Global Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            Description = "Managing all directory related rights",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Directory Management"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Industry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Industries");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            Name = "Information Technology (IT) Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("0a63e657-2c5f-49b5-854b-42c978293154"),
+                            Name = "Manufacturing & Production"
+                        },
+                        new
+                        {
+                            Id = new Guid("bdc61e3b-69ea-4394-bab6-079ec135b5bd"),
+                            Name = "Energy & Resources"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ca200ac-00d7-415e-a410-b948e27ac9d2"),
+                            Name = "Finance & Professional Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("d5621700-cd87-441f-8cdb-6051ddfc83b4"),
+                            Name = "Hospitals and Healthcare Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("23608891-657e-40f0-bbd4-2b0a2ec1a76f"),
+                            Name = "Social Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("a493f4e3-16b1-4411-be3c-6bf2987a3168"),
+                            Name = "Retail & Consumer Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("e9d8ce92-9371-4ed9-9831-83c07f78edec"),
+                            Name = "Transportation & Logistics"
+                        },
+                        new
+                        {
+                            Id = new Guid("8a0d6134-2dbe-4e0a-b250-ff34cb7b9df0"),
+                            Name = "Education & Training"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Module", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Modules");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Description = "Project Module",
+                            Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02",
+                            Name = "Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Description = "Employee Module",
+                            Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637",
+                            Name = "Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Description = "Masters Module",
+                            Key = "504ec132-e6a9-422f-8f85-050602cfce05",
+                            Name = "Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("StatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            Status = "Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Status = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "On Hold",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
+                            Status = "Completed",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketPriorityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Level")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketPriorityMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("188d29b3-10f3-42d0-9587-1a46ae7a0320"),
+                            ColorCode = "008000",
+                            IsDefault = true,
+                            Level = 1,
+                            Name = "Low",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("0919bc84-9f82-4ecf-98c7-962755dd9a97"),
+                            ColorCode = "FFFF00",
+                            IsDefault = true,
+                            Level = 2,
+                            Name = "Medium",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 3,
+                            Name = "High",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 4,
+                            Name = "Critical",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("44a7b91d-a0dd-45d1-8616-4d2f71e16401"),
+                            ColorCode = "#FF0000",
+                            IsDefault = true,
+                            Level = 5,
+                            Name = "Urgent",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6b0c409b-3e80-4165-8b39-f3fcacb4c797"),
+                            ColorCode = "#FFCC99",
+                            Description = "This is a newly created issue.",
+                            IsDefault = true,
+                            Name = "New",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("6c5ac37d-5b7d-40f3-adec-2dabaa5cca86"),
+                            ColorCode = "#E6FF99",
+                            Description = "Assigned to employee or team of employees",
+                            IsDefault = true,
+                            Name = "Assigned",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("7f96bcd5-0c66-411b-8a1d-9d1a4785194e"),
+                            ColorCode = "#99E6FF",
+                            Description = "These issues are currently in progress",
+                            IsDefault = true,
+                            Name = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5c72b630-6923-4215-bf2c-b1622afd76e7"),
+                            ColorCode = "#6c757d",
+                            Description = "These issues are currently under review",
+                            IsDefault = true,
+                            Name = "In Review",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("8ff85685-a875-4f21-aa95-d99551315fcc"),
+                            ColorCode = "#B399FF",
+                            Description = "The following issues are resolved and closed",
+                            IsDefault = true,
+                            Name = "Done",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTagMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("ef6c2a65-f61d-4537-9650-a7ab7f8d98db"),
+                            ColorCode = "#e59866",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5a168569-8ad7-4422-8db6-51ef25caddeb"),
+                            ColorCode = "#85c1e9",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkCategoryMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("86bb2cc8-f6b5-4fdd-bbee-c389c713a44b"),
+                            Description = "Created new task in a professional or creative context",
+                            IsSystem = true,
+                            Name = "Fresh Work",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("9ebfa19c-53b9-481b-b863-c25d2f843201"),
+                            Description = "Revising, modifying, or correcting a task to improve its quality or fix issues",
+                            IsSystem = true,
+                            Name = "Rework",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("11a79929-1d07-42dc-9e98-82d0d2f4a240"),
+                            Description = "Any defect, deviation, or non-conformance in a task that fails to meet established standards or customer expectations.",
+                            IsSystem = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buildings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BuildingId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Floor");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProjectAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ShortName")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectStatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Projects");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("85bf587b-7ca9-4685-b77c-d817f5847e85"),
+                            ContactPerson = "Project 1 Contact Person",
+                            EndDate = new DateTime(2026, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            Name = "Project 1",
+                            ProjectAddress = "Project 1 Address",
+                            ProjectStatusId = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            StartDate = new DateTime(2025, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReAllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ProjectAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AreaName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FloorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FloorId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkAreas");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("CompletedWork")
+                        .HasColumnType("double");
+
+                    b.Property<double>("PlannedWork")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime>("TaskDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkAreaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActivityId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkAreaId");
+
+                    b.HasIndex("WorkCategoryId");
+
+                    b.ToTable("WorkItems");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ApplicationRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("JobRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Utilities.Inquiries", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("About")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrganizatioinName")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Inquiries");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("varchar(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator().HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("IsRootUser")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("AssignedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem")
+                        .WithMany()
+                        .HasForeignKey("WorkItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkItem");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("CommentedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Approver")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Approver");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.AttendanceModule.Attendance", "Attendance")
+                        .WithMany()
+                        .HasForeignKey("AttendanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.DocumentManager.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedByEmployee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy");
+
+                    b.Navigation("Attendance");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedByEmployee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedByID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.ContactCategoryMaster", "ContactCategory")
+                        .WithMany()
+                        .HasForeignKey("ContactCategoryId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ContactCategory");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Createdby")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Createdby");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.ContactTagMaster", "ContactTag")
+                        .WithMany()
+                        .HasForeignKey("ContactTagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("ContactTag");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationUser", "ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.HasOne("Marco.Pms.Model.Roles.JobRole", "JobRole")
+                        .WithMany()
+                        .HasForeignKey("JobRoleId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("JobRole");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Role");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Feature", "Feature")
+                        .WithMany("FeaturePermissions")
+                        .HasForeignKey("FeatureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feature");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.FeaturePermission", null)
+                        .WithMany()
+                        .HasForeignKey("FeaturePermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Industry", "Industry")
+                        .WithMany()
+                        .HasForeignKey("IndustryId");
+
+                    b.Navigation("Industry");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Forum.TicketComment", "TicketComment")
+                        .WithMany("Attachments")
+                        .HasForeignKey("CommentId");
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ticket");
+
+                    b.Navigation("TicketComment");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketPriorityMaster", "Priority")
+                        .WithMany()
+                        .HasForeignKey("PriorityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.TicketStatusMaster", "TicketStatusMaster")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketTypeMaster", "TicketTypeMaster")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Priority");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("TicketStatusMaster");
+
+                    b.Navigation("TicketTypeMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketTagMaster", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+
+                    b.Navigation("Ticket");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Mail.MailingList", "MailBody")
+                        .WithMany()
+                        .HasForeignKey("MailListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MailBody");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Module", "Module")
+                        .WithMany()
+                        .HasForeignKey("ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Building", "Building")
+                        .WithMany()
+                        .HasForeignKey("BuildingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Building");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.StatusMaster", "ProjectStatus")
+                        .WithMany()
+                        .HasForeignKey("ProjectStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProjectStatus");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .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("Employee");
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Floor", "Floor")
+                        .WithMany()
+                        .HasForeignKey("FloorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Floor");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.ActivityMaster", "ActivityMaster")
+                        .WithMany()
+                        .HasForeignKey("ActivityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea")
+                        .WithMany()
+                        .HasForeignKey("WorkAreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkCategoryMaster", "WorkCategoryMaster")
+                        .WithMany()
+                        .HasForeignKey("WorkCategoryId");
+
+                    b.Navigation("ActivityMaster");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkArea");
+
+                    b.Navigation("WorkCategoryMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Navigation("FeaturePermissions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.cs b/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.cs
new file mode 100644
index 0000000..b451456
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.cs
@@ -0,0 +1,36 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_TaskAttachments_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "TaskAttachments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ReferenceId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    DocumentId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TaskAttachments", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "TaskAttachments");
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
index 26c3f80..245470a 100644
--- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -63,6 +63,23 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.ToTable("TaskAllocations");
                 });
 
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ReferenceId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskAttachments");
+                });
+
             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
                 {
                     b.Property<Guid>("Id")
diff --git a/Marco.Pms.Model/Activities/TaskAttachment.cs b/Marco.Pms.Model/Activities/TaskAttachment.cs
new file mode 100644
index 0000000..a270a79
--- /dev/null
+++ b/Marco.Pms.Model/Activities/TaskAttachment.cs
@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.Activities
+{
+    public class TaskAttachment
+    {
+        public Guid Id { get; set; }
+        public Guid ReferenceId { get; set; }
+        public Guid DocumentId { get; set; }
+    }
+}
diff --git a/Marco.Pms.Model/Activities/TaskImages.cs b/Marco.Pms.Model/Activities/TaskImages.cs
deleted file mode 100644
index 6171ae2..0000000
--- a/Marco.Pms.Model/Activities/TaskImages.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-
-namespace Marco.Pms.Model.Activities
-{
-    public class TaskImages
-    {
-        public Guid Id { get; set; }
-
-        public Guid TaskAllocationId { get; set; }
-        [ValidateNever]
-        [ForeignKey(nameof(TaskAllocationId))]
-        public TaskAllocation? TaskAllocation { get; set; }
-
-        public string? ImagePath { get; set; }
-    }
-}
diff --git a/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs b/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
index 551f024..13eb9b5 100644
--- a/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
@@ -1,4 +1,6 @@
-namespace Marco.Pms.Model.Dtos.Activities
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.Activities
 {
     public class ReportTaskDto
     {
@@ -7,5 +9,6 @@
         public DateTime ReportedDate { get; set; }
         public string? Comment { get; set; }
         public List<ReportCheckListDto>? CheckList { get; set; }
+        public List<FileUploadModel>? Images { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Directory/UpdateContactDto.cs b/Marco.Pms.Model/Dtos/Directory/UpdateContactDto.cs
index c648db0..16c8645 100644
--- a/Marco.Pms.Model/Dtos/Directory/UpdateContactDto.cs
+++ b/Marco.Pms.Model/Dtos/Directory/UpdateContactDto.cs
@@ -8,7 +8,7 @@
         public List<UpdateContactPhoneDto>? ContactPhones { get; set; }
         public List<UpdateContactEmailDto>? ContactEmails { get; set; }
         public List<Guid>? BucketIds { get; set; }
-        public Guid ContactCategoryId { get; set; }
+        public Guid? ContactCategoryId { get; set; }
         public string? Description { get; set; }
         public string? Organization { get; set; }
         public string? Address { get; set; }
diff --git a/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
index c7b8357..0e27d9d 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
@@ -10,7 +10,6 @@
         public string? Description { get; set; }
         public Guid AssignedBy { get; set; }
         public Guid WorkItemId { get; set; }
-
         public List<CommentVM>? Comments { get; set; }
         public List<CheckListVM>? checkList { get; set; }
     }
diff --git a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
index d6a09a9..f6d0fee 100644
--- a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
@@ -13,6 +13,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public string? Description { get; set; }
         public string? AssignBy { get; set; }
         public WorkItem? WorkItem { get; set; }
+        List<string>? preSignedUrls { get; set; }
         public List<CommentVM>? Comments { get; set; }
         public List<EmployeeVM>? TeamMembers { get; set; }
     }
diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 5c7104d..efaaed0 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -688,7 +688,6 @@ namespace MarcoBMS.Services.Controllers
                 }
                 Document? document = null;
                 var Image = recordAttendanceDot.Image;
-                var objectKey = string.Empty;
                 var preSignedUrl = string.Empty;
 
                 if (Image != null && Image.ContentType != null)
@@ -697,7 +696,16 @@ namespace MarcoBMS.Services.Controllers
                     if (string.IsNullOrEmpty(Image.Base64Data))
                         return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
 
-                    objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, TenantId, "attendance");
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, TenantId, "attendance");
+
+                    string objectKey = $"tenant-{TenantId}/Employee/{recordAttendanceDot.EmployeeID}/Attendance/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
                     preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(objectKey);
 
                     document = new Document
diff --git a/Marco.Pms.Services/Controllers/ForumController.cs b/Marco.Pms.Services/Controllers/ForumController.cs
index b46edb1..f50a077 100644
--- a/Marco.Pms.Services/Controllers/ForumController.cs
+++ b/Marco.Pms.Services/Controllers/ForumController.cs
@@ -68,7 +68,16 @@ namespace Marco.Pms.Services.Controllers
                         return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
                     }
 
-                    var objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, tenantId, "forum");
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "forum");
+
+                    string objectKey = $"tenant-{tenantId}/project-{createTicketDto.LinkedProjectId}/froum/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
                     Document document = attachmentDto.ToDocumentFromForumAttachmentDto(objectKey, objectKey, createTicketDto.CreatedAt, tenantId);
                     _context.Documents.Add(document);
@@ -182,7 +191,16 @@ namespace Marco.Pms.Services.Controllers
                                 return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
                             }
 
-                            var objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, tenantId, "forum");
+                            //If base64 has a data URI prefix, strip it
+                            var base64 = Image.Base64Data.Contains(",")
+                                ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                                : Image.Base64Data;
+
+                            string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                            string fileName = _s3Service.GenerateFileName(fileType, tenantId, "forum");
+
+                            string objectKey = $"tenant-{tenantId}/project-{updateTicketDto.LinkedProjectId}/froum/{fileName}";
+                            await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
                             Document document = attachmentDto.ToDocumentFromUpdateAttachmentDto(objectKey, objectKey, updateTicketDto.CreatedAt, tenantId);
                             _context.Documents.Add(document);
@@ -329,6 +347,14 @@ namespace Marco.Pms.Services.Controllers
             List<TicketAttachment> attachments = new List<TicketAttachment>();
             List<Document> documents = new List<Document>();
 
+            TicketForum? ticket = await _context.Tickets.FirstOrDefaultAsync(t => t.Id == addCommentDto.TicketId);
+
+            if (ticket == null)
+            {
+                _logger.LogError("Ticket {TicketId} not Found in database", addCommentDto.TicketId);
+                return NotFound(ApiResponse<object>.ErrorResponse("Ticket not Found", "Ticket not Found", 404));
+            }
+
             TicketComment comment = addCommentDto.ToTicketCommentFromAddCommentDto(tenantId);
             _context.TicketComments.Add(comment);
             await _context.SaveChangesAsync();
@@ -344,7 +370,16 @@ namespace Marco.Pms.Services.Controllers
                         return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
                     }
 
-                    var objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, tenantId, "forum");
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "forum");
+
+                    string objectKey = $"tenant-{tenantId}/project-{ticket.LinkedProjectId}/froum/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
                     Document document = attachmentDto.ToDocumentFromForumAttachmentDto(objectKey, objectKey, addCommentDto.SentAt, tenantId);
                     _context.Documents.Add(document);
@@ -396,6 +431,14 @@ namespace Marco.Pms.Services.Controllers
             Guid tenantId = _userHelper.GetTenantId();
             List<TicketAttachment> attachments = new List<TicketAttachment>();
 
+            TicketForum? ticket = await _context.Tickets.FirstOrDefaultAsync(t => t.Id == updateCommentDto.TicketId);
+
+            if (ticket == null)
+            {
+                _logger.LogError("Ticket {TicketId} not Found in database", updateCommentDto.TicketId);
+                return NotFound(ApiResponse<object>.ErrorResponse("Ticket not Found", "Ticket not Found", 404));
+            }
+
             TicketComment existingComment = await _context.TicketComments.AsNoTracking().FirstOrDefaultAsync(c => c.Id == updateCommentDto.Id) ?? new TicketComment();
             TicketComment updateComment = updateCommentDto.ToTicketCommentFromUpdateCommentDto(tenantId, existingComment);
             _context.TicketComments.Update(updateComment);
@@ -419,7 +462,16 @@ namespace Marco.Pms.Services.Controllers
                             return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
                         }
 
-                        var objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, tenantId, "forum");
+                        //If base64 has a data URI prefix, strip it
+                        var base64 = Image.Base64Data.Contains(",")
+                            ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                            : Image.Base64Data;
+
+                        string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                        string fileName = _s3Service.GenerateFileName(fileType, tenantId, "forum");
+
+                        string objectKey = $"tenant-{tenantId}/project-{ticket.LinkedProjectId}/froum/{fileName}";
+                        await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
                         Document document = attachmentDto.ToDocumentFromUpdateAttachmentDto(objectKey, objectKey, existingComment.SentAt, tenantId);
                         _context.Documents.Add(document);
@@ -491,6 +543,16 @@ namespace Marco.Pms.Services.Controllers
             Guid tenantId = _userHelper.GetTenantId();
             List<TicketAttachmentVM> ticketAttachmentVMs = new List<TicketAttachmentVM>();
 
+            List<Guid> ticketIds = forumAttachmentDtos.Select(f => f.TicketId.HasValue ? f.TicketId.Value : Guid.Empty).ToList();
+
+            List<TicketForum> tickets = await _context.Tickets.Where(t => ticketIds.Contains(t.Id)).ToListAsync();
+
+            if (tickets == null || tickets.Count > 0)
+            {
+                _logger.LogError("Tickets not Found in database");
+                return NotFound(ApiResponse<object>.ErrorResponse("Ticket not Found", "Ticket not Found", 404));
+            }
+
             TicketAttachment attachment = new TicketAttachment();
 
             foreach (var forumAttachmentDto in forumAttachmentDtos)
@@ -505,7 +567,17 @@ namespace Marco.Pms.Services.Controllers
                     _logger.LogError("ticket ID is missing");
                     return BadRequest(ApiResponse<object>.ErrorResponse("ticket ID is missing", "ticket ID is missing", 400));
                 }
-                var objectKey = await _s3Service.UploadFileAsync(forumAttachmentDto.Base64Data, tenantId, "forum");
+                var ticket = tickets.FirstOrDefault(t => t.Id == forumAttachmentDto.TicketId);
+                //If base64 has a data URI prefix, strip it
+                var base64 = forumAttachmentDto.Base64Data.Contains(",")
+                    ? forumAttachmentDto.Base64Data.Substring(forumAttachmentDto.Base64Data.IndexOf(",") + 1)
+                    : forumAttachmentDto.Base64Data;
+
+                string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                string fileName = _s3Service.GenerateFileName(fileType, tenantId, "forum");
+
+                string objectKey = $"tenant-{tenantId}/project-{ticket?.LinkedProjectId}/froum/{fileName}";
+                await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
                 Document document = forumAttachmentDto.ToDocumentFromForumAttachmentDto(objectKey, objectKey, forumAttachmentDto.SentAt, tenantId);
                 _context.Documents.Add(document);
diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index 3512081..7835e8d 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -749,11 +749,11 @@ namespace Marco.Pms.Services.Controllers
             return Ok(response);
         }
 
-        [HttpGet("contact-tag/{id}")]
-        public async Task<IActionResult> GetContactTagMaster(Guid id)
-        {
-            return Ok();
-        }
+        //[HttpGet("contact-tag/{id}")]
+        //public async Task<IActionResult> GetContactTagMaster(Guid id)
+        //{
+        //    return Ok();
+        //}
 
         [HttpPost("contact-tag")]
         public async Task<IActionResult> CreateContactTagMaster([FromBody] CreateContactTagDto contactTagDto)
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index ab2af78..16fea57 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -8,10 +8,13 @@ using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Activities;
 using Marco.Pms.Model.ViewModels.Employee;
+using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
+using Document = Marco.Pms.Model.DocumentManager.Document;
 
 namespace MarcoBMS.Services.Controllers
 {
@@ -23,12 +26,14 @@ namespace MarcoBMS.Services.Controllers
     {
         private readonly ApplicationDbContext _context;
         private readonly UserHelper _userHelper;
+        private readonly S3UploadService _s3Service;
 
 
-        public TaskController(ApplicationDbContext context, UserHelper userHelper)
+        public TaskController(ApplicationDbContext context, UserHelper userHelper, S3UploadService s3Service)
         {
             _context = context;
             _userHelper = userHelper;
+            _s3Service = s3Service;
         }
 
         private Guid GetTenantId()
@@ -84,7 +89,6 @@ namespace MarcoBMS.Services.Controllers
             return Ok(ApiResponse<object>.SuccessResponse(response, "Task assignned successfully", 200));
         }
 
-
         [HttpPost("report")]
         public async Task<IActionResult> ReportTaskProgress([FromBody] ReportTaskDto reportTask)
         {
@@ -104,10 +108,13 @@ namespace MarcoBMS.Services.Controllers
 
             var checkListIds = reportTask.CheckList != null ? reportTask.CheckList.Select(c => c.Id).ToList() : new List<Guid>();
             var checkList = await _context.ActivityCheckLists.Where(c => checkListIds.Contains(c.Id)).ToListAsync();
-            if (taskAllocation == null)
+            if (taskAllocation == null || taskAllocation.WorkItem == null)
             {
                 return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400));
             }
+            WorkArea workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == taskAllocation.WorkItem.WorkAreaId) ?? new WorkArea();
+
+            var bulding = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty));
             if (taskAllocation.WorkItem != null)
             {
                 if (taskAllocation.CompletedTask != 0)
@@ -143,6 +150,49 @@ namespace MarcoBMS.Services.Controllers
             _context.CheckListMappings.AddRange(checkListMappings);
             var comment = reportTask.ToCommentFromReportTaskDto(tenantId, Employee.Id);
 
+            var Images = reportTask.Images;
+
+            if (Images != null && Images.Count > 0)
+            {
+
+                foreach (var Image in Images)
+                {
+
+                    if (string.IsNullOrEmpty(Image.Base64Data))
+                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_report");
+
+                    string objectKey = $"tenant-{tenantId}/project-{bulding?.ProjectId}/Actitvity/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
+
+                    Document document = new Document
+                    {
+                        FileName = Image.FileName ?? "",
+                        ContentType = Image.ContentType ?? "",
+                        S3Key = objectKey,
+                        Base64Data = Image.Base64Data,
+                        FileSize = Image.FileSize,
+                        UploadedAt = DateTime.UtcNow,
+                        TenantId = tenantId
+                    };
+                    _context.Documents.Add(document);
+                    TaskAttachment attachment = new TaskAttachment
+                    {
+                        DocumentId = document.Id,
+                        ReferenceId = reportTask.Id
+                    };
+                    _context.TaskAttachments.Add(attachment);
+                }
+                await _context.SaveChangesAsync();
+            }
+
             _context.TaskComments.Add(comment);
             await _context.SaveChangesAsync();
 
diff --git a/Marco.Pms.Services/Service/S3UploadService.cs b/Marco.Pms.Services/Service/S3UploadService.cs
index 5e47245..c29cfdd 100644
--- a/Marco.Pms.Services/Service/S3UploadService.cs
+++ b/Marco.Pms.Services/Service/S3UploadService.cs
@@ -28,53 +28,46 @@ namespace Marco.Pms.Services.Service
             _s3Client = new AmazonS3Client(settings.AccessKey, settings.SecretKey, region);
         }
         //public async Task<string> UploadFileAsync(string fileName, string contentType)
-        public async Task<string> UploadFileAsync(string base64Data, Guid tenantId, string tag)
+        public async Task UploadFileAsync(string base64, string fileType, string objectKey)
         {
             byte[] fileBytes;
 
-            //If base64 has a data URI prefix, strip it
-            var base64 = base64Data.Contains(",")
-                ? base64Data.Substring(base64Data.IndexOf(",") + 1)
-                : base64Data;
+
             var allowedFilesType = _configuration.GetSection("WhiteList:ContentType")
                                                 .GetChildren()
                                                 .Select(x => x.Value)
                                                 .ToList();
-            string fileType = GetContentTypeFromBase64(base64);
-            if (allowedFilesType != null && allowedFilesType.Contains(fileType))
+
+            if (allowedFilesType == null || !allowedFilesType.Contains(fileType))
             {
-                string fileName = GenerateFileName(fileType, tenantId, tag);
-
-                fileBytes = Convert.FromBase64String(base64);
-
-
-                using var fileStream = new MemoryStream(fileBytes);
-
-                // Generate a unique object key (you can customize this)
-                var objectKey = $"{fileName}";
-
-                var uploadRequest = new TransferUtilityUploadRequest
-                {
-                    InputStream = fileStream,
-                    Key = objectKey,
-                    BucketName = _bucketName,
-                    ContentType = fileType,
-                    AutoCloseStream = true
-                };
-                try
-                {
-                    var transferUtility = new TransferUtility(_s3Client);
-                    await transferUtility.UploadAsync(uploadRequest);
-                    _logger.LogInfo("File uploaded to Amazon S3");
-                    return objectKey;
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError("{error} while uploading file to S3", ex.Message);
-                    return string.Empty;
-                }
+                throw new InvalidOperationException("Unsupported file type.");
             }
-            throw new InvalidOperationException("Unsupported file type.");
+
+            fileBytes = Convert.FromBase64String(base64);
+
+
+            using var fileStream = new MemoryStream(fileBytes);
+
+            var uploadRequest = new TransferUtilityUploadRequest
+            {
+                InputStream = fileStream,
+                Key = objectKey,
+                BucketName = _bucketName,
+                ContentType = fileType,
+                AutoCloseStream = true
+            };
+            try
+            {
+                var transferUtility = new TransferUtility(_s3Client);
+                await transferUtility.UploadAsync(uploadRequest);
+                _logger.LogInfo("File uploaded to Amazon S3");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("{error} while uploading file to S3", ex.Message);
+            }
+
+
         }
         public string GeneratePreSignedUrlAsync(string objectKey)
         {
-- 
2.43.0


From 76b6ac6581d695e42ab70f2ffa4092d1bf00bd77 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 17:02:18 +0530
Subject: [PATCH 04/48] Implemented the image capture while writing comment in
 task allocation and add presignedurl in task get by in API

---
 .../Dtos/Activities/CreateCommentDto.cs       |  7 +-
 .../ViewModels/Activities/CommentVM.cs        |  1 +
 .../ViewModels/Activities/TaskVM.cs           |  2 +-
 .../Controllers/TaskController.cs             | 79 ++++++++++++++++++-
 4 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs b/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs
index 9a2518c..816f3be 100644
--- a/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs
@@ -1,11 +1,12 @@
-namespace Marco.Pms.Model.Dtos.Activities
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.Activities
 {
     public class CreateCommentDto
     {
         public Guid TaskAllocationId { get; set; }
-
         public DateTime CommentDate { get; set; }
         public string? Comment { get; set; }
-
+        public List<FileUploadModel>? Images { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs b/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs
index fec0069..73701e0 100644
--- a/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs
@@ -8,5 +8,6 @@
         public string? Comment { get; set; }
         public Guid CommentedBy { get; set; }
         public BasicEmployeeVM? Employee { get; set; }
+        public List<string>? PreSignedUrls { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
index f6d0fee..18a29b0 100644
--- a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
@@ -13,7 +13,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public string? Description { get; set; }
         public string? AssignBy { get; set; }
         public WorkItem? WorkItem { get; set; }
-        List<string>? preSignedUrls { get; set; }
+        public List<string>? PreSignedUrls { get; set; }
         public List<CommentVM>? Comments { get; set; }
         public List<EmployeeVM>? TeamMembers { get; set; }
     }
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index 16fea57..e81f6fe 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -214,10 +214,62 @@ namespace MarcoBMS.Services.Controllers
             var tenantId = GetTenantId();
             var Employee = await _userHelper.GetCurrentEmployeeAsync();
 
+            var taskAllocation = await _context.TaskAllocations.Include(t => t.WorkItem).FirstOrDefaultAsync(t => t.Id == createComment.TaskAllocationId);
+            if (taskAllocation == null || taskAllocation.WorkItem == null)
+            {
+                return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400));
+            }
+            WorkArea workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == taskAllocation.WorkItem.WorkAreaId) ?? new WorkArea();
+
+            var bulding = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty));
+
             var comment = createComment.ToCommentFromCommentDto(tenantId, Employee.Id);
             _context.TaskComments.Add(comment);
             await _context.SaveChangesAsync();
 
+            var Images = createComment.Images;
+
+            if (Images != null && Images.Count > 0)
+            {
+
+                foreach (var Image in Images)
+                {
+
+                    if (string.IsNullOrEmpty(Image.Base64Data))
+                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_report");
+
+                    string objectKey = $"tenant-{tenantId}/project-{bulding?.ProjectId}/Actitvity/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
+
+                    Document document = new Document
+                    {
+                        FileName = Image.FileName ?? "",
+                        ContentType = Image.ContentType ?? "",
+                        S3Key = objectKey,
+                        Base64Data = Image.Base64Data,
+                        FileSize = Image.FileSize,
+                        UploadedAt = DateTime.UtcNow,
+                        TenantId = tenantId
+                    };
+                    _context.Documents.Add(document);
+                    TaskAttachment attachment = new TaskAttachment
+                    {
+                        DocumentId = document.Id,
+                        ReferenceId = comment.Id
+                    };
+                    _context.TaskAttachments.Add(attachment);
+                }
+                await _context.SaveChangesAsync();
+            }
+
             CommentVM response = comment.ToCommentVMFromTaskComment();
             return Ok(ApiResponse<object>.SuccessResponse(response, "Comment saved successfully", 200));
         }
@@ -330,8 +382,23 @@ namespace MarcoBMS.Services.Controllers
                 if (taskAllocation == null) return NotFound(ApiResponse<object>.ErrorResponse("Task Not Found", "Task not found", 404));
                 var taskVM = taskAllocation.TaskAllocationToTaskVM(employeeName);
                 var comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
+                var commentIds = comments.Select(c => c.Id).ToList();
+                var taskAttachments = await _context.TaskAttachments.Where(t => t.ReferenceId == taskAllocation.Id || commentIds.Contains(t.ReferenceId)).ToListAsync();
+                var documentIds = taskAttachments.Select(t => t.DocumentId).ToList();
+                var documents = await _context.Documents.Where(d => documentIds.Contains(d.Id)).ToListAsync();
                 var team = await _context.TaskMembers.Where(m => m.TaskAllocationId == taskAllocation.Id).Include(m => m.Employee).ToListAsync();
                 var teamMembers = new List<EmployeeVM> { };
+
+                var taskDocumentIds = taskAttachments.Where(t => t.ReferenceId == taskAllocation.Id).Select(t => t.DocumentId).ToList();
+                var taskDocuments = documents.Where(d => taskDocumentIds.Contains(d.Id)).ToList();
+
+                List<string> taskPreSignedUrls = new List<string>();
+                foreach (var document in taskDocuments)
+                {
+                    string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
+                    taskPreSignedUrls.Add(preSignedUrl);
+                }
+                taskVM.PreSignedUrls = taskPreSignedUrls;
                 foreach (var member in team)
                 {
                     var result = member.Employee != null ? member.Employee.ToEmployeeVMFromEmployee() : new EmployeeVM();
@@ -340,7 +407,17 @@ namespace MarcoBMS.Services.Controllers
                 List<CommentVM> Comments = new List<CommentVM> { };
                 foreach (var comment in comments)
                 {
-                    Comments.Add(comment.ToCommentVMFromTaskComment());
+                    var commentDocumentIds = taskAttachments.Where(t => t.ReferenceId == comment.Id).Select(t => t.DocumentId).ToList();
+                    var commentDocuments = documents.Where(d => commentDocumentIds.Contains(d.Id)).ToList();
+                    List<string> commentPreSignedUrls = new List<string>();
+                    foreach (var document in commentDocuments)
+                    {
+                        string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
+                        commentPreSignedUrls.Add(preSignedUrl);
+                    }
+                    CommentVM commentVM = comment.ToCommentVMFromTaskComment();
+                    commentVM.PreSignedUrls = commentPreSignedUrls;
+                    Comments.Add(commentVM);
                 }
                 taskVM.Comments = Comments;
                 taskVM.TeamMembers = teamMembers;
-- 
2.43.0


From 691a670a28327e0b7000c0f9c1147917f12f8b24 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 18:32:50 +0530
Subject: [PATCH 05/48] Sending pre signed url in task list API

---
 .../ViewModels/Activities/ListTaskVM.cs       |  1 +
 .../Controllers/TaskController.cs             | 33 +++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
index 409de50..6260e2a 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
@@ -11,6 +11,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public double CompletedTask { get; set; }
         public BasicEmployeeVM? AssignedBy { get; set; }
         public Guid WorkItemId { get; set; }
+        public List<string>? PreSignedUrls { get; set; }
         public WorkItem? WorkItem { get; set; }
         public List<BasicEmployeeVM>? teamMembers { get; set; }
         public List<CommentVM>? comments { get; set; }
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index e81f6fe..8c93170 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -317,6 +317,13 @@ namespace MarcoBMS.Services.Controllers
 
             List<Employee> employees = await _context.Employees.Where(e => employeeIdList.Contains(e.Id)).Include(e => e.JobRole).ToListAsync();
 
+            List<TaskComment> allComments = await _context.TaskComments.Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
+            var allCommentIds = allComments.Select(c => c.Id).ToList();
+
+            var taskAttachments = await _context.TaskAttachments.Where(t => taskIdList.Contains(t.ReferenceId) || allCommentIds.Contains(t.ReferenceId)).ToListAsync();
+            var documentIds = taskAttachments.Select(t => t.DocumentId).ToList();
+            var documents = await _context.Documents.Where(d => documentIds.Contains(d.Id)).ToListAsync();
+
             List<ListTaskVM> tasks = new List<ListTaskVM>();
             //foreach (var workItem in workItems)
             //{
@@ -325,10 +332,21 @@ namespace MarcoBMS.Services.Controllers
 
                 var response = taskAllocation.ToListTaskVMFromTaskAllocation();
 
-                List<TaskComment> comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
+                List<TaskComment> comments = allComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToList();
                 List<BasicEmployeeVM> team = new List<BasicEmployeeVM>();
                 List<TaskMembers> taskMembers = teamMembers.Where(m => m.TaskAllocationId == taskAllocation.Id).ToList();
 
+                var taskDocumentIds = taskAttachments.Where(t => t.ReferenceId == taskAllocation.Id).Select(t => t.DocumentId).ToList();
+                var taskDocuments = documents.Where(d => taskDocumentIds.Contains(d.Id)).ToList();
+
+                List<string> taskPreSignedUrls = new List<string>();
+                foreach (var document in taskDocuments)
+                {
+                    string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
+                    taskPreSignedUrls.Add(preSignedUrl);
+                }
+                response.PreSignedUrls = taskPreSignedUrls;
+
                 foreach (var taskMember in taskMembers)
                 {
                     var teamMember = employees.Find(e => e.Id == taskMember.EmployeeId);
@@ -340,7 +358,18 @@ namespace MarcoBMS.Services.Controllers
                 List<CommentVM> commentVM = new List<CommentVM> { };
                 foreach (var comment in comments)
                 {
-                    commentVM.Add(comment.ToCommentVMFromTaskComment());
+                    var commentDocumentIds = taskAttachments.Where(t => t.ReferenceId == comment.Id).Select(t => t.DocumentId).ToList();
+                    var commentDocuments = documents.Where(d => commentDocumentIds.Contains(d.Id)).ToList();
+                    List<string> commentPreSignedUrls = new List<string>();
+                    foreach (var document in commentDocuments)
+                    {
+                        string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
+                        commentPreSignedUrls.Add(preSignedUrl);
+                    }
+                    CommentVM commentVm = comment.ToCommentVMFromTaskComment();
+                    commentVm.PreSignedUrls = commentPreSignedUrls;
+
+                    commentVM.Add(commentVm);
                 }
                 List<ActivityCheckList> checkLists = await _context.ActivityCheckLists.Where(x => x.ActivityId == (taskAllocation.WorkItem != null ? taskAllocation.WorkItem.ActivityId : Guid.Empty)).ToListAsync();
                 List<CheckListMappings> checkListMappings = await _context.CheckListMappings.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
-- 
2.43.0


From 169e7f6601f0999cfb51a3515003322236c1fe42 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 20:53:24 +0530
Subject: [PATCH 06/48] Changed the keyword for updating and creating project

---
 Marco.Pms.Services/Controllers/ProjectController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 839a872..34a0384 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -282,7 +282,7 @@ namespace MarcoBMS.Services.Controllers
             _context.Projects.Add(project);
 
             await _context.SaveChangesAsync();
-            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Create_Project", Response = project.ToProjectDto() };
 
             await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
@@ -312,7 +312,7 @@ namespace MarcoBMS.Services.Controllers
 
                 await _context.SaveChangesAsync();
 
-                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Update_Project", Response = project.ToProjectDto() };
 
                 await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
-- 
2.43.0


From 8f2c828282190ee093d302f4eadffa1c5c68f4f0 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 11 Jun 2025 10:21:39 +0530
Subject: [PATCH 07/48] Add basic implementation and add in record attendance
 API for testing

---
 .../Controllers/AttendanceController.cs       |  7 +++-
 .../Controllers/MasterController.cs           | 10 +++---
 Marco.Pms.Services/Hub/MarcoHub.cs            | 35 +++++++++++++++++++
 Marco.Pms.Services/Marco.Pms.Services.csproj  |  1 +
 Marco.Pms.Services/Program.cs                 | 24 +++++++++++--
 .../appsettings.Development.json              |  2 +-
 6 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 Marco.Pms.Services/Hub/MarcoHub.cs

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 5c7104d..0fbc6b5 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -7,11 +7,13 @@ using Marco.Pms.Model.Mapper;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.AttendanceVM;
+using Marco.Pms.Services.Hubs;
 using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
 using Document = Marco.Pms.Model.DocumentManager.Document;
@@ -30,10 +32,11 @@ namespace MarcoBMS.Services.Controllers
         private readonly S3UploadService _s3Service;
         private readonly PermissionServices _permission;
         private readonly ILoggingService _logger;
+        private readonly IHubContext<MarcoHub> _signalR;
 
 
         public AttendanceController(
-             ApplicationDbContext context, EmployeeHelper employeeHelper, ProjectsHelper projectsHelper, UserHelper userHelper, S3UploadService s3Service, ILoggingService logger, PermissionServices permission)
+             ApplicationDbContext context, EmployeeHelper employeeHelper, ProjectsHelper projectsHelper, UserHelper userHelper, S3UploadService s3Service, ILoggingService logger, PermissionServices permission, IHubContext<MarcoHub> signalR)
         {
             _context = context;
             _employeeHelper = employeeHelper;
@@ -42,6 +45,7 @@ namespace MarcoBMS.Services.Controllers
             _s3Service = s3Service;
             _logger = logger;
             _permission = permission;
+            _signalR = signalR;
         }
 
         private Guid GetTenantId()
@@ -558,6 +562,7 @@ namespace MarcoBMS.Services.Controllers
                         Activity = attendance.Activity,
                         JobRoleName = employee.JobRole.Name
                     };
+                    await _signalR.Clients.All.SendAsync("Attendance", new { LoggedInUserId = currentEmployee.Id, ProjectId = recordAttendanceDot.ProjectID, Response = vm });
                     _logger.LogInfo("Attendance for employee {FirstName} {LastName} has been marked", employee.FirstName ?? string.Empty, employee.LastName ?? string.Empty);
                     return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
                 }
diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index 3512081..7835e8d 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -749,11 +749,11 @@ namespace Marco.Pms.Services.Controllers
             return Ok(response);
         }
 
-        [HttpGet("contact-tag/{id}")]
-        public async Task<IActionResult> GetContactTagMaster(Guid id)
-        {
-            return Ok();
-        }
+        //[HttpGet("contact-tag/{id}")]
+        //public async Task<IActionResult> GetContactTagMaster(Guid id)
+        //{
+        //    return Ok();
+        //}
 
         [HttpPost("contact-tag")]
         public async Task<IActionResult> CreateContactTagMaster([FromBody] CreateContactTagDto contactTagDto)
diff --git a/Marco.Pms.Services/Hub/MarcoHub.cs b/Marco.Pms.Services/Hub/MarcoHub.cs
new file mode 100644
index 0000000..bf6fc38
--- /dev/null
+++ b/Marco.Pms.Services/Hub/MarcoHub.cs
@@ -0,0 +1,35 @@
+using MarcoBMS.Services.Service;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.SignalR;
+
+namespace Marco.Pms.Services.Hubs
+{
+    [Authorize]
+    public class MarcoHub : Hub
+    {
+        private readonly ILoggingService _logger;
+        public MarcoHub(ILoggingService logger)
+        {
+            _logger = logger;
+        }
+        public async Task SendMessage(string user, string message)
+        {
+            _logger.LogInfo($"User: {user} Message : {message}");
+            await Clients.All.SendAsync("ReceiveMessage", user, message);
+        }
+        public override async Task OnConnectedAsync()
+        {
+            await base.OnConnectedAsync();
+            _logger.LogInfo($"Connected successfully");
+            await Clients.All.SendAsync("Connected successfully");
+        }
+
+        // Optional: override OnDisconnectedAsync
+        public override async Task OnDisconnectedAsync(Exception? exception)
+        {
+            await base.OnDisconnectedAsync(exception);
+            _logger.LogInfo($"DIsonnected successfully");
+            await Clients.All.SendAsync("Disonnected successfully");
+        }
+    }
+}
diff --git a/Marco.Pms.Services/Marco.Pms.Services.csproj b/Marco.Pms.Services/Marco.Pms.Services.csproj
index 6482198..7bef32f 100644
--- a/Marco.Pms.Services/Marco.Pms.Services.csproj
+++ b/Marco.Pms.Services/Marco.Pms.Services.csproj
@@ -17,6 +17,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.12" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.12" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.12">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Marco.Pms.Services/Program.cs b/Marco.Pms.Services/Program.cs
index e57fa15..17eb5c7 100644
--- a/Marco.Pms.Services/Program.cs
+++ b/Marco.Pms.Services/Program.cs
@@ -4,6 +4,7 @@ using Marco.Pms.Model.Authentication;
 using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Services.Helpers;
+using Marco.Pms.Services.Hubs;
 using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Middleware;
@@ -59,7 +60,8 @@ builder.Services.AddCors(options =>
     {
         policy.AllowAnyOrigin()
               .AllowAnyMethod()
-              .AllowAnyHeader();
+              .AllowAnyHeader()
+              .WithExposedHeaders("Authorization");
     });
 });
 
@@ -161,10 +163,28 @@ if (jwtSettings != null && jwtSettings.Key != null)
             ValidAudience = jwtSettings.Audience,
             IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtSettings.Key))
         };
+
+        options.Events = new JwtBearerEvents
+        {
+            OnMessageReceived = context =>
+            {
+                var accessToken = context.Request.Query["access_token"];
+                var path = context.HttpContext.Request.Path;
+
+                // Match your hub route here
+                if (!string.IsNullOrEmpty(accessToken) && path.StartsWithSegments("/hubs/marco"))
+                {
+                    context.Token = accessToken;
+                }
+
+                return Task.CompletedTask;
+            }
+        };
     });
     builder.Services.AddSingleton(jwtSettings);
 }
 
+builder.Services.AddSignalR();
 builder.WebHost.ConfigureKestrel(options =>
 {
     options.AddServerHeader = false; // Disable the "Server" header
@@ -207,7 +227,7 @@ app.UseHttpsRedirection();
 
 
 app.UseAuthorization();
-
+app.MapHub<MarcoHub>("/hubs/marco");
 app.MapControllers();
 
 app.Run();
diff --git a/Marco.Pms.Services/appsettings.Development.json b/Marco.Pms.Services/appsettings.Development.json
index 2cbcbcf..1565018 100644
--- a/Marco.Pms.Services/appsettings.Development.json
+++ b/Marco.Pms.Services/appsettings.Development.json
@@ -9,7 +9,7 @@
         "Title": "Dev"
     },
     "ConnectionStrings": {
-        "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMSGuid"
+        "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1"
     },
     "SmtpSettings": {
         "SmtpServer": "smtp.gmail.com",
-- 
2.43.0


From 0636c8aedd5156c73fb0406cf49936632406be4c Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 11:04:24 +0530
Subject: [PATCH 08/48] Implemented signalR in project infrastructure APIs

---
 .../Controllers/AttendanceController.cs       |  8 ++++-
 .../Controllers/ProjectController.cs          | 35 +++++++++++++++----
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 0fbc6b5..e0493af 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -562,7 +562,13 @@ namespace MarcoBMS.Services.Controllers
                         Activity = attendance.Activity,
                         JobRoleName = employee.JobRole.Name
                     };
-                    await _signalR.Clients.All.SendAsync("Attendance", new { LoggedInUserId = currentEmployee.Id, ProjectId = recordAttendanceDot.ProjectID, Response = vm });
+                    var sendActivity = 0;
+                    if (recordAttendanceDot.Id == Guid.Empty)
+                    {
+                        sendActivity = 1;
+                    }
+                    var notification = new { LoggedInUserId = currentEmployee.Id, Keyword = "Attendance", Activity = sendActivity, ProjectId = attendance.ProjectID, Response = vm };
+                    await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                     _logger.LogInfo("Attendance for employee {FirstName} {LastName} has been marked", employee.FirstName ?? string.Empty, employee.LastName ?? string.Empty);
                     return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
                 }
diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 18a790b..187497e 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -8,12 +8,13 @@ using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Employee;
 using Marco.Pms.Model.ViewModels.Projects;
+using Marco.Pms.Services.Hubs;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 
 namespace MarcoBMS.Services.Controllers
 {
@@ -27,15 +28,18 @@ namespace MarcoBMS.Services.Controllers
         private readonly ILoggingService _logger;
         private readonly RolesHelper _rolesHelper;
         private readonly ProjectsHelper _projectsHelper;
+        private readonly IHubContext<MarcoHub> _signalR;
 
 
-        public ProjectController(ApplicationDbContext context, UserHelper userHelper, ILoggingService logger, RolesHelper rolesHelper, ProjectsHelper projectHelper)
+        public ProjectController(ApplicationDbContext context, UserHelper userHelper, ILoggingService logger, RolesHelper rolesHelper, ProjectsHelper projectHelper, IHubContext<MarcoHub> signalR)
         {
             _context = context;
             _userHelper = userHelper;
             _logger = logger;
             _rolesHelper = rolesHelper;
             _projectsHelper = projectHelper;
+            _signalR = signalR;
+
         }
 
         [HttpGet("list/basic")]
@@ -314,6 +318,7 @@ namespace MarcoBMS.Services.Controllers
         [HttpPost]
         public async Task<IActionResult> Create([FromBody] CreateProjectDto projectDto)
         {
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             if (!ModelState.IsValid)
             {
                 var errors = ModelState.Values
@@ -330,6 +335,9 @@ namespace MarcoBMS.Services.Controllers
             _context.Projects.Add(project);
 
             await _context.SaveChangesAsync();
+            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+
+            await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
             return Ok(ApiResponse<object>.SuccessResponse(project.ToProjectDto(), "Success.", 200));
         }
@@ -338,6 +346,7 @@ namespace MarcoBMS.Services.Controllers
         [Route("update/{id}")]
         public async Task<IActionResult> Update([FromRoute] Guid id, [FromBody] UpdateProjectDto updateProjectDto)
         {
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             if (!ModelState.IsValid)
             {
                 var errors = ModelState.Values
@@ -356,6 +365,10 @@ namespace MarcoBMS.Services.Controllers
 
                 await _context.SaveChangesAsync();
 
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
+
                 return Ok(ApiResponse<object>.SuccessResponse(project.ToProjectDto(), "Success.", 200));
 
             }
@@ -365,7 +378,6 @@ namespace MarcoBMS.Services.Controllers
             }
         }
 
-
         //[HttpPost("assign-employee")]
         //public async Task<IActionResult> AssignEmployee(int? allocationid, int employeeId, int projectId)
         //{
@@ -576,6 +588,7 @@ namespace MarcoBMS.Services.Controllers
         public async Task<IActionResult> CreateProjectTask(List<WorkItemDot> workItemDot)
         {
             Guid tenantId = GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             List<WorkItemVM> workItems = new List<WorkItemVM> { };
             string responseMessage = "";
             if (workItemDot != null)
@@ -607,6 +620,10 @@ namespace MarcoBMS.Services.Controllers
                 }
                 var activity = await _context.ActivityMasters.ToListAsync();
                 var category = await _context.WorkCategoryMasters.ToListAsync();
+
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = workItems };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(workItems, responseMessage, 200));
             }
 
@@ -618,6 +635,7 @@ namespace MarcoBMS.Services.Controllers
         public async Task<IActionResult> DeleteProjectTask(Guid id)
         {
             Guid tenantId = _userHelper.GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             WorkItem? task = await _context.WorkItems.AsNoTracking().FirstOrDefaultAsync(t => t.Id == id && t.TenantId == tenantId);
             if (task != null)
             {
@@ -629,6 +647,9 @@ namespace MarcoBMS.Services.Controllers
                         _context.WorkItems.Remove(task);
                         await _context.SaveChangesAsync();
                         _logger.LogInfo("Task with ID {WorkItemId} has been successfully deleted.", task.Id);
+
+                        var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = id };
+                        await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                     }
                     else
                     {
@@ -656,6 +677,8 @@ namespace MarcoBMS.Services.Controllers
         public async Task<IActionResult> ManageProjectInfra(List<InfraDot> infraDots)
         {
             Guid tenantId = GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
             var responseData = new InfraVM { };
             string responseMessage = "";
             if (infraDots != null)
@@ -731,6 +754,9 @@ namespace MarcoBMS.Services.Controllers
                         }
                     }
                 }
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = responseData };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(responseData, responseMessage, 200));
             }
             return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Infra Details are not valid.", 400));
@@ -776,9 +802,6 @@ namespace MarcoBMS.Services.Controllers
             return Ok(ApiResponse<object>.SuccessResponse(projects, "Success.", 200));
         }
 
-
-
-
         [HttpPost("assign-projects/{employeeId}")]
         public async Task<ActionResult> AssigneProjectsToEmployee([FromBody] List<ProjectsAllocationDto> projectAllocationDtos, [FromRoute] Guid employeeId)
         {
-- 
2.43.0


From 790e9f63e182699ae607e0ac2e4acdbda9bbf9ba Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 20:53:24 +0530
Subject: [PATCH 09/48] Changed the keyword for updating and creating project

---
 Marco.Pms.Services/Controllers/ProjectController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 187497e..0cfd536 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -335,7 +335,7 @@ namespace MarcoBMS.Services.Controllers
             _context.Projects.Add(project);
 
             await _context.SaveChangesAsync();
-            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Create_Project", Response = project.ToProjectDto() };
 
             await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
@@ -365,7 +365,7 @@ namespace MarcoBMS.Services.Controllers
 
                 await _context.SaveChangesAsync();
 
-                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Update_Project", Response = project.ToProjectDto() };
 
                 await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
-- 
2.43.0


From 4ccc69056029a7b7748f8c004340fc11c51e75e1 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 21:35:40 +0530
Subject: [PATCH 10/48] Chnaged the name form presignedUrls to
 ReportedProsignedUrl

---
 Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs | 2 +-
 Marco.Pms.Services/Controllers/TaskController.cs    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
index 6260e2a..acb5bd9 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
@@ -11,7 +11,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public double CompletedTask { get; set; }
         public BasicEmployeeVM? AssignedBy { get; set; }
         public Guid WorkItemId { get; set; }
-        public List<string>? PreSignedUrls { get; set; }
+        public List<string>? ReportedPreSignedUrls { get; set; }
         public WorkItem? WorkItem { get; set; }
         public List<BasicEmployeeVM>? teamMembers { get; set; }
         public List<CommentVM>? comments { get; set; }
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index 8c93170..ea4fbf1 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -317,7 +317,7 @@ namespace MarcoBMS.Services.Controllers
 
             List<Employee> employees = await _context.Employees.Where(e => employeeIdList.Contains(e.Id)).Include(e => e.JobRole).ToListAsync();
 
-            List<TaskComment> allComments = await _context.TaskComments.Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
+            List<TaskComment> allComments = await _context.TaskComments.Include(c => c.Employee).Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
             var allCommentIds = allComments.Select(c => c.Id).ToList();
 
             var taskAttachments = await _context.TaskAttachments.Where(t => taskIdList.Contains(t.ReferenceId) || allCommentIds.Contains(t.ReferenceId)).ToListAsync();
@@ -345,7 +345,7 @@ namespace MarcoBMS.Services.Controllers
                     string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
                     taskPreSignedUrls.Add(preSignedUrl);
                 }
-                response.PreSignedUrls = taskPreSignedUrls;
+                response.ReportedPreSignedUrls = taskPreSignedUrls;
 
                 foreach (var taskMember in taskMembers)
                 {
-- 
2.43.0


From f275d082151ff0eae634007ef574d7f763413671 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 16:09:28 +0530
Subject: [PATCH 11/48] Implemented image storing to S3 while reporting task

---
 .../Data/ApplicationDbContext.cs              |    1 +
 ...43_Added_TaskAttachments_Table.Designer.cs | 3269 +++++++++++++++++
 ...50612094243_Added_TaskAttachments_Table.cs |   36 +
 .../ApplicationDbContextModelSnapshot.cs      |   17 +
 Marco.Pms.Model/Activities/TaskAttachment.cs  |    9 +
 Marco.Pms.Model/Activities/TaskImages.cs      |   17 -
 .../Dtos/Activities/ReportTaskDto.cs          |    5 +-
 .../Dtos/Directory/UpdateContactDto.cs        |    2 +-
 .../ViewModels/Activities/ReportTaskVM.cs     |    1 -
 .../ViewModels/Activities/TaskVM.cs           |    1 +
 .../Controllers/AttendanceController.cs       |   12 +-
 .../Controllers/ForumController.cs            |   82 +-
 .../Controllers/MasterController.cs           |   10 +-
 .../Controllers/TaskController.cs             |   56 +-
 Marco.Pms.Services/Service/S3UploadService.cs |   69 +-
 15 files changed, 3514 insertions(+), 73 deletions(-)
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.Designer.cs
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.cs
 create mode 100644 Marco.Pms.Model/Activities/TaskAttachment.cs
 delete mode 100644 Marco.Pms.Model/Activities/TaskImages.cs

diff --git a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
index 1b76adb..04cfe61 100644
--- a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
+++ b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
@@ -44,6 +44,7 @@ namespace Marco.Pms.DataAccess.Data
         public DbSet<TaskAllocation> TaskAllocations { get; set; }
         public DbSet<TaskComment> TaskComments { get; set; }
         public DbSet<TaskMembers> TaskMembers { get; set; }
+        public DbSet<TaskAttachment> TaskAttachments { get; set; }
         public DbSet<Attendance> Attendes { get; set; }
         public DbSet<AttendanceLog> AttendanceLogs { get; set; }
         public DbSet<Employee> Employees { get; set; }
diff --git a/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.Designer.cs
new file mode 100644
index 0000000..1407de2
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.Designer.cs
@@ -0,0 +1,3269 @@
+// <auto-generated />
+using System;
+using Marco.Pms.DataAccess.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250612094243_Added_TaskAttachments_Table")]
+    partial class Added_TaskAttachments_Table
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            //MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AssignedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AssignmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("CompletedTask")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("PlannedTask")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime?>("ReportedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkItemId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssignedBy");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkItemId");
+
+                    b.ToTable("TaskAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ReferenceId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CommentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CommentedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentedBy");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskMembers");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ApprovedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AttendanceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("InTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("OutTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ProjectID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Attendes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ActivityTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AttendanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Latitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Longitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("UpdatedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdatedOn")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AttendanceId");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("AttendanceLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MPIN")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MPINToken")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("MPINDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("ExpriesInSec")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OTP")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("OTPDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedByID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedByID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buckets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ContactCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Organization")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactCategoryId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Contacts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactCategoryMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EmailAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactsEmails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactNotes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    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")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactTagId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("ContactTagId");
+
+                    b.ToTable("ContactTagMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactTagMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("RefereanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdateAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("DirectoryUpdateLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("EmployeeBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Base64Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("BatchId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("S3Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ThumbS3Key")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UploadedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AadharNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CurrentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyPhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("JoiningDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MiddleName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PanNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PermanentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.HasIndex("JobRoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("RoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("EmployeeRoleMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeOnly>("EndTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkShifts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsMandatory")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityCheckLists");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("CheckListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FeatureId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeatureId");
+
+                    b.ToTable("FeaturePermissions");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"),
+                            Description = "Access all information related to the project.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "View Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"),
+                            Description = "Potentially edit the project name, description, start/end dates, or status.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"),
+                            Description = "The \"Manage Team\" feature allows authorized users to organize project personnel by adding, removing, and assigning employee to projects.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Team"
+                        },
+                        new
+                        {
+                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "View Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure.",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "Manage Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"),
+                            Description = "Grants a user comprehensive read-only access to all details associated with tasks within a project. This includes task descriptions, statuses, assignees, due dates, dependencies, progress, history, and any related attachments or discussions.",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "View Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("08752f33-3b29-4816-b76b-ea8a968ed3c5"),
+                            Description = "This allows them to create new tasks, modify existing task attributes (description, status, assignee, due date, etc.),",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2"),
+                            Description = "Grants a user the ability to designate team members responsible for specific tasks and to update the completion status or provide progress updates for those tasks",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Assign/Report Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"),
+                            Description = "Grants a user the authority to officially confirm the completion or acceptance of a task, often signifying that it meets the required standards or criteria",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Approve Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                            Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"),
+                            Description = "Grants a user the authority to create new employee profiles and modify existing employee details within the system. This typically includes adding or updating information such as names, contact details, roles, departments, skills, and potentially other personal or professional data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"),
+                            Description = "Grants a user the authority to manage employee application roles, enabling them to assign or revoke access privileges within the system.",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Assign Roles"
+                        },
+                        new
+                        {
+                            Id = new Guid("915e6bff-65f6-4e3f-aea8-3fd217d3ea9e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Team Attendance "
+                        },
+                        new
+                        {
+                            Id = new Guid("57802c4a-00aa-4a1f-a048-fd2f70dd44b6"),
+                            Description = "Grants a user the authority to approve requests from employees to adjust or correct their recorded attendance. This typically involves reviewing the reason for the regularization, verifying any supporting documentation, and then officially accepting the changes to the employee's attendance records",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Regularize Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("ccb0589f-712b-43de-92ed-5b6088e7dc4e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Self Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"),
+                            Description = "Grants a user read-only access to foundational or reference data within the system. \"Masters\" typically refer to predefined lists, categories, or templates that are used throughout the application to standardize information and maintain consistency",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("588a8824-f924-4955-82d8-fc51956cf323"),
+                            Description = "Grants a user the authority to create, modify, and delete foundational or reference data within the system. These \"masters\" are typically the core lists, categories, and configurations that other data and functionalities rely upon, such as departments, job titles, product categories",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("4286a13b-bb40-4879-8c6d-18e9e393beda"),
+                            Description = "Full control over all directories, including the ability to manage permissions for all directories in the system.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Admin"
+                        },
+                        new
+                        {
+                            Id = new Guid("62668630-13ce-4f52-a0f0-db38af2230c5"),
+                            Description = "Full control over directories they created or have been assigned. Can also manage permissions for those directories.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Manager"
+                        },
+                        new
+                        {
+                            Id = new Guid("0f919170-92d4-4337-abd3-49b66fc871bb"),
+                            Description = "Full control over directories they created. Can view contacts in directories they either created or were assigned to. Can manage permissions only for directories they created.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory User"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.Property<Guid>("ApplicationRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FeaturePermissionId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("ApplicationRoleId", "FeaturePermissionId");
+
+                    b.HasIndex("FeaturePermissionId");
+
+                    b.ToTable("RolePermissionMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DomainName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OnBoardingDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IndustryId");
+
+                    b.ToTable("Tenants");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b3466e83-7e11-464c-b93a-daf047838b26"),
+                            ContactName = "Admin",
+                            ContactNumber = "123456789",
+                            Description = "",
+                            DomainName = "www.marcobms.org",
+                            IndustryId = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            IsActive = true,
+                            Name = "MarcoBMS",
+                            OnBoardingDate = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            OragnizationSize = "100-200"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("CommentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MessageText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentMessageId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("SentAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TicketComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("LinkedActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("LinkedProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("PriorityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("StatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PriorityId");
+
+                    b.HasIndex("StatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("Tickets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketTags");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTypeMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTypeMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("c74e5480-2b71-483c-8f4a-1a9c69c32603"),
+                            Description = "An identified problem that affects the performance, reliability, or standards of a product or service",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("d1f55eab-9898-4e46-9f03-b263e33e5d38"),
+                            Description = "A support service that assists users with technical issues, requests, or inquiries.",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("MailListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Recipient")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Schedule")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MailListId");
+
+                    b.ToTable("MailDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmailId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailingList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Keywords")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailingList");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ActivityName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("UnitOfMeasurement")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ActivityMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("ModuleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModuleId");
+
+                    b.ToTable("Features");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            Description = "Manage Project",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            Description = "Manage Infra",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            Description = "Manage Tasks",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Task Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            Description = "Manage Employee",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Employee Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            Description = "Attendance",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            Description = "Global Masters",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Global Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            Description = "Managing all directory related rights",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Directory Management"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Industry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Industries");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            Name = "Information Technology (IT) Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("0a63e657-2c5f-49b5-854b-42c978293154"),
+                            Name = "Manufacturing & Production"
+                        },
+                        new
+                        {
+                            Id = new Guid("bdc61e3b-69ea-4394-bab6-079ec135b5bd"),
+                            Name = "Energy & Resources"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ca200ac-00d7-415e-a410-b948e27ac9d2"),
+                            Name = "Finance & Professional Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("d5621700-cd87-441f-8cdb-6051ddfc83b4"),
+                            Name = "Hospitals and Healthcare Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("23608891-657e-40f0-bbd4-2b0a2ec1a76f"),
+                            Name = "Social Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("a493f4e3-16b1-4411-be3c-6bf2987a3168"),
+                            Name = "Retail & Consumer Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("e9d8ce92-9371-4ed9-9831-83c07f78edec"),
+                            Name = "Transportation & Logistics"
+                        },
+                        new
+                        {
+                            Id = new Guid("8a0d6134-2dbe-4e0a-b250-ff34cb7b9df0"),
+                            Name = "Education & Training"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Module", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Modules");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Description = "Project Module",
+                            Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02",
+                            Name = "Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Description = "Employee Module",
+                            Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637",
+                            Name = "Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Description = "Masters Module",
+                            Key = "504ec132-e6a9-422f-8f85-050602cfce05",
+                            Name = "Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("StatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            Status = "Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Status = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "On Hold",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
+                            Status = "Completed",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketPriorityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Level")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketPriorityMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("188d29b3-10f3-42d0-9587-1a46ae7a0320"),
+                            ColorCode = "008000",
+                            IsDefault = true,
+                            Level = 1,
+                            Name = "Low",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("0919bc84-9f82-4ecf-98c7-962755dd9a97"),
+                            ColorCode = "FFFF00",
+                            IsDefault = true,
+                            Level = 2,
+                            Name = "Medium",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 3,
+                            Name = "High",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 4,
+                            Name = "Critical",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("44a7b91d-a0dd-45d1-8616-4d2f71e16401"),
+                            ColorCode = "#FF0000",
+                            IsDefault = true,
+                            Level = 5,
+                            Name = "Urgent",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6b0c409b-3e80-4165-8b39-f3fcacb4c797"),
+                            ColorCode = "#FFCC99",
+                            Description = "This is a newly created issue.",
+                            IsDefault = true,
+                            Name = "New",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("6c5ac37d-5b7d-40f3-adec-2dabaa5cca86"),
+                            ColorCode = "#E6FF99",
+                            Description = "Assigned to employee or team of employees",
+                            IsDefault = true,
+                            Name = "Assigned",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("7f96bcd5-0c66-411b-8a1d-9d1a4785194e"),
+                            ColorCode = "#99E6FF",
+                            Description = "These issues are currently in progress",
+                            IsDefault = true,
+                            Name = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5c72b630-6923-4215-bf2c-b1622afd76e7"),
+                            ColorCode = "#6c757d",
+                            Description = "These issues are currently under review",
+                            IsDefault = true,
+                            Name = "In Review",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("8ff85685-a875-4f21-aa95-d99551315fcc"),
+                            ColorCode = "#B399FF",
+                            Description = "The following issues are resolved and closed",
+                            IsDefault = true,
+                            Name = "Done",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTagMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("ef6c2a65-f61d-4537-9650-a7ab7f8d98db"),
+                            ColorCode = "#e59866",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5a168569-8ad7-4422-8db6-51ef25caddeb"),
+                            ColorCode = "#85c1e9",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkCategoryMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("86bb2cc8-f6b5-4fdd-bbee-c389c713a44b"),
+                            Description = "Created new task in a professional or creative context",
+                            IsSystem = true,
+                            Name = "Fresh Work",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("9ebfa19c-53b9-481b-b863-c25d2f843201"),
+                            Description = "Revising, modifying, or correcting a task to improve its quality or fix issues",
+                            IsSystem = true,
+                            Name = "Rework",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("11a79929-1d07-42dc-9e98-82d0d2f4a240"),
+                            Description = "Any defect, deviation, or non-conformance in a task that fails to meet established standards or customer expectations.",
+                            IsSystem = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buildings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BuildingId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Floor");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProjectAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ShortName")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectStatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Projects");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("85bf587b-7ca9-4685-b77c-d817f5847e85"),
+                            ContactPerson = "Project 1 Contact Person",
+                            EndDate = new DateTime(2026, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            Name = "Project 1",
+                            ProjectAddress = "Project 1 Address",
+                            ProjectStatusId = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            StartDate = new DateTime(2025, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReAllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ProjectAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AreaName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FloorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FloorId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkAreas");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("CompletedWork")
+                        .HasColumnType("double");
+
+                    b.Property<double>("PlannedWork")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime>("TaskDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkAreaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActivityId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkAreaId");
+
+                    b.HasIndex("WorkCategoryId");
+
+                    b.ToTable("WorkItems");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ApplicationRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("JobRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Utilities.Inquiries", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("About")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrganizatioinName")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Inquiries");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("varchar(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator().HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("IsRootUser")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("AssignedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem")
+                        .WithMany()
+                        .HasForeignKey("WorkItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkItem");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("CommentedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Approver")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Approver");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.AttendanceModule.Attendance", "Attendance")
+                        .WithMany()
+                        .HasForeignKey("AttendanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.DocumentManager.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedByEmployee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy");
+
+                    b.Navigation("Attendance");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedByEmployee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedByID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.ContactCategoryMaster", "ContactCategory")
+                        .WithMany()
+                        .HasForeignKey("ContactCategoryId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ContactCategory");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Createdby")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Createdby");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.ContactTagMaster", "ContactTag")
+                        .WithMany()
+                        .HasForeignKey("ContactTagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("ContactTag");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationUser", "ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.HasOne("Marco.Pms.Model.Roles.JobRole", "JobRole")
+                        .WithMany()
+                        .HasForeignKey("JobRoleId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("JobRole");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Role");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Feature", "Feature")
+                        .WithMany("FeaturePermissions")
+                        .HasForeignKey("FeatureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feature");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.FeaturePermission", null)
+                        .WithMany()
+                        .HasForeignKey("FeaturePermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Industry", "Industry")
+                        .WithMany()
+                        .HasForeignKey("IndustryId");
+
+                    b.Navigation("Industry");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Forum.TicketComment", "TicketComment")
+                        .WithMany("Attachments")
+                        .HasForeignKey("CommentId");
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ticket");
+
+                    b.Navigation("TicketComment");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketPriorityMaster", "Priority")
+                        .WithMany()
+                        .HasForeignKey("PriorityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.TicketStatusMaster", "TicketStatusMaster")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketTypeMaster", "TicketTypeMaster")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Priority");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("TicketStatusMaster");
+
+                    b.Navigation("TicketTypeMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketTagMaster", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+
+                    b.Navigation("Ticket");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Mail.MailingList", "MailBody")
+                        .WithMany()
+                        .HasForeignKey("MailListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MailBody");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Module", "Module")
+                        .WithMany()
+                        .HasForeignKey("ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Building", "Building")
+                        .WithMany()
+                        .HasForeignKey("BuildingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Building");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.StatusMaster", "ProjectStatus")
+                        .WithMany()
+                        .HasForeignKey("ProjectStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProjectStatus");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .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("Employee");
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Floor", "Floor")
+                        .WithMany()
+                        .HasForeignKey("FloorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Floor");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.ActivityMaster", "ActivityMaster")
+                        .WithMany()
+                        .HasForeignKey("ActivityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea")
+                        .WithMany()
+                        .HasForeignKey("WorkAreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkCategoryMaster", "WorkCategoryMaster")
+                        .WithMany()
+                        .HasForeignKey("WorkCategoryId");
+
+                    b.Navigation("ActivityMaster");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkArea");
+
+                    b.Navigation("WorkCategoryMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Navigation("FeaturePermissions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.cs b/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.cs
new file mode 100644
index 0000000..b451456
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250612094243_Added_TaskAttachments_Table.cs
@@ -0,0 +1,36 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_TaskAttachments_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "TaskAttachments",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ReferenceId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    DocumentId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TaskAttachments", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "TaskAttachments");
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
index 26c3f80..245470a 100644
--- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -63,6 +63,23 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.ToTable("TaskAllocations");
                 });
 
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ReferenceId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskAttachments");
+                });
+
             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
                 {
                     b.Property<Guid>("Id")
diff --git a/Marco.Pms.Model/Activities/TaskAttachment.cs b/Marco.Pms.Model/Activities/TaskAttachment.cs
new file mode 100644
index 0000000..a270a79
--- /dev/null
+++ b/Marco.Pms.Model/Activities/TaskAttachment.cs
@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.Activities
+{
+    public class TaskAttachment
+    {
+        public Guid Id { get; set; }
+        public Guid ReferenceId { get; set; }
+        public Guid DocumentId { get; set; }
+    }
+}
diff --git a/Marco.Pms.Model/Activities/TaskImages.cs b/Marco.Pms.Model/Activities/TaskImages.cs
deleted file mode 100644
index 6171ae2..0000000
--- a/Marco.Pms.Model/Activities/TaskImages.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
-
-namespace Marco.Pms.Model.Activities
-{
-    public class TaskImages
-    {
-        public Guid Id { get; set; }
-
-        public Guid TaskAllocationId { get; set; }
-        [ValidateNever]
-        [ForeignKey(nameof(TaskAllocationId))]
-        public TaskAllocation? TaskAllocation { get; set; }
-
-        public string? ImagePath { get; set; }
-    }
-}
diff --git a/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs b/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
index 551f024..13eb9b5 100644
--- a/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
@@ -1,4 +1,6 @@
-namespace Marco.Pms.Model.Dtos.Activities
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.Activities
 {
     public class ReportTaskDto
     {
@@ -7,5 +9,6 @@
         public DateTime ReportedDate { get; set; }
         public string? Comment { get; set; }
         public List<ReportCheckListDto>? CheckList { get; set; }
+        public List<FileUploadModel>? Images { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Dtos/Directory/UpdateContactDto.cs b/Marco.Pms.Model/Dtos/Directory/UpdateContactDto.cs
index c648db0..16c8645 100644
--- a/Marco.Pms.Model/Dtos/Directory/UpdateContactDto.cs
+++ b/Marco.Pms.Model/Dtos/Directory/UpdateContactDto.cs
@@ -8,7 +8,7 @@
         public List<UpdateContactPhoneDto>? ContactPhones { get; set; }
         public List<UpdateContactEmailDto>? ContactEmails { get; set; }
         public List<Guid>? BucketIds { get; set; }
-        public Guid ContactCategoryId { get; set; }
+        public Guid? ContactCategoryId { get; set; }
         public string? Description { get; set; }
         public string? Organization { get; set; }
         public string? Address { get; set; }
diff --git a/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
index c7b8357..0e27d9d 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ReportTaskVM.cs
@@ -10,7 +10,6 @@
         public string? Description { get; set; }
         public Guid AssignedBy { get; set; }
         public Guid WorkItemId { get; set; }
-
         public List<CommentVM>? Comments { get; set; }
         public List<CheckListVM>? checkList { get; set; }
     }
diff --git a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
index d6a09a9..f6d0fee 100644
--- a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
@@ -13,6 +13,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public string? Description { get; set; }
         public string? AssignBy { get; set; }
         public WorkItem? WorkItem { get; set; }
+        List<string>? preSignedUrls { get; set; }
         public List<CommentVM>? Comments { get; set; }
         public List<EmployeeVM>? TeamMembers { get; set; }
     }
diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 5c7104d..efaaed0 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -688,7 +688,6 @@ namespace MarcoBMS.Services.Controllers
                 }
                 Document? document = null;
                 var Image = recordAttendanceDot.Image;
-                var objectKey = string.Empty;
                 var preSignedUrl = string.Empty;
 
                 if (Image != null && Image.ContentType != null)
@@ -697,7 +696,16 @@ namespace MarcoBMS.Services.Controllers
                     if (string.IsNullOrEmpty(Image.Base64Data))
                         return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
 
-                    objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, TenantId, "attendance");
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, TenantId, "attendance");
+
+                    string objectKey = $"tenant-{TenantId}/Employee/{recordAttendanceDot.EmployeeID}/Attendance/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
                     preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(objectKey);
 
                     document = new Document
diff --git a/Marco.Pms.Services/Controllers/ForumController.cs b/Marco.Pms.Services/Controllers/ForumController.cs
index b46edb1..f50a077 100644
--- a/Marco.Pms.Services/Controllers/ForumController.cs
+++ b/Marco.Pms.Services/Controllers/ForumController.cs
@@ -68,7 +68,16 @@ namespace Marco.Pms.Services.Controllers
                         return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
                     }
 
-                    var objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, tenantId, "forum");
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "forum");
+
+                    string objectKey = $"tenant-{tenantId}/project-{createTicketDto.LinkedProjectId}/froum/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
                     Document document = attachmentDto.ToDocumentFromForumAttachmentDto(objectKey, objectKey, createTicketDto.CreatedAt, tenantId);
                     _context.Documents.Add(document);
@@ -182,7 +191,16 @@ namespace Marco.Pms.Services.Controllers
                                 return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
                             }
 
-                            var objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, tenantId, "forum");
+                            //If base64 has a data URI prefix, strip it
+                            var base64 = Image.Base64Data.Contains(",")
+                                ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                                : Image.Base64Data;
+
+                            string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                            string fileName = _s3Service.GenerateFileName(fileType, tenantId, "forum");
+
+                            string objectKey = $"tenant-{tenantId}/project-{updateTicketDto.LinkedProjectId}/froum/{fileName}";
+                            await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
                             Document document = attachmentDto.ToDocumentFromUpdateAttachmentDto(objectKey, objectKey, updateTicketDto.CreatedAt, tenantId);
                             _context.Documents.Add(document);
@@ -329,6 +347,14 @@ namespace Marco.Pms.Services.Controllers
             List<TicketAttachment> attachments = new List<TicketAttachment>();
             List<Document> documents = new List<Document>();
 
+            TicketForum? ticket = await _context.Tickets.FirstOrDefaultAsync(t => t.Id == addCommentDto.TicketId);
+
+            if (ticket == null)
+            {
+                _logger.LogError("Ticket {TicketId} not Found in database", addCommentDto.TicketId);
+                return NotFound(ApiResponse<object>.ErrorResponse("Ticket not Found", "Ticket not Found", 404));
+            }
+
             TicketComment comment = addCommentDto.ToTicketCommentFromAddCommentDto(tenantId);
             _context.TicketComments.Add(comment);
             await _context.SaveChangesAsync();
@@ -344,7 +370,16 @@ namespace Marco.Pms.Services.Controllers
                         return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
                     }
 
-                    var objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, tenantId, "forum");
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "forum");
+
+                    string objectKey = $"tenant-{tenantId}/project-{ticket.LinkedProjectId}/froum/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
                     Document document = attachmentDto.ToDocumentFromForumAttachmentDto(objectKey, objectKey, addCommentDto.SentAt, tenantId);
                     _context.Documents.Add(document);
@@ -396,6 +431,14 @@ namespace Marco.Pms.Services.Controllers
             Guid tenantId = _userHelper.GetTenantId();
             List<TicketAttachment> attachments = new List<TicketAttachment>();
 
+            TicketForum? ticket = await _context.Tickets.FirstOrDefaultAsync(t => t.Id == updateCommentDto.TicketId);
+
+            if (ticket == null)
+            {
+                _logger.LogError("Ticket {TicketId} not Found in database", updateCommentDto.TicketId);
+                return NotFound(ApiResponse<object>.ErrorResponse("Ticket not Found", "Ticket not Found", 404));
+            }
+
             TicketComment existingComment = await _context.TicketComments.AsNoTracking().FirstOrDefaultAsync(c => c.Id == updateCommentDto.Id) ?? new TicketComment();
             TicketComment updateComment = updateCommentDto.ToTicketCommentFromUpdateCommentDto(tenantId, existingComment);
             _context.TicketComments.Update(updateComment);
@@ -419,7 +462,16 @@ namespace Marco.Pms.Services.Controllers
                             return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
                         }
 
-                        var objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, tenantId, "forum");
+                        //If base64 has a data URI prefix, strip it
+                        var base64 = Image.Base64Data.Contains(",")
+                            ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                            : Image.Base64Data;
+
+                        string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                        string fileName = _s3Service.GenerateFileName(fileType, tenantId, "forum");
+
+                        string objectKey = $"tenant-{tenantId}/project-{ticket.LinkedProjectId}/froum/{fileName}";
+                        await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
                         Document document = attachmentDto.ToDocumentFromUpdateAttachmentDto(objectKey, objectKey, existingComment.SentAt, tenantId);
                         _context.Documents.Add(document);
@@ -491,6 +543,16 @@ namespace Marco.Pms.Services.Controllers
             Guid tenantId = _userHelper.GetTenantId();
             List<TicketAttachmentVM> ticketAttachmentVMs = new List<TicketAttachmentVM>();
 
+            List<Guid> ticketIds = forumAttachmentDtos.Select(f => f.TicketId.HasValue ? f.TicketId.Value : Guid.Empty).ToList();
+
+            List<TicketForum> tickets = await _context.Tickets.Where(t => ticketIds.Contains(t.Id)).ToListAsync();
+
+            if (tickets == null || tickets.Count > 0)
+            {
+                _logger.LogError("Tickets not Found in database");
+                return NotFound(ApiResponse<object>.ErrorResponse("Ticket not Found", "Ticket not Found", 404));
+            }
+
             TicketAttachment attachment = new TicketAttachment();
 
             foreach (var forumAttachmentDto in forumAttachmentDtos)
@@ -505,7 +567,17 @@ namespace Marco.Pms.Services.Controllers
                     _logger.LogError("ticket ID is missing");
                     return BadRequest(ApiResponse<object>.ErrorResponse("ticket ID is missing", "ticket ID is missing", 400));
                 }
-                var objectKey = await _s3Service.UploadFileAsync(forumAttachmentDto.Base64Data, tenantId, "forum");
+                var ticket = tickets.FirstOrDefault(t => t.Id == forumAttachmentDto.TicketId);
+                //If base64 has a data URI prefix, strip it
+                var base64 = forumAttachmentDto.Base64Data.Contains(",")
+                    ? forumAttachmentDto.Base64Data.Substring(forumAttachmentDto.Base64Data.IndexOf(",") + 1)
+                    : forumAttachmentDto.Base64Data;
+
+                string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                string fileName = _s3Service.GenerateFileName(fileType, tenantId, "forum");
+
+                string objectKey = $"tenant-{tenantId}/project-{ticket?.LinkedProjectId}/froum/{fileName}";
+                await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
                 Document document = forumAttachmentDto.ToDocumentFromForumAttachmentDto(objectKey, objectKey, forumAttachmentDto.SentAt, tenantId);
                 _context.Documents.Add(document);
diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index 3512081..7835e8d 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -749,11 +749,11 @@ namespace Marco.Pms.Services.Controllers
             return Ok(response);
         }
 
-        [HttpGet("contact-tag/{id}")]
-        public async Task<IActionResult> GetContactTagMaster(Guid id)
-        {
-            return Ok();
-        }
+        //[HttpGet("contact-tag/{id}")]
+        //public async Task<IActionResult> GetContactTagMaster(Guid id)
+        //{
+        //    return Ok();
+        //}
 
         [HttpPost("contact-tag")]
         public async Task<IActionResult> CreateContactTagMaster([FromBody] CreateContactTagDto contactTagDto)
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index ab2af78..16fea57 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -8,10 +8,13 @@ using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Activities;
 using Marco.Pms.Model.ViewModels.Employee;
+using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
+using Document = Marco.Pms.Model.DocumentManager.Document;
 
 namespace MarcoBMS.Services.Controllers
 {
@@ -23,12 +26,14 @@ namespace MarcoBMS.Services.Controllers
     {
         private readonly ApplicationDbContext _context;
         private readonly UserHelper _userHelper;
+        private readonly S3UploadService _s3Service;
 
 
-        public TaskController(ApplicationDbContext context, UserHelper userHelper)
+        public TaskController(ApplicationDbContext context, UserHelper userHelper, S3UploadService s3Service)
         {
             _context = context;
             _userHelper = userHelper;
+            _s3Service = s3Service;
         }
 
         private Guid GetTenantId()
@@ -84,7 +89,6 @@ namespace MarcoBMS.Services.Controllers
             return Ok(ApiResponse<object>.SuccessResponse(response, "Task assignned successfully", 200));
         }
 
-
         [HttpPost("report")]
         public async Task<IActionResult> ReportTaskProgress([FromBody] ReportTaskDto reportTask)
         {
@@ -104,10 +108,13 @@ namespace MarcoBMS.Services.Controllers
 
             var checkListIds = reportTask.CheckList != null ? reportTask.CheckList.Select(c => c.Id).ToList() : new List<Guid>();
             var checkList = await _context.ActivityCheckLists.Where(c => checkListIds.Contains(c.Id)).ToListAsync();
-            if (taskAllocation == null)
+            if (taskAllocation == null || taskAllocation.WorkItem == null)
             {
                 return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400));
             }
+            WorkArea workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == taskAllocation.WorkItem.WorkAreaId) ?? new WorkArea();
+
+            var bulding = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty));
             if (taskAllocation.WorkItem != null)
             {
                 if (taskAllocation.CompletedTask != 0)
@@ -143,6 +150,49 @@ namespace MarcoBMS.Services.Controllers
             _context.CheckListMappings.AddRange(checkListMappings);
             var comment = reportTask.ToCommentFromReportTaskDto(tenantId, Employee.Id);
 
+            var Images = reportTask.Images;
+
+            if (Images != null && Images.Count > 0)
+            {
+
+                foreach (var Image in Images)
+                {
+
+                    if (string.IsNullOrEmpty(Image.Base64Data))
+                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_report");
+
+                    string objectKey = $"tenant-{tenantId}/project-{bulding?.ProjectId}/Actitvity/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
+
+                    Document document = new Document
+                    {
+                        FileName = Image.FileName ?? "",
+                        ContentType = Image.ContentType ?? "",
+                        S3Key = objectKey,
+                        Base64Data = Image.Base64Data,
+                        FileSize = Image.FileSize,
+                        UploadedAt = DateTime.UtcNow,
+                        TenantId = tenantId
+                    };
+                    _context.Documents.Add(document);
+                    TaskAttachment attachment = new TaskAttachment
+                    {
+                        DocumentId = document.Id,
+                        ReferenceId = reportTask.Id
+                    };
+                    _context.TaskAttachments.Add(attachment);
+                }
+                await _context.SaveChangesAsync();
+            }
+
             _context.TaskComments.Add(comment);
             await _context.SaveChangesAsync();
 
diff --git a/Marco.Pms.Services/Service/S3UploadService.cs b/Marco.Pms.Services/Service/S3UploadService.cs
index 5e47245..c29cfdd 100644
--- a/Marco.Pms.Services/Service/S3UploadService.cs
+++ b/Marco.Pms.Services/Service/S3UploadService.cs
@@ -28,53 +28,46 @@ namespace Marco.Pms.Services.Service
             _s3Client = new AmazonS3Client(settings.AccessKey, settings.SecretKey, region);
         }
         //public async Task<string> UploadFileAsync(string fileName, string contentType)
-        public async Task<string> UploadFileAsync(string base64Data, Guid tenantId, string tag)
+        public async Task UploadFileAsync(string base64, string fileType, string objectKey)
         {
             byte[] fileBytes;
 
-            //If base64 has a data URI prefix, strip it
-            var base64 = base64Data.Contains(",")
-                ? base64Data.Substring(base64Data.IndexOf(",") + 1)
-                : base64Data;
+
             var allowedFilesType = _configuration.GetSection("WhiteList:ContentType")
                                                 .GetChildren()
                                                 .Select(x => x.Value)
                                                 .ToList();
-            string fileType = GetContentTypeFromBase64(base64);
-            if (allowedFilesType != null && allowedFilesType.Contains(fileType))
+
+            if (allowedFilesType == null || !allowedFilesType.Contains(fileType))
             {
-                string fileName = GenerateFileName(fileType, tenantId, tag);
-
-                fileBytes = Convert.FromBase64String(base64);
-
-
-                using var fileStream = new MemoryStream(fileBytes);
-
-                // Generate a unique object key (you can customize this)
-                var objectKey = $"{fileName}";
-
-                var uploadRequest = new TransferUtilityUploadRequest
-                {
-                    InputStream = fileStream,
-                    Key = objectKey,
-                    BucketName = _bucketName,
-                    ContentType = fileType,
-                    AutoCloseStream = true
-                };
-                try
-                {
-                    var transferUtility = new TransferUtility(_s3Client);
-                    await transferUtility.UploadAsync(uploadRequest);
-                    _logger.LogInfo("File uploaded to Amazon S3");
-                    return objectKey;
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError("{error} while uploading file to S3", ex.Message);
-                    return string.Empty;
-                }
+                throw new InvalidOperationException("Unsupported file type.");
             }
-            throw new InvalidOperationException("Unsupported file type.");
+
+            fileBytes = Convert.FromBase64String(base64);
+
+
+            using var fileStream = new MemoryStream(fileBytes);
+
+            var uploadRequest = new TransferUtilityUploadRequest
+            {
+                InputStream = fileStream,
+                Key = objectKey,
+                BucketName = _bucketName,
+                ContentType = fileType,
+                AutoCloseStream = true
+            };
+            try
+            {
+                var transferUtility = new TransferUtility(_s3Client);
+                await transferUtility.UploadAsync(uploadRequest);
+                _logger.LogInfo("File uploaded to Amazon S3");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("{error} while uploading file to S3", ex.Message);
+            }
+
+
         }
         public string GeneratePreSignedUrlAsync(string objectKey)
         {
-- 
2.43.0


From 1a518605172fc68de3fe1ff57deb0a751388c5d6 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 17:02:18 +0530
Subject: [PATCH 12/48] Implemented the image capture while writing comment in
 task allocation and add presignedurl in task get by in API

---
 .../Dtos/Activities/CreateCommentDto.cs       |  7 +-
 .../ViewModels/Activities/CommentVM.cs        |  1 +
 .../ViewModels/Activities/TaskVM.cs           |  2 +-
 .../Controllers/TaskController.cs             | 79 ++++++++++++++++++-
 4 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs b/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs
index 9a2518c..816f3be 100644
--- a/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/CreateCommentDto.cs
@@ -1,11 +1,12 @@
-namespace Marco.Pms.Model.Dtos.Activities
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.Activities
 {
     public class CreateCommentDto
     {
         public Guid TaskAllocationId { get; set; }
-
         public DateTime CommentDate { get; set; }
         public string? Comment { get; set; }
-
+        public List<FileUploadModel>? Images { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs b/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs
index fec0069..73701e0 100644
--- a/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/CommentVM.cs
@@ -8,5 +8,6 @@
         public string? Comment { get; set; }
         public Guid CommentedBy { get; set; }
         public BasicEmployeeVM? Employee { get; set; }
+        public List<string>? PreSignedUrls { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
index f6d0fee..18a29b0 100644
--- a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
@@ -13,7 +13,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public string? Description { get; set; }
         public string? AssignBy { get; set; }
         public WorkItem? WorkItem { get; set; }
-        List<string>? preSignedUrls { get; set; }
+        public List<string>? PreSignedUrls { get; set; }
         public List<CommentVM>? Comments { get; set; }
         public List<EmployeeVM>? TeamMembers { get; set; }
     }
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index 16fea57..e81f6fe 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -214,10 +214,62 @@ namespace MarcoBMS.Services.Controllers
             var tenantId = GetTenantId();
             var Employee = await _userHelper.GetCurrentEmployeeAsync();
 
+            var taskAllocation = await _context.TaskAllocations.Include(t => t.WorkItem).FirstOrDefaultAsync(t => t.Id == createComment.TaskAllocationId);
+            if (taskAllocation == null || taskAllocation.WorkItem == null)
+            {
+                return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400));
+            }
+            WorkArea workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == taskAllocation.WorkItem.WorkAreaId) ?? new WorkArea();
+
+            var bulding = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty));
+
             var comment = createComment.ToCommentFromCommentDto(tenantId, Employee.Id);
             _context.TaskComments.Add(comment);
             await _context.SaveChangesAsync();
 
+            var Images = createComment.Images;
+
+            if (Images != null && Images.Count > 0)
+            {
+
+                foreach (var Image in Images)
+                {
+
+                    if (string.IsNullOrEmpty(Image.Base64Data))
+                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_report");
+
+                    string objectKey = $"tenant-{tenantId}/project-{bulding?.ProjectId}/Actitvity/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
+
+                    Document document = new Document
+                    {
+                        FileName = Image.FileName ?? "",
+                        ContentType = Image.ContentType ?? "",
+                        S3Key = objectKey,
+                        Base64Data = Image.Base64Data,
+                        FileSize = Image.FileSize,
+                        UploadedAt = DateTime.UtcNow,
+                        TenantId = tenantId
+                    };
+                    _context.Documents.Add(document);
+                    TaskAttachment attachment = new TaskAttachment
+                    {
+                        DocumentId = document.Id,
+                        ReferenceId = comment.Id
+                    };
+                    _context.TaskAttachments.Add(attachment);
+                }
+                await _context.SaveChangesAsync();
+            }
+
             CommentVM response = comment.ToCommentVMFromTaskComment();
             return Ok(ApiResponse<object>.SuccessResponse(response, "Comment saved successfully", 200));
         }
@@ -330,8 +382,23 @@ namespace MarcoBMS.Services.Controllers
                 if (taskAllocation == null) return NotFound(ApiResponse<object>.ErrorResponse("Task Not Found", "Task not found", 404));
                 var taskVM = taskAllocation.TaskAllocationToTaskVM(employeeName);
                 var comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
+                var commentIds = comments.Select(c => c.Id).ToList();
+                var taskAttachments = await _context.TaskAttachments.Where(t => t.ReferenceId == taskAllocation.Id || commentIds.Contains(t.ReferenceId)).ToListAsync();
+                var documentIds = taskAttachments.Select(t => t.DocumentId).ToList();
+                var documents = await _context.Documents.Where(d => documentIds.Contains(d.Id)).ToListAsync();
                 var team = await _context.TaskMembers.Where(m => m.TaskAllocationId == taskAllocation.Id).Include(m => m.Employee).ToListAsync();
                 var teamMembers = new List<EmployeeVM> { };
+
+                var taskDocumentIds = taskAttachments.Where(t => t.ReferenceId == taskAllocation.Id).Select(t => t.DocumentId).ToList();
+                var taskDocuments = documents.Where(d => taskDocumentIds.Contains(d.Id)).ToList();
+
+                List<string> taskPreSignedUrls = new List<string>();
+                foreach (var document in taskDocuments)
+                {
+                    string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
+                    taskPreSignedUrls.Add(preSignedUrl);
+                }
+                taskVM.PreSignedUrls = taskPreSignedUrls;
                 foreach (var member in team)
                 {
                     var result = member.Employee != null ? member.Employee.ToEmployeeVMFromEmployee() : new EmployeeVM();
@@ -340,7 +407,17 @@ namespace MarcoBMS.Services.Controllers
                 List<CommentVM> Comments = new List<CommentVM> { };
                 foreach (var comment in comments)
                 {
-                    Comments.Add(comment.ToCommentVMFromTaskComment());
+                    var commentDocumentIds = taskAttachments.Where(t => t.ReferenceId == comment.Id).Select(t => t.DocumentId).ToList();
+                    var commentDocuments = documents.Where(d => commentDocumentIds.Contains(d.Id)).ToList();
+                    List<string> commentPreSignedUrls = new List<string>();
+                    foreach (var document in commentDocuments)
+                    {
+                        string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
+                        commentPreSignedUrls.Add(preSignedUrl);
+                    }
+                    CommentVM commentVM = comment.ToCommentVMFromTaskComment();
+                    commentVM.PreSignedUrls = commentPreSignedUrls;
+                    Comments.Add(commentVM);
                 }
                 taskVM.Comments = Comments;
                 taskVM.TeamMembers = teamMembers;
-- 
2.43.0


From cb185db4f3df7fcde17542f7853a81179a74b5c9 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 18:32:50 +0530
Subject: [PATCH 13/48] Sending pre signed url in task list API

---
 .../ViewModels/Activities/ListTaskVM.cs       |  1 +
 .../Controllers/TaskController.cs             | 33 +++++++++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
index 409de50..6260e2a 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
@@ -11,6 +11,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public double CompletedTask { get; set; }
         public BasicEmployeeVM? AssignedBy { get; set; }
         public Guid WorkItemId { get; set; }
+        public List<string>? PreSignedUrls { get; set; }
         public WorkItem? WorkItem { get; set; }
         public List<BasicEmployeeVM>? teamMembers { get; set; }
         public List<CommentVM>? comments { get; set; }
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index e81f6fe..8c93170 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -317,6 +317,13 @@ namespace MarcoBMS.Services.Controllers
 
             List<Employee> employees = await _context.Employees.Where(e => employeeIdList.Contains(e.Id)).Include(e => e.JobRole).ToListAsync();
 
+            List<TaskComment> allComments = await _context.TaskComments.Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
+            var allCommentIds = allComments.Select(c => c.Id).ToList();
+
+            var taskAttachments = await _context.TaskAttachments.Where(t => taskIdList.Contains(t.ReferenceId) || allCommentIds.Contains(t.ReferenceId)).ToListAsync();
+            var documentIds = taskAttachments.Select(t => t.DocumentId).ToList();
+            var documents = await _context.Documents.Where(d => documentIds.Contains(d.Id)).ToListAsync();
+
             List<ListTaskVM> tasks = new List<ListTaskVM>();
             //foreach (var workItem in workItems)
             //{
@@ -325,10 +332,21 @@ namespace MarcoBMS.Services.Controllers
 
                 var response = taskAllocation.ToListTaskVMFromTaskAllocation();
 
-                List<TaskComment> comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
+                List<TaskComment> comments = allComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToList();
                 List<BasicEmployeeVM> team = new List<BasicEmployeeVM>();
                 List<TaskMembers> taskMembers = teamMembers.Where(m => m.TaskAllocationId == taskAllocation.Id).ToList();
 
+                var taskDocumentIds = taskAttachments.Where(t => t.ReferenceId == taskAllocation.Id).Select(t => t.DocumentId).ToList();
+                var taskDocuments = documents.Where(d => taskDocumentIds.Contains(d.Id)).ToList();
+
+                List<string> taskPreSignedUrls = new List<string>();
+                foreach (var document in taskDocuments)
+                {
+                    string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
+                    taskPreSignedUrls.Add(preSignedUrl);
+                }
+                response.PreSignedUrls = taskPreSignedUrls;
+
                 foreach (var taskMember in taskMembers)
                 {
                     var teamMember = employees.Find(e => e.Id == taskMember.EmployeeId);
@@ -340,7 +358,18 @@ namespace MarcoBMS.Services.Controllers
                 List<CommentVM> commentVM = new List<CommentVM> { };
                 foreach (var comment in comments)
                 {
-                    commentVM.Add(comment.ToCommentVMFromTaskComment());
+                    var commentDocumentIds = taskAttachments.Where(t => t.ReferenceId == comment.Id).Select(t => t.DocumentId).ToList();
+                    var commentDocuments = documents.Where(d => commentDocumentIds.Contains(d.Id)).ToList();
+                    List<string> commentPreSignedUrls = new List<string>();
+                    foreach (var document in commentDocuments)
+                    {
+                        string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
+                        commentPreSignedUrls.Add(preSignedUrl);
+                    }
+                    CommentVM commentVm = comment.ToCommentVMFromTaskComment();
+                    commentVm.PreSignedUrls = commentPreSignedUrls;
+
+                    commentVM.Add(commentVm);
                 }
                 List<ActivityCheckList> checkLists = await _context.ActivityCheckLists.Where(x => x.ActivityId == (taskAllocation.WorkItem != null ? taskAllocation.WorkItem.ActivityId : Guid.Empty)).ToListAsync();
                 List<CheckListMappings> checkListMappings = await _context.CheckListMappings.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
-- 
2.43.0


From 5c019a2ff6cc9340232089cfe90491a9f872a23a Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 21:35:40 +0530
Subject: [PATCH 14/48] Chnaged the name form presignedUrls to
 ReportedProsignedUrl

---
 Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs | 2 +-
 Marco.Pms.Services/Controllers/TaskController.cs    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
index 6260e2a..acb5bd9 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
@@ -11,7 +11,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public double CompletedTask { get; set; }
         public BasicEmployeeVM? AssignedBy { get; set; }
         public Guid WorkItemId { get; set; }
-        public List<string>? PreSignedUrls { get; set; }
+        public List<string>? ReportedPreSignedUrls { get; set; }
         public WorkItem? WorkItem { get; set; }
         public List<BasicEmployeeVM>? teamMembers { get; set; }
         public List<CommentVM>? comments { get; set; }
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index 8c93170..ea4fbf1 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -317,7 +317,7 @@ namespace MarcoBMS.Services.Controllers
 
             List<Employee> employees = await _context.Employees.Where(e => employeeIdList.Contains(e.Id)).Include(e => e.JobRole).ToListAsync();
 
-            List<TaskComment> allComments = await _context.TaskComments.Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
+            List<TaskComment> allComments = await _context.TaskComments.Include(c => c.Employee).Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
             var allCommentIds = allComments.Select(c => c.Id).ToList();
 
             var taskAttachments = await _context.TaskAttachments.Where(t => taskIdList.Contains(t.ReferenceId) || allCommentIds.Contains(t.ReferenceId)).ToListAsync();
@@ -345,7 +345,7 @@ namespace MarcoBMS.Services.Controllers
                     string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
                     taskPreSignedUrls.Add(preSignedUrl);
                 }
-                response.PreSignedUrls = taskPreSignedUrls;
+                response.ReportedPreSignedUrls = taskPreSignedUrls;
 
                 foreach (var taskMember in taskMembers)
                 {
-- 
2.43.0


From 9d5535edf1aa08cc621b4875ca70ebd30dcd09bc Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 22:30:43 +0530
Subject: [PATCH 15/48] Added description in  list task API

---
 Marco.Pms.Model/Mapper/ActivitiesMapper.cs          | 1 +
 Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
index 122b139..f860bac 100644
--- a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
+++ b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
@@ -101,6 +101,7 @@ namespace Marco.Pms.Model.Mapper
             {
                 Id = taskAllocation.Id,
                 AssignmentDate = taskAllocation.AssignmentDate,
+                Description = taskAllocation.Description,
                 PlannedTask = taskAllocation.PlannedTask,
                 ReportedDate = taskAllocation.ReportedDate,
                 CompletedTask = taskAllocation.CompletedTask,
diff --git a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
index acb5bd9..9785bd2 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
@@ -10,6 +10,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public double PlannedTask { get; set; }
         public double CompletedTask { get; set; }
         public BasicEmployeeVM? AssignedBy { get; set; }
+        public string? Description { get; set; }
         public Guid WorkItemId { get; set; }
         public List<string>? ReportedPreSignedUrls { get; set; }
         public WorkItem? WorkItem { get; set; }
-- 
2.43.0


From 17ae02a0b301e21081637d4ce4108d08416c6dd2 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 13 Jun 2025 16:22:58 +0530
Subject: [PATCH 16/48] Implemented signalR in manage Task API

---
 .../Controllers/ProjectController.cs          | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 0cfd536..d391909 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -63,9 +63,9 @@ namespace MarcoBMS.Services.Controllers
                 return Unauthorized(ApiResponse<object>.ErrorResponse("Employee not found.", null, 401));
             }
 
-           
-            List<Project> projects =  await _projectsHelper.GetMyProjects(tenantId, LoggedInEmployee);
-            
+
+            List<Project> projects = await _projectsHelper.GetMyProjects(tenantId, LoggedInEmployee);
+
 
             // 4. Project projection to ProjectInfoVM
             // This part is already quite efficient.
@@ -88,7 +88,7 @@ namespace MarcoBMS.Services.Controllers
             return Ok(ApiResponse<object>.SuccessResponse(response, "Success.", 200));
         }
 
-     
+
 
         [HttpGet("list")]
         public async Task<IActionResult> GetAll()
@@ -518,7 +518,11 @@ namespace MarcoBMS.Services.Controllers
             if (projectAllocationDot != null)
             {
                 Guid TenentID = GetTenantId();
+                var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
                 List<object>? result = new List<object>();
+                List<Guid> employeeIds = new List<Guid>();
+                List<Guid> projectIds = new List<Guid>();
 
                 foreach (var item in projectAllocationDot)
                 {
@@ -547,6 +551,9 @@ namespace MarcoBMS.Services.Controllers
                                 projectAllocationFromDb.IsActive = false;
                                 _context.Entry(projectAllocationFromDb).Property(e => e.ReAllocationDate).IsModified = true;
                                 _context.Entry(projectAllocationFromDb).Property(e => e.IsActive).IsModified = true;
+
+                                employeeIds.Add(projectAllocation.EmployeeId);
+                                projectIds.Add(projectAllocation.ProjectId);
                             }
                             await _context.SaveChangesAsync();
                             var result1 = new
@@ -568,15 +575,21 @@ namespace MarcoBMS.Services.Controllers
                             projectAllocation.IsActive = true;
                             _context.ProjectAllocations.Add(projectAllocation);
                             await _context.SaveChangesAsync();
+
+                            employeeIds.Add(projectAllocation.EmployeeId);
+                            projectIds.Add(projectAllocation.ProjectId);
                         }
 
+
                     }
                     catch (Exception ex)
                     {
                         return Ok(ApiResponse<object>.ErrorResponse(ex.Message, ex, 400));
                     }
                 }
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Assign_Project", ProjectIds = projectIds, EmployeeList = employeeIds };
 
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(result, "Data saved successfully", 200));
 
             }
@@ -590,6 +603,7 @@ namespace MarcoBMS.Services.Controllers
             Guid tenantId = GetTenantId();
             var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             List<WorkItemVM> workItems = new List<WorkItemVM> { };
+            Building building = new Building();
             string responseMessage = "";
             if (workItemDot != null)
             {
@@ -597,6 +611,10 @@ namespace MarcoBMS.Services.Controllers
                 {
                     WorkItem workItem = item.ToWorkItemFromWorkItemDto(tenantId);
 
+                    var workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == workItem.WorkAreaId) ?? new WorkArea();
+
+                    building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty)) ?? new Building();
+
                     if (item.Id != null)
                     {
                         //update
@@ -621,7 +639,7 @@ namespace MarcoBMS.Services.Controllers
                 var activity = await _context.ActivityMasters.ToListAsync();
                 var category = await _context.WorkCategoryMasters.ToListAsync();
 
-                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = workItems };
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectId = building.ProjectId };
 
                 await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(workItems, responseMessage, 200));
@@ -808,7 +826,9 @@ namespace MarcoBMS.Services.Controllers
             if (projectAllocationDtos != null && employeeId != Guid.Empty)
             {
                 Guid TenentID = GetTenantId();
+                var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
                 List<object>? result = new List<object>();
+                List<Guid> projectIds = new List<Guid>();
 
                 foreach (var projectAllocationDto in projectAllocationDtos)
                 {
@@ -836,6 +856,8 @@ namespace MarcoBMS.Services.Controllers
                                 projectAllocationFromDb.IsActive = false;
                                 _context.Entry(projectAllocationFromDb).Property(e => e.ReAllocationDate).IsModified = true;
                                 _context.Entry(projectAllocationFromDb).Property(e => e.IsActive).IsModified = true;
+
+                                projectIds.Add(projectAllocation.ProjectId);
                             }
                             await _context.SaveChangesAsync();
                             var result1 = new
@@ -858,6 +880,8 @@ namespace MarcoBMS.Services.Controllers
                             _context.ProjectAllocations.Add(projectAllocation);
                             await _context.SaveChangesAsync();
 
+                            projectIds.Add(projectAllocation.ProjectId);
+
                         }
 
 
@@ -868,6 +892,9 @@ namespace MarcoBMS.Services.Controllers
                         return Ok(ApiResponse<object>.ErrorResponse(ex.Message, ex, 400));
                     }
                 }
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Assign_Project", ProjectIds = projectIds, EmployeeId = employeeId };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
                 return Ok(ApiResponse<object>.SuccessResponse(result, "Data saved successfully", 200));
             }
-- 
2.43.0


From dc21b9d2c662cf0dddc1fb37b496f338a3066ccb Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 16 Jun 2025 15:57:04 +0530
Subject: [PATCH 17/48] Added Functionality for approving the reported task

---
 .../Data/ApplicationDbContext.cs              |   27 +
 ...ved_By_In_TaskAllocation_Table.Designer.cs | 3375 +++++++++++++++++
 ...ded_Apporved_By_In_TaskAllocation_Table.cs |  188 +
 .../ApplicationDbContextModelSnapshot.cs      |  106 +
 Marco.Pms.Model/Activities/TaskAllocation.cs  |   31 +-
 .../Activities/WorkStatusMaster.cs            |   12 +
 .../Dtos/Activities/ApproveTaskDto.cs         |   13 +
 .../Dtos/Activities/AssignTaskDto.cs          |    1 +
 .../Dtos/Activities/ReportTaskDto.cs          |    1 +
 Marco.Pms.Model/Mapper/ActivitiesMapper.cs    |   22 +-
 .../ViewModels/Activities/ListTaskVM.cs       |    9 +-
 .../ViewModels/Activities/TaskVM.cs           |   15 +-
 .../Controllers/TaskController.cs             |  825 ++--
 13 files changed, 4355 insertions(+), 270 deletions(-)
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.Designer.cs
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.cs
 create mode 100644 Marco.Pms.Model/Activities/WorkStatusMaster.cs
 create mode 100644 Marco.Pms.Model/Dtos/Activities/ApproveTaskDto.cs

diff --git a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
index 04cfe61..9d74675 100644
--- a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
+++ b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
@@ -69,6 +69,7 @@ namespace Marco.Pms.DataAccess.Data
         public DbSet<Document> Documents { get; set; }
         public DbSet<TicketTag> TicketTags { get; set; }
         public DbSet<WorkCategoryMaster> WorkCategoryMasters { get; set; }
+        public DbSet<WorkStatusMaster> WorkStatusMasters { get; set; }
         public DbSet<Contact> Contacts { get; set; }
         public DbSet<ContactCategoryMaster> ContactCategoryMasters { get; set; }
         public DbSet<ContactEmail> ContactsEmails { get; set; }
@@ -429,6 +430,32 @@ namespace Marco.Pms.DataAccess.Data
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 }
                 );
+            modelBuilder.Entity<WorkStatusMaster>().HasData(
+                new WorkStatusMaster
+                {
+                    Id = new Guid("030bb085-e230-4370-aec7-9a74d652864e"),
+                    Name = "Approve",
+                    Description = "Confirm the tasks are actually finished as reported",
+                    IsSystem = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                },
+                new WorkStatusMaster
+                {
+                    Id = new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"),
+                    Name = "Partially Approve",
+                    Description = "Not all tasks are actually finished as reported",
+                    IsSystem = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                },
+                new WorkStatusMaster
+                {
+                    Id = new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"),
+                    Name = "NCR",
+                    Description = "Tasks are not finished as reported or have any issues in al the tasks",
+                    IsSystem = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                }
+                );
 
         }
 
diff --git a/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.Designer.cs
new file mode 100644
index 0000000..a00f9f1
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.Designer.cs
@@ -0,0 +1,3375 @@
+// <auto-generated />
+using System;
+using Marco.Pms.DataAccess.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250616064217_Added_Apporved_By_In_TaskAllocation_Table")]
+    partial class Added_Apporved_By_In_TaskAllocation_Table
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            //MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("ApprovedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ApprovedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AssignedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AssignmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("CompletedTask")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("PlannedTask")
+                        .HasColumnType("double");
+
+                    b.Property<Guid?>("ReportedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReportedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("ReportedTask")
+                        .HasColumnType("double");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkItemId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApprovedById");
+
+                    b.HasIndex("AssignedBy");
+
+                    b.HasIndex("ReportedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkItemId");
+
+                    b.HasIndex("WorkStatusId");
+
+                    b.ToTable("TaskAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ReferenceId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CommentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CommentedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentedBy");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskMembers");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ApprovedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AttendanceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("InTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("OutTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ProjectID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Attendes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ActivityTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AttendanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Latitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Longitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("UpdatedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdatedOn")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AttendanceId");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("AttendanceLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MPIN")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MPINToken")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("MPINDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("ExpriesInSec")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OTP")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("OTPDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedByID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedByID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buckets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ContactCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Organization")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactCategoryId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Contacts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactCategoryMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EmailAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactsEmails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactNotes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    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")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactTagId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("ContactTagId");
+
+                    b.ToTable("ContactTagMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactTagMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("RefereanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdateAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("DirectoryUpdateLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("EmployeeBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Base64Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("BatchId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("S3Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ThumbS3Key")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UploadedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AadharNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CurrentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyPhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("JoiningDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MiddleName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PanNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PermanentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.HasIndex("JobRoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("RoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("EmployeeRoleMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeOnly>("EndTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkShifts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsMandatory")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityCheckLists");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("CheckListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FeatureId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeatureId");
+
+                    b.ToTable("FeaturePermissions");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"),
+                            Description = "Access all information related to the project.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "View Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"),
+                            Description = "Potentially edit the project name, description, start/end dates, or status.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"),
+                            Description = "The \"Manage Team\" feature allows authorized users to organize project personnel by adding, removing, and assigning employee to projects.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Team"
+                        },
+                        new
+                        {
+                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "View Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure.",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "Manage Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"),
+                            Description = "Grants a user comprehensive read-only access to all details associated with tasks within a project. This includes task descriptions, statuses, assignees, due dates, dependencies, progress, history, and any related attachments or discussions.",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "View Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("08752f33-3b29-4816-b76b-ea8a968ed3c5"),
+                            Description = "This allows them to create new tasks, modify existing task attributes (description, status, assignee, due date, etc.),",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2"),
+                            Description = "Grants a user the ability to designate team members responsible for specific tasks and to update the completion status or provide progress updates for those tasks",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Assign/Report Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"),
+                            Description = "Grants a user the authority to officially confirm the completion or acceptance of a task, often signifying that it meets the required standards or criteria",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Approve Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                            Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"),
+                            Description = "Grants a user the authority to create new employee profiles and modify existing employee details within the system. This typically includes adding or updating information such as names, contact details, roles, departments, skills, and potentially other personal or professional data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"),
+                            Description = "Grants a user the authority to manage employee application roles, enabling them to assign or revoke access privileges within the system.",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Assign Roles"
+                        },
+                        new
+                        {
+                            Id = new Guid("915e6bff-65f6-4e3f-aea8-3fd217d3ea9e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Team Attendance "
+                        },
+                        new
+                        {
+                            Id = new Guid("57802c4a-00aa-4a1f-a048-fd2f70dd44b6"),
+                            Description = "Grants a user the authority to approve requests from employees to adjust or correct their recorded attendance. This typically involves reviewing the reason for the regularization, verifying any supporting documentation, and then officially accepting the changes to the employee's attendance records",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Regularize Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("ccb0589f-712b-43de-92ed-5b6088e7dc4e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Self Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"),
+                            Description = "Grants a user read-only access to foundational or reference data within the system. \"Masters\" typically refer to predefined lists, categories, or templates that are used throughout the application to standardize information and maintain consistency",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("588a8824-f924-4955-82d8-fc51956cf323"),
+                            Description = "Grants a user the authority to create, modify, and delete foundational or reference data within the system. These \"masters\" are typically the core lists, categories, and configurations that other data and functionalities rely upon, such as departments, job titles, product categories",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("4286a13b-bb40-4879-8c6d-18e9e393beda"),
+                            Description = "Full control over all directories, including the ability to manage permissions for all directories in the system.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Admin"
+                        },
+                        new
+                        {
+                            Id = new Guid("62668630-13ce-4f52-a0f0-db38af2230c5"),
+                            Description = "Full control over directories they created or have been assigned. Can also manage permissions for those directories.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Manager"
+                        },
+                        new
+                        {
+                            Id = new Guid("0f919170-92d4-4337-abd3-49b66fc871bb"),
+                            Description = "Full control over directories they created. Can view contacts in directories they either created or were assigned to. Can manage permissions only for directories they created.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory User"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.Property<Guid>("ApplicationRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FeaturePermissionId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("ApplicationRoleId", "FeaturePermissionId");
+
+                    b.HasIndex("FeaturePermissionId");
+
+                    b.ToTable("RolePermissionMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DomainName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OnBoardingDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IndustryId");
+
+                    b.ToTable("Tenants");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b3466e83-7e11-464c-b93a-daf047838b26"),
+                            ContactName = "Admin",
+                            ContactNumber = "123456789",
+                            Description = "",
+                            DomainName = "www.marcobms.org",
+                            IndustryId = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            IsActive = true,
+                            Name = "MarcoBMS",
+                            OnBoardingDate = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            OragnizationSize = "100-200"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("CommentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MessageText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentMessageId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("SentAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TicketComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("LinkedActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("LinkedProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("PriorityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("StatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PriorityId");
+
+                    b.HasIndex("StatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("Tickets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketTags");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTypeMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTypeMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("c74e5480-2b71-483c-8f4a-1a9c69c32603"),
+                            Description = "An identified problem that affects the performance, reliability, or standards of a product or service",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("d1f55eab-9898-4e46-9f03-b263e33e5d38"),
+                            Description = "A support service that assists users with technical issues, requests, or inquiries.",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("MailListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Recipient")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Schedule")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MailListId");
+
+                    b.ToTable("MailDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmailId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailingList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Keywords")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailingList");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ActivityName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("UnitOfMeasurement")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ActivityMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("ModuleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModuleId");
+
+                    b.ToTable("Features");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            Description = "Manage Project",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            Description = "Manage Infra",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            Description = "Manage Tasks",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Task Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            Description = "Manage Employee",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Employee Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            Description = "Attendance",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            Description = "Global Masters",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Global Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            Description = "Managing all directory related rights",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Directory Management"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Industry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Industries");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            Name = "Information Technology (IT) Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("0a63e657-2c5f-49b5-854b-42c978293154"),
+                            Name = "Manufacturing & Production"
+                        },
+                        new
+                        {
+                            Id = new Guid("bdc61e3b-69ea-4394-bab6-079ec135b5bd"),
+                            Name = "Energy & Resources"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ca200ac-00d7-415e-a410-b948e27ac9d2"),
+                            Name = "Finance & Professional Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("d5621700-cd87-441f-8cdb-6051ddfc83b4"),
+                            Name = "Hospitals and Healthcare Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("23608891-657e-40f0-bbd4-2b0a2ec1a76f"),
+                            Name = "Social Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("a493f4e3-16b1-4411-be3c-6bf2987a3168"),
+                            Name = "Retail & Consumer Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("e9d8ce92-9371-4ed9-9831-83c07f78edec"),
+                            Name = "Transportation & Logistics"
+                        },
+                        new
+                        {
+                            Id = new Guid("8a0d6134-2dbe-4e0a-b250-ff34cb7b9df0"),
+                            Name = "Education & Training"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Module", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Modules");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Description = "Project Module",
+                            Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02",
+                            Name = "Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Description = "Employee Module",
+                            Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637",
+                            Name = "Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Description = "Masters Module",
+                            Key = "504ec132-e6a9-422f-8f85-050602cfce05",
+                            Name = "Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("StatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            Status = "Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Status = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "On Hold",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
+                            Status = "Completed",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketPriorityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Level")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketPriorityMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("188d29b3-10f3-42d0-9587-1a46ae7a0320"),
+                            ColorCode = "008000",
+                            IsDefault = true,
+                            Level = 1,
+                            Name = "Low",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("0919bc84-9f82-4ecf-98c7-962755dd9a97"),
+                            ColorCode = "FFFF00",
+                            IsDefault = true,
+                            Level = 2,
+                            Name = "Medium",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 3,
+                            Name = "High",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 4,
+                            Name = "Critical",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("44a7b91d-a0dd-45d1-8616-4d2f71e16401"),
+                            ColorCode = "#FF0000",
+                            IsDefault = true,
+                            Level = 5,
+                            Name = "Urgent",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6b0c409b-3e80-4165-8b39-f3fcacb4c797"),
+                            ColorCode = "#FFCC99",
+                            Description = "This is a newly created issue.",
+                            IsDefault = true,
+                            Name = "New",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("6c5ac37d-5b7d-40f3-adec-2dabaa5cca86"),
+                            ColorCode = "#E6FF99",
+                            Description = "Assigned to employee or team of employees",
+                            IsDefault = true,
+                            Name = "Assigned",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("7f96bcd5-0c66-411b-8a1d-9d1a4785194e"),
+                            ColorCode = "#99E6FF",
+                            Description = "These issues are currently in progress",
+                            IsDefault = true,
+                            Name = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5c72b630-6923-4215-bf2c-b1622afd76e7"),
+                            ColorCode = "#6c757d",
+                            Description = "These issues are currently under review",
+                            IsDefault = true,
+                            Name = "In Review",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("8ff85685-a875-4f21-aa95-d99551315fcc"),
+                            ColorCode = "#B399FF",
+                            Description = "The following issues are resolved and closed",
+                            IsDefault = true,
+                            Name = "Done",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTagMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("ef6c2a65-f61d-4537-9650-a7ab7f8d98db"),
+                            ColorCode = "#e59866",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5a168569-8ad7-4422-8db6-51ef25caddeb"),
+                            ColorCode = "#85c1e9",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkCategoryMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("86bb2cc8-f6b5-4fdd-bbee-c389c713a44b"),
+                            Description = "Created new task in a professional or creative context",
+                            IsSystem = true,
+                            Name = "Fresh Work",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("9ebfa19c-53b9-481b-b863-c25d2f843201"),
+                            Description = "Revising, modifying, or correcting a task to improve its quality or fix issues",
+                            IsSystem = true,
+                            Name = "Rework",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("11a79929-1d07-42dc-9e98-82d0d2f4a240"),
+                            Description = "Any defect, deviation, or non-conformance in a task that fails to meet established standards or customer expectations.",
+                            IsSystem = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("030bb085-e230-4370-aec7-9a74d652864e"),
+                            Description = "Confirm the tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"),
+                            Description = "Not all tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Partially Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"),
+                            Description = "Tasks are not finished as reported or have any issues in al the tasks",
+                            IsSystem = true,
+                            Name = "NCR",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buildings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BuildingId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Floor");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProjectAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ShortName")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectStatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Projects");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("85bf587b-7ca9-4685-b77c-d817f5847e85"),
+                            ContactPerson = "Project 1 Contact Person",
+                            EndDate = new DateTime(2026, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            Name = "Project 1",
+                            ProjectAddress = "Project 1 Address",
+                            ProjectStatusId = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            StartDate = new DateTime(2025, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReAllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ProjectAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AreaName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FloorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FloorId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkAreas");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("CompletedWork")
+                        .HasColumnType("double");
+
+                    b.Property<double>("PlannedWork")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime>("TaskDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkAreaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActivityId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkAreaId");
+
+                    b.HasIndex("WorkCategoryId");
+
+                    b.ToTable("WorkItems");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ApplicationRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("JobRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Utilities.Inquiries", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("About")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrganizatioinName")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Inquiries");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("varchar(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator().HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("IsRootUser")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ApprovedBy")
+                        .WithMany()
+                        .HasForeignKey("ApprovedById");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("AssignedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ReportedBy")
+                        .WithMany()
+                        .HasForeignKey("ReportedById");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem")
+                        .WithMany()
+                        .HasForeignKey("WorkItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkStatusMaster", "WorkStatus")
+                        .WithMany()
+                        .HasForeignKey("WorkStatusId");
+
+                    b.Navigation("ApprovedBy");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("ReportedBy");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkItem");
+
+                    b.Navigation("WorkStatus");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("CommentedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Approver")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Approver");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.AttendanceModule.Attendance", "Attendance")
+                        .WithMany()
+                        .HasForeignKey("AttendanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.DocumentManager.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedByEmployee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy");
+
+                    b.Navigation("Attendance");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedByEmployee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedByID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.ContactCategoryMaster", "ContactCategory")
+                        .WithMany()
+                        .HasForeignKey("ContactCategoryId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ContactCategory");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Createdby")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Createdby");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.ContactTagMaster", "ContactTag")
+                        .WithMany()
+                        .HasForeignKey("ContactTagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("ContactTag");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationUser", "ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.HasOne("Marco.Pms.Model.Roles.JobRole", "JobRole")
+                        .WithMany()
+                        .HasForeignKey("JobRoleId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("JobRole");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Role");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Feature", "Feature")
+                        .WithMany("FeaturePermissions")
+                        .HasForeignKey("FeatureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feature");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.FeaturePermission", null)
+                        .WithMany()
+                        .HasForeignKey("FeaturePermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Industry", "Industry")
+                        .WithMany()
+                        .HasForeignKey("IndustryId");
+
+                    b.Navigation("Industry");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Forum.TicketComment", "TicketComment")
+                        .WithMany("Attachments")
+                        .HasForeignKey("CommentId");
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ticket");
+
+                    b.Navigation("TicketComment");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketPriorityMaster", "Priority")
+                        .WithMany()
+                        .HasForeignKey("PriorityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.TicketStatusMaster", "TicketStatusMaster")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketTypeMaster", "TicketTypeMaster")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Priority");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("TicketStatusMaster");
+
+                    b.Navigation("TicketTypeMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketTagMaster", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+
+                    b.Navigation("Ticket");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Mail.MailingList", "MailBody")
+                        .WithMany()
+                        .HasForeignKey("MailListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MailBody");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Module", "Module")
+                        .WithMany()
+                        .HasForeignKey("ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Building", "Building")
+                        .WithMany()
+                        .HasForeignKey("BuildingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Building");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.StatusMaster", "ProjectStatus")
+                        .WithMany()
+                        .HasForeignKey("ProjectStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProjectStatus");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .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("Employee");
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Floor", "Floor")
+                        .WithMany()
+                        .HasForeignKey("FloorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Floor");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.ActivityMaster", "ActivityMaster")
+                        .WithMany()
+                        .HasForeignKey("ActivityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea")
+                        .WithMany()
+                        .HasForeignKey("WorkAreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkCategoryMaster", "WorkCategoryMaster")
+                        .WithMany()
+                        .HasForeignKey("WorkCategoryId");
+
+                    b.Navigation("ActivityMaster");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkArea");
+
+                    b.Navigation("WorkCategoryMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Navigation("FeaturePermissions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.cs b/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.cs
new file mode 100644
index 0000000..62cd405
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.cs
@@ -0,0 +1,188 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_Apporved_By_In_TaskAllocation_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "ApprovedById",
+                table: "TaskAllocations",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "ApprovedDate",
+                table: "TaskAllocations",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ParentTaskId",
+                table: "TaskAllocations",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ReportedById",
+                table: "TaskAllocations",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<double>(
+                name: "ReportedTask",
+                table: "TaskAllocations",
+                type: "double",
+                nullable: false,
+                defaultValue: 0.0);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "WorkStatusId",
+                table: "TaskAllocations",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateTable(
+                name: "WorkStatusMasters",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsSystem = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WorkStatusMasters", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_WorkStatusMasters_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.InsertData(
+                table: "WorkStatusMasters",
+                columns: new[] { "Id", "Description", "IsSystem", "Name", "TenantId" },
+                values: new object[,]
+                {
+                    { new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"), "Tasks are not finished as reported or have any issues in al the tasks", true, "NCR", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("030bb085-e230-4370-aec7-9a74d652864e"), "Confirm the tasks are actually finished as reported", true, "Approve", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"), "Not all tasks are actually finished as reported", true, "Partially Approve", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TaskAllocations_ApprovedById",
+                table: "TaskAllocations",
+                column: "ApprovedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TaskAllocations_ReportedById",
+                table: "TaskAllocations",
+                column: "ReportedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TaskAllocations_WorkStatusId",
+                table: "TaskAllocations",
+                column: "WorkStatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WorkStatusMasters_TenantId",
+                table: "WorkStatusMasters",
+                column: "TenantId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_TaskAllocations_Employees_ApprovedById",
+                table: "TaskAllocations",
+                column: "ApprovedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_TaskAllocations_Employees_ReportedById",
+                table: "TaskAllocations",
+                column: "ReportedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_TaskAllocations_WorkStatusMasters_WorkStatusId",
+                table: "TaskAllocations",
+                column: "WorkStatusId",
+                principalTable: "WorkStatusMasters",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_TaskAllocations_Employees_ApprovedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_TaskAllocations_Employees_ReportedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_TaskAllocations_WorkStatusMasters_WorkStatusId",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropTable(
+                name: "WorkStatusMasters");
+
+            migrationBuilder.DropIndex(
+                name: "IX_TaskAllocations_ApprovedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropIndex(
+                name: "IX_TaskAllocations_ReportedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropIndex(
+                name: "IX_TaskAllocations_WorkStatusId",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "ApprovedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "ApprovedDate",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "ParentTaskId",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "ReportedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "ReportedTask",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "WorkStatusId",
+                table: "TaskAllocations");
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
index 245470a..4988121 100644
--- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -28,6 +28,12 @@ namespace Marco.Pms.DataAccess.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
+                    b.Property<Guid?>("ApprovedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ApprovedDate")
+                        .HasColumnType("datetime(6)");
+
                     b.Property<Guid>("AssignedBy")
                         .HasColumnType("char(36)");
 
@@ -40,26 +46,44 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<string>("Description")
                         .HasColumnType("longtext");
 
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
                     b.Property<double>("PlannedTask")
                         .HasColumnType("double");
 
+                    b.Property<Guid?>("ReportedById")
+                        .HasColumnType("char(36)");
+
                     b.Property<DateTime?>("ReportedDate")
                         .HasColumnType("datetime(6)");
 
+                    b.Property<double>("ReportedTask")
+                        .HasColumnType("double");
+
                     b.Property<Guid>("TenantId")
                         .HasColumnType("char(36)");
 
                     b.Property<Guid>("WorkItemId")
                         .HasColumnType("char(36)");
 
+                    b.Property<Guid?>("WorkStatusId")
+                        .HasColumnType("char(36)");
+
                     b.HasKey("Id");
 
+                    b.HasIndex("ApprovedById");
+
                     b.HasIndex("AssignedBy");
 
+                    b.HasIndex("ReportedById");
+
                     b.HasIndex("TenantId");
 
                     b.HasIndex("WorkItemId");
 
+                    b.HasIndex("WorkStatusId");
+
                     b.ToTable("TaskAllocations");
                 });
 
@@ -1920,6 +1944,59 @@ namespace Marco.Pms.DataAccess.Migrations
                         });
                 });
 
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("030bb085-e230-4370-aec7-9a74d652864e"),
+                            Description = "Confirm the tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"),
+                            Description = "Not all tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Partially Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"),
+                            Description = "Tasks are not finished as reported or have any issues in al the tasks",
+                            IsSystem = true,
+                            Name = "NCR",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
             modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
                 {
                     b.Property<Guid>("Id")
@@ -2429,12 +2506,20 @@ namespace Marco.Pms.DataAccess.Migrations
 
             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
                 {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ApprovedBy")
+                        .WithMany()
+                        .HasForeignKey("ApprovedById");
+
                     b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
                         .WithMany()
                         .HasForeignKey("AssignedBy")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ReportedBy")
+                        .WithMany()
+                        .HasForeignKey("ReportedById");
+
                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
                         .WithMany()
                         .HasForeignKey("TenantId")
@@ -2447,11 +2532,21 @@ namespace Marco.Pms.DataAccess.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Marco.Pms.Model.Master.WorkStatusMaster", "WorkStatus")
+                        .WithMany()
+                        .HasForeignKey("WorkStatusId");
+
+                    b.Navigation("ApprovedBy");
+
                     b.Navigation("Employee");
 
+                    b.Navigation("ReportedBy");
+
                     b.Navigation("Tenant");
 
                     b.Navigation("WorkItem");
+
+                    b.Navigation("WorkStatus");
                 });
 
             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
@@ -3052,6 +3147,17 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Navigation("Tenant");
                 });
 
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
             modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
                 {
                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
diff --git a/Marco.Pms.Model/Activities/TaskAllocation.cs b/Marco.Pms.Model/Activities/TaskAllocation.cs
index 3347cef..4c8681c 100644
--- a/Marco.Pms.Model/Activities/TaskAllocation.cs
+++ b/Marco.Pms.Model/Activities/TaskAllocation.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using Marco.Pms.Model.Employees;
+using Marco.Pms.Model.Master;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
@@ -10,29 +11,43 @@ namespace Marco.Pms.Model.Activities
     public class TaskAllocation : TenantRelation
     {
         public Guid Id { get; set; }
-
-
+        public Guid? ParentTaskId { get; set; }
         public DateTime AssignmentDate { get; set; }
         public double PlannedTask { get; set; }
         public double CompletedTask { get; set; }
+        public double ReportedTask { get; set; }
         public DateTime? ReportedDate { get; set; }
-
+        public DateTime? ApprovedDate { get; set; }
         public string? Description { get; set; }
 
-        //public int? WorkItemMappingId { get; set; }
-        //[ForeignKey("WorkItemMappingId")]
-        //[ValidateNever]
-        //public WorkItemMapping? WorkItemMapping { get; set; }
+        public Guid AssignedBy { get; set; }   //Employee Id 
 
-        public Guid AssignedBy { get; set; }   //Employee Id
         [ForeignKey("AssignedBy")]
         [ValidateNever]
         public Employee? Employee { get; set; }
 
+        public Guid? ReportedById { get; set; }   //Employee Id
+
+        [ForeignKey("ReportedById")]
+        [ValidateNever]
+        public Employee? ReportedBy { get; set; }
+
+        public Guid? ApprovedById { get; set; }   //Employee Id
+
+        [ForeignKey("ApprovedById")]
+        [ValidateNever]
+        public Employee? ApprovedBy { get; set; }
+
         public Guid WorkItemId { get; set; }
+
         [ForeignKey("WorkItemId")]
         [ValidateNever]
         public WorkItem? WorkItem { get; set; }
 
+        public Guid? WorkStatusId { get; set; }
+
+        [ForeignKey("WorkStatusId")]
+        [ValidateNever]
+        public WorkStatusMaster? WorkStatus { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Activities/WorkStatusMaster.cs b/Marco.Pms.Model/Activities/WorkStatusMaster.cs
new file mode 100644
index 0000000..52074c7
--- /dev/null
+++ b/Marco.Pms.Model/Activities/WorkStatusMaster.cs
@@ -0,0 +1,12 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Master
+{
+    public class WorkStatusMaster : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public string Description { get; set; } = string.Empty;
+        public bool IsSystem { get; set; } = false;
+    }
+}
diff --git a/Marco.Pms.Model/Dtos/Activities/ApproveTaskDto.cs b/Marco.Pms.Model/Dtos/Activities/ApproveTaskDto.cs
new file mode 100644
index 0000000..cada0f5
--- /dev/null
+++ b/Marco.Pms.Model/Dtos/Activities/ApproveTaskDto.cs
@@ -0,0 +1,13 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.Activities
+{
+    public class ApproveTaskDto
+    {
+        public Guid Id { get; set; }
+        public Guid WorkStatus { get; set; }
+        public long ApprovedTask { get; set; }
+        public string? Comment { get; set; }
+        public List<FileUploadModel>? Images { get; set; }
+    }
+}
diff --git a/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs b/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs
index 671902e..a4423f0 100644
--- a/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs
@@ -3,6 +3,7 @@
     public class AssignTaskDto
     {
         public DateTime AssignmentDate { get; set; }
+        public Guid? ParentTaskId { get; set; }
         public double PlannedTask { get; set; }
         public string? Description { get; set; }
         public List<Guid>? TaskTeam { get; set; }   //Employee Ids
diff --git a/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs b/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
index 13eb9b5..d63b653 100644
--- a/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
@@ -5,6 +5,7 @@ namespace Marco.Pms.Model.Dtos.Activities
     public class ReportTaskDto
     {
         public Guid Id { get; set; }
+        public Guid? ParentTaskId { get; set; }
         public double CompletedTask { get; set; }
         public DateTime ReportedDate { get; set; }
         public string? Comment { get; set; }
diff --git a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
index f860bac..4083ccf 100644
--- a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
+++ b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
@@ -13,6 +13,7 @@ namespace Marco.Pms.Model.Mapper
             return new TaskAllocation
             {
                 AssignmentDate = assignTask.AssignmentDate,
+                ParentTaskId = assignTask.ParentTaskId,
                 PlannedTask = assignTask.PlannedTask,
                 CompletedTask = 0,
                 Description = assignTask.Description,
@@ -43,18 +44,23 @@ namespace Marco.Pms.Model.Mapper
                 TenantId = tenantId
             };
         }
-        public static TaskVM TaskAllocationToTaskVM(this TaskAllocation taskAllocation, string employeeName)
+        public static TaskVM TaskAllocationToTaskVM(this TaskAllocation taskAllocation)
         {
             return new TaskVM
             {
                 Id = taskAllocation.Id,
                 AssignmentDate = taskAllocation.AssignmentDate,
+                ReportedDate = taskAllocation.ReportedDate,
+                ApprovedDate = taskAllocation.ApprovedDate,
                 PlannedTask = taskAllocation.PlannedTask,
                 CompletedTask = taskAllocation.CompletedTask,
-                ReportedDate = taskAllocation.ReportedDate,
+                NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.ReportedTask - taskAllocation.CompletedTask),
                 Description = taskAllocation.Description,
-                AssignBy = employeeName,
-                WorkItem = taskAllocation.WorkItem
+                AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(),
+                ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(),
+                ApprovedBy = taskAllocation.ApprovedBy?.ToBasicEmployeeVMFromEmployee(),
+                WorkItem = taskAllocation.WorkItem,
+                WorkStatus = taskAllocation.WorkStatus
             };
         }
         public static AssignedTaskVM ToAssignTaskVMFromTaskAllocation(this TaskAllocation taskAllocation)
@@ -100,12 +106,18 @@ namespace Marco.Pms.Model.Mapper
             return new ListTaskVM
             {
                 Id = taskAllocation.Id,
+                ParentTaskId = taskAllocation.ParentTaskId,
                 AssignmentDate = taskAllocation.AssignmentDate,
+                ApprovedDate = taskAllocation.ApprovedDate,
                 Description = taskAllocation.Description,
                 PlannedTask = taskAllocation.PlannedTask,
                 ReportedDate = taskAllocation.ReportedDate,
+                WorkStatus = taskAllocation.WorkStatus,
                 CompletedTask = taskAllocation.CompletedTask,
-                AssignedBy = taskAllocation.Employee != null ? taskAllocation.Employee.ToBasicEmployeeVMFromEmployee() : new BasicEmployeeVM(),
+                NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.ReportedTask - taskAllocation.CompletedTask),
+                AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(),
+                ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(),
+                ApprovedBy = taskAllocation.ApprovedBy?.ToBasicEmployeeVMFromEmployee(),
                 WorkItemId = taskAllocation.WorkItemId,
                 WorkItem = taskAllocation.WorkItem
             };
diff --git a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
index 9785bd2..c71b813 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
@@ -1,15 +1,22 @@
-using Marco.Pms.Model.Projects;
+using Marco.Pms.Model.Master;
+using Marco.Pms.Model.Projects;
 
 namespace Marco.Pms.Model.ViewModels.Activities
 {
     public class ListTaskVM
     {
         public Guid Id { get; set; }
+        public Guid? ParentTaskId { get; set; }
         public DateTime AssignmentDate { get; set; }
         public DateTime? ReportedDate { get; set; }
+        public DateTime? ApprovedDate { get; set; }
         public double PlannedTask { get; set; }
         public double CompletedTask { get; set; }
+        public double NotApprovedTask { get; set; }
         public BasicEmployeeVM? AssignedBy { get; set; }
+        public BasicEmployeeVM? ReportedBy { get; set; }
+        public BasicEmployeeVM? ApprovedBy { get; set; }
+        public WorkStatusMaster? WorkStatus { get; set; }
         public string? Description { get; set; }
         public Guid WorkItemId { get; set; }
         public List<string>? ReportedPreSignedUrls { get; set; }
diff --git a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
index 18a29b0..f3373b4 100644
--- a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
@@ -1,5 +1,5 @@
-using Marco.Pms.Model.Projects;
-using Marco.Pms.Model.ViewModels.Employee;
+using Marco.Pms.Model.Master;
+using Marco.Pms.Model.Projects;
 
 namespace Marco.Pms.Model.ViewModels.Activities
 {
@@ -7,14 +7,19 @@ namespace Marco.Pms.Model.ViewModels.Activities
     {
         public Guid Id { get; set; }
         public DateTime AssignmentDate { get; set; }
+        public DateTime? ReportedDate { get; set; }
+        public DateTime? ApprovedDate { get; set; }
         public double PlannedTask { get; set; }
         public double CompletedTask { get; set; }
-        public DateTime? ReportedDate { get; set; }
+        public double NotApprovedTask { get; set; }
         public string? Description { get; set; }
-        public string? AssignBy { get; set; }
+        public BasicEmployeeVM? AssignedBy { get; set; }
+        public BasicEmployeeVM? ReportedBy { get; set; }
+        public BasicEmployeeVM? ApprovedBy { get; set; }
+        public WorkStatusMaster? WorkStatus { get; set; }
         public WorkItem? WorkItem { get; set; }
         public List<string>? PreSignedUrls { get; set; }
         public List<CommentVM>? Comments { get; set; }
-        public List<EmployeeVM>? TeamMembers { get; set; }
+        public List<BasicEmployeeVM>? TeamMembers { get; set; }
     }
 }
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index ea4fbf1..ab34561 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -1,15 +1,14 @@
 using Marco.Pms.DataAccess.Data;
 using Marco.Pms.Model.Activities;
 using Marco.Pms.Model.Dtos.Activities;
-using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Mapper;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Activities;
-using Marco.Pms.Model.ViewModels.Employee;
 using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
+using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.CodeAnalysis;
@@ -27,13 +26,20 @@ namespace MarcoBMS.Services.Controllers
         private readonly ApplicationDbContext _context;
         private readonly UserHelper _userHelper;
         private readonly S3UploadService _s3Service;
+        private readonly ILoggingService _logger;
+        private readonly PermissionServices _permissionServices;
+        private readonly Guid Approve_Task;
+        private readonly Guid Assign_Report_Task;
 
-
-        public TaskController(ApplicationDbContext context, UserHelper userHelper, S3UploadService s3Service)
+        public TaskController(ApplicationDbContext context, UserHelper userHelper, S3UploadService s3Service, ILoggingService logger, PermissionServices permissionServices)
         {
             _context = context;
             _userHelper = userHelper;
             _s3Service = s3Service;
+            _logger = logger;
+            _permissionServices = permissionServices;
+            Approve_Task = Guid.Parse("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c");
+            Assign_Report_Task = Guid.Parse("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2");
         }
 
         private Guid GetTenantId()
@@ -44,49 +50,68 @@ namespace MarcoBMS.Services.Controllers
         [HttpPost("assign")]
         public async Task<IActionResult> AssignTask([FromBody] AssignTaskDto assignTask)
         {
+            // Validate the incoming model
             if (!ModelState.IsValid)
             {
                 var errors = ModelState.Values
                     .SelectMany(v => v.Errors)
                     .Select(e => e.ErrorMessage)
                     .ToList();
+
+                _logger.LogWarning("AssignTask failed validation: {@Errors}", errors);
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
-
             }
-            var tenantId = GetTenantId();
-            var Employee = await _userHelper.GetCurrentEmployeeAsync();
 
-            var taskAllocation = assignTask.ToTaskAllocationFromAssignTaskDto(Employee.Id, tenantId);
+            // Retrieve tenant and employee context
+            var tenantId = GetTenantId();
+            var employee = await _userHelper.GetCurrentEmployeeAsync();
+
+            // Check for permission to approve tasks
+            var hasPermission = await _permissionServices.HasPermission(Assign_Report_Task, employee.Id);
+            if (!hasPermission)
+            {
+                _logger.LogWarning("Employee {EmployeeId} attempted to assign Task without permission", employee.Id);
+                return StatusCode(403, ApiResponse<object>.ErrorResponse("You don't have access", "User not authorized to approve tasks", 403));
+            }
+
+            _logger.LogInfo("Employee {EmployeeId} is assigning a new task", employee.Id);
+
+            // Convert DTO to entity and save TaskAllocation
+            var taskAllocation = assignTask.ToTaskAllocationFromAssignTaskDto(employee.Id, tenantId);
             _context.TaskAllocations.Add(taskAllocation);
             await _context.SaveChangesAsync();
+
+            _logger.LogInfo("Task {TaskId} assigned by Employee {EmployeeId}", taskAllocation.Id, employee.Id);
+
             var response = taskAllocation.ToAssignTaskVMFromTaskAllocation();
 
-            var teamMembers = new List<TaskMembers> { };
-            if (assignTask.TaskTeam != null)
+            // Map team members
+            var teamMembers = new List<TaskMembers>();
+            if (assignTask.TaskTeam != null && assignTask.TaskTeam.Any())
             {
-                foreach (var teamMember in assignTask.TaskTeam)
+                teamMembers = assignTask.TaskTeam.Select(memberId => new TaskMembers
                 {
-                    var result = new TaskMembers
-                    {
-                        TaskAllocationId = taskAllocation.Id,
-                        EmployeeId = teamMember,
-                        TenantId = tenantId,
-                    };
-                    teamMembers.Add(result);
-                }
-            }
-            _context.TaskMembers.AddRange(teamMembers);
-            await _context.SaveChangesAsync();
+                    TaskAllocationId = taskAllocation.Id,
+                    EmployeeId = memberId,
+                    TenantId = tenantId
+                }).ToList();
 
-            var idList = teamMembers.Select(m => m.EmployeeId);
-            List<Employee> employees = await _context.Employees.Where(e => idList.Contains(e.Id)).ToListAsync();
-            List<BasicEmployeeVM> team = new List<BasicEmployeeVM>();
-            foreach (var employee in employees)
-            {
-                team.Add(employee.ToBasicEmployeeVMFromEmployee());
+                _context.TaskMembers.AddRange(teamMembers);
+                await _context.SaveChangesAsync();
+
+                _logger.LogInfo("Team members added to Task {TaskId}: {@TeamMemberIds}", taskAllocation.Id, assignTask.TaskTeam);
             }
+
+            // Get team member details
+            var employeeIds = teamMembers.Select(m => m.EmployeeId).ToList();
+            var employees = await _context.Employees
+                .Where(e => employeeIds.Contains(e.Id))
+                .ToListAsync();
+
+            var team = employees.Select(e => e.ToBasicEmployeeVMFromEmployee()).ToList();
             response.teamMembers = team;
-            return Ok(ApiResponse<object>.SuccessResponse(response, "Task assignned successfully", 200));
+
+            return Ok(ApiResponse<object>.SuccessResponse(response, "Task assigned successfully", 200));
         }
 
         [HttpPost("report")]
@@ -98,363 +123,661 @@ namespace MarcoBMS.Services.Controllers
                     .SelectMany(v => v.Errors)
                     .Select(e => e.ErrorMessage)
                     .ToList();
+
+                _logger.LogWarning("Task report validation failed: {@Errors}", errors);
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
-
             }
+
             var tenantId = GetTenantId();
-            var Employee = await _userHelper.GetCurrentEmployeeAsync();
+            var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
 
-            var taskAllocation = await _context.TaskAllocations.Include(t => t.WorkItem).FirstOrDefaultAsync(t => t.Id == reportTask.Id);
-
-            var checkListIds = reportTask.CheckList != null ? reportTask.CheckList.Select(c => c.Id).ToList() : new List<Guid>();
-            var checkList = await _context.ActivityCheckLists.Where(c => checkListIds.Contains(c.Id)).ToListAsync();
-            if (taskAllocation == null || taskAllocation.WorkItem == null)
+            var hasPermission = await _permissionServices.HasPermission(Assign_Report_Task, loggedInEmployee.Id);
+            if (!hasPermission)
             {
+                _logger.LogWarning("Unauthorized task report attempt by Employee {EmployeeId} for Task {TaskId}", loggedInEmployee.Id, reportTask.Id);
+                return StatusCode(403, ApiResponse<object>.ErrorResponse("You don't have access", "User not authorized to report tasks", 403));
+            }
+
+            var taskAllocation = await _context.TaskAllocations
+                .Include(t => t.WorkItem)
+                .FirstOrDefaultAsync(t => t.Id == reportTask.Id);
+
+            if (taskAllocation == null)
+            {
+                _logger.LogWarning("No task allocation found with ID {TaskId}", reportTask.Id);
                 return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400));
             }
-            WorkArea workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == taskAllocation.WorkItem.WorkAreaId) ?? new WorkArea();
 
-            var bulding = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty));
+            var checkListIds = reportTask.CheckList?.Select(c => c.Id).ToList() ?? new List<Guid>();
+            var checkList = await _context.ActivityCheckLists
+                .Where(c => checkListIds.Contains(c.Id))
+                .ToListAsync();
+
             if (taskAllocation.WorkItem != null)
             {
-                if (taskAllocation.CompletedTask != 0)
-                {
+                if (taskAllocation.CompletedTask > 0)
                     taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
-                }
-                taskAllocation.ReportedDate = reportTask.ReportedDate;
-                taskAllocation.CompletedTask = reportTask.CompletedTask;
+
                 taskAllocation.WorkItem.CompletedWork += reportTask.CompletedTask;
             }
-            List<CheckListMappings> checkListMappings = new List<CheckListMappings>();
-            List<CheckListVM> checkListVMs = new List<CheckListVM>();
+
+            taskAllocation.ParentTaskId = reportTask.ParentTaskId;
+            taskAllocation.ReportedDate = reportTask.ReportedDate;
+            taskAllocation.ReportedById = loggedInEmployee.Id;
+            taskAllocation.CompletedTask = reportTask.CompletedTask;
+            taskAllocation.ReportedTask = reportTask.CompletedTask;
+
+            var checkListMappings = new List<CheckListMappings>();
+            var checkListVMs = new List<CheckListVM>();
+
             if (reportTask.CheckList != null)
             {
+                var activityId = taskAllocation.WorkItem?.ActivityId ?? Guid.Empty;
+
                 foreach (var checkDto in reportTask.CheckList)
                 {
-                    checkListVMs.Add(checkDto.ToCheckListVMFromReportCheckListDto(taskAllocation.WorkItem != null ? taskAllocation.WorkItem.ActivityId : Guid.Empty));
-                    if (checkDto.IsChecked)
+                    checkListVMs.Add(checkDto.ToCheckListVMFromReportCheckListDto(activityId));
+
+                    if (checkDto.IsChecked && checkList.Any(c => c.Id == checkDto.Id))
                     {
-                        var check = checkList.Find(c => c.Id == checkDto.Id);
-                        if (check != null)
+                        checkListMappings.Add(new CheckListMappings
                         {
-                            CheckListMappings checkListMapping = new CheckListMappings
-                            {
-                                CheckListId = check.Id,
-                                TaskAllocationId = reportTask.Id
-                            };
-                            checkListMappings.Add(checkListMapping);
-                        }
+                            CheckListId = checkDto.Id,
+                            TaskAllocationId = reportTask.Id
+                        });
                     }
                 }
+
+                _context.CheckListMappings.AddRange(checkListMappings);
             }
-            _context.CheckListMappings.AddRange(checkListMappings);
-            var comment = reportTask.ToCommentFromReportTaskDto(tenantId, Employee.Id);
 
-            var Images = reportTask.Images;
+            var comment = reportTask.ToCommentFromReportTaskDto(tenantId, loggedInEmployee.Id);
+            _context.TaskComments.Add(comment);
 
-            if (Images != null && Images.Count > 0)
+            if (reportTask.Images?.Any() == true)
             {
+                var workAreaId = taskAllocation.WorkItem?.WorkAreaId;
+                var workArea = await _context.WorkAreas.Include(a => a.Floor)
+                    .FirstOrDefaultAsync(a => a.Id == workAreaId) ?? new WorkArea();
 
-                foreach (var Image in Images)
+                var buildingId = workArea.Floor?.BuildingId;
+
+                var building = await _context.Buildings
+                    .FirstOrDefaultAsync(b => b.Id == buildingId);
+
+                foreach (var image in reportTask.Images)
                 {
-
-                    if (string.IsNullOrEmpty(Image.Base64Data))
+                    if (string.IsNullOrEmpty(image.Base64Data))
+                    {
+                        _logger.LogWarning("Image upload failed: Base64 data is missing");
                         return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+                    }
 
-                    //If base64 has a data URI prefix, strip it
-                    var base64 = Image.Base64Data.Contains(",")
-                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
-                        : Image.Base64Data;
+                    var base64 = image.Base64Data.Contains(',')
+                        ? image.Base64Data[(image.Base64Data.IndexOf(",") + 1)..]
+                        : image.Base64Data;
 
-                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
-                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_report");
+                    var fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    var fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_report");
+                    var objectKey = $"tenant-{tenantId}/project-{building?.ProjectId}/Actitvity/{fileName}";
 
-                    string objectKey = $"tenant-{tenantId}/project-{bulding?.ProjectId}/Actitvity/{fileName}";
                     await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
-                    Document document = new Document
+                    var document = new Document
                     {
-                        FileName = Image.FileName ?? "",
-                        ContentType = Image.ContentType ?? "",
+                        FileName = image.FileName ?? "",
+                        ContentType = image.ContentType ?? "",
                         S3Key = objectKey,
-                        Base64Data = Image.Base64Data,
-                        FileSize = Image.FileSize,
+                        Base64Data = image.Base64Data,
+                        FileSize = image.FileSize,
                         UploadedAt = DateTime.UtcNow,
                         TenantId = tenantId
                     };
                     _context.Documents.Add(document);
-                    TaskAttachment attachment = new TaskAttachment
+
+                    var attachment = new TaskAttachment
                     {
                         DocumentId = document.Id,
                         ReferenceId = reportTask.Id
                     };
                     _context.TaskAttachments.Add(attachment);
                 }
-                await _context.SaveChangesAsync();
             }
 
-            _context.TaskComments.Add(comment);
             await _context.SaveChangesAsync();
 
             var response = taskAllocation.ToReportTaskVMFromTaskAllocation();
-            List<TaskComment> comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
-            List<CommentVM> resultComments = new List<CommentVM> { };
-            foreach (var result in comments)
-            {
-                resultComments.Add(result.ToCommentVMFromTaskComment());
-            }
-            response.Comments = resultComments;
+            var comments = await _context.TaskComments
+                .Where(c => c.TaskAllocationId == taskAllocation.Id)
+                .ToListAsync();
+
+            response.Comments = comments.Select(c => c.ToCommentVMFromTaskComment()).ToList();
             response.checkList = checkListVMs;
+
+            _logger.LogInfo("Task {TaskId} reported successfully by Employee {EmployeeId}", taskAllocation.Id, loggedInEmployee.Id);
+
             return Ok(ApiResponse<object>.SuccessResponse(response, "Task reported successfully", 200));
         }
 
         [HttpPost("comment")]
         public async Task<IActionResult> AddCommentForTask([FromBody] CreateCommentDto createComment)
         {
-            var tenantId = GetTenantId();
-            var Employee = await _userHelper.GetCurrentEmployeeAsync();
+            _logger.LogInfo("AddCommentForTask called for TaskAllocationId: {TaskId}", createComment.TaskAllocationId);
+
+            var tenantId = GetTenantId();
+            var employee = await _userHelper.GetCurrentEmployeeAsync();
+
+            // Validate Task Allocation and associated WorkItem
+            var taskAllocation = await _context.TaskAllocations
+                .Include(t => t.WorkItem)
+                .FirstOrDefaultAsync(t => t.Id == createComment.TaskAllocationId);
 
-            var taskAllocation = await _context.TaskAllocations.Include(t => t.WorkItem).FirstOrDefaultAsync(t => t.Id == createComment.TaskAllocationId);
             if (taskAllocation == null || taskAllocation.WorkItem == null)
             {
+                _logger.LogWarning("Invalid task allocation or work item not found.");
                 return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400));
             }
-            WorkArea workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == taskAllocation.WorkItem.WorkAreaId) ?? new WorkArea();
 
-            var bulding = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty));
+            // Fetch WorkArea and Building (if available)
+            var workArea = await _context.WorkAreas
+                .Include(a => a.Floor)
+                .FirstOrDefaultAsync(a => a.Id == taskAllocation.WorkItem.WorkAreaId) ?? new WorkArea();
 
-            var comment = createComment.ToCommentFromCommentDto(tenantId, Employee.Id);
+            var buildingId = workArea.Floor?.BuildingId ?? Guid.Empty;
+            var building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == buildingId);
+
+            // Save comment
+            var comment = createComment.ToCommentFromCommentDto(tenantId, employee.Id);
             _context.TaskComments.Add(comment);
             await _context.SaveChangesAsync();
+            _logger.LogInfo("Comment saved with Id: {CommentId}", comment.Id);
 
-            var Images = createComment.Images;
+            // Process image uploads
+            var images = createComment.Images;
 
-            if (Images != null && Images.Count > 0)
+            if (images != null && images.Any())
             {
-
-                foreach (var Image in Images)
+                foreach (var image in images)
                 {
-
-                    if (string.IsNullOrEmpty(Image.Base64Data))
-                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
-
-                    //If base64 has a data URI prefix, strip it
-                    var base64 = Image.Base64Data.Contains(",")
-                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
-                        : Image.Base64Data;
-
-                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
-                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_report");
-
-                    string objectKey = $"tenant-{tenantId}/project-{bulding?.ProjectId}/Actitvity/{fileName}";
-                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
-
-                    Document document = new Document
+                    if (string.IsNullOrWhiteSpace(image.Base64Data))
                     {
-                        FileName = Image.FileName ?? "",
-                        ContentType = Image.ContentType ?? "",
+                        _logger.LogWarning("Missing Base64 data in one of the images.");
+                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+                    }
+
+                    // Clean base64 string
+                    var base64 = image.Base64Data.Contains(",")
+                        ? image.Base64Data.Substring(image.Base64Data.IndexOf(",") + 1)
+                        : image.Base64Data;
+
+                    var fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    var fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_comment");
+                    var objectKey = $"tenant-{tenantId}/project-{building?.ProjectId}/Activity/{fileName}";
+
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
+                    _logger.LogInfo("Image uploaded to S3 with key: {ObjectKey}", objectKey);
+
+                    var document = new Document
+                    {
+                        FileName = image.FileName ?? string.Empty,
+                        ContentType = image.ContentType ?? fileType,
                         S3Key = objectKey,
-                        Base64Data = Image.Base64Data,
-                        FileSize = Image.FileSize,
+                        Base64Data = image.Base64Data,
+                        FileSize = image.FileSize,
                         UploadedAt = DateTime.UtcNow,
                         TenantId = tenantId
                     };
+
                     _context.Documents.Add(document);
-                    TaskAttachment attachment = new TaskAttachment
+
+                    var attachment = new TaskAttachment
                     {
                         DocumentId = document.Id,
                         ReferenceId = comment.Id
                     };
+
                     _context.TaskAttachments.Add(attachment);
                 }
+
                 await _context.SaveChangesAsync();
+                _logger.LogInfo("Documents and attachments saved for commentId: {CommentId}", comment.Id);
             }
 
-            CommentVM response = comment.ToCommentVMFromTaskComment();
+            // Convert to view model and return response
+            var response = comment.ToCommentVMFromTaskComment();
+            _logger.LogInfo("Returning response for commentId: {CommentId}", comment.Id);
+
             return Ok(ApiResponse<object>.SuccessResponse(response, "Comment saved successfully", 200));
         }
 
         [HttpGet("list")]
         public async Task<IActionResult> GetTasksList([FromQuery] Guid projectId, [FromQuery] string? dateFrom = null, [FromQuery] string? dateTo = null)
         {
+            _logger.LogInfo("GetTasksList called for projectId: {ProjectId}, dateFrom: {DateFrom}, dateTo: {DateTo}", projectId, dateFrom ?? "", dateTo ?? "");
+
             Guid tenantId = GetTenantId();
             DateTime fromDate = new DateTime();
             DateTime toDate = new DateTime();
 
-            if (dateFrom != null && DateTime.TryParse(dateFrom, out fromDate) == false)
+            // Parse and validate dateFrom
+            if (dateFrom != null && !DateTime.TryParse(dateFrom, out fromDate))
             {
+                _logger.LogWarning("Invalid starting date provided: {DateFrom}", dateFrom);
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid starting date.", "Invalid starting date.", 400));
-
             }
-            if (dateTo != null && DateTime.TryParse(dateTo, out toDate) == false)
+
+            // Parse and validate dateTo
+            if (dateTo != null && !DateTime.TryParse(dateTo, out toDate))
             {
+                _logger.LogWarning("Invalid ending date provided: {DateTo}", dateTo);
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid ending date.", "Invalid ending date.", 400));
-
             }
-            if (dateFrom == null) fromDate = DateTime.UtcNow.Date;
-            if (dateTo == null) toDate = fromDate.AddDays(1);
 
-            var jobroles = await _context.JobRoles.Where(r => r.TenantId == tenantId).ToListAsync();
-            //var taskAllocations = await _context.TaskAllocations.Where(t => t.WorkItem.WorkArea.Floor.Building.ProjectId == projectId && t.AssignmentDate >= fromDate && t.AssignmentDate <= toDate && t.TenantId == tenantId).Include(t => t.WorkItemId).ToListAsync();
-            List<Building> buildings = await _context.Buildings.Where(b => b.ProjectId == projectId && b.TenantId == tenantId).ToListAsync();
-            List<Guid> idList = buildings.Select(b => b.Id).ToList();
+            // Set default date range if not provided
+            fromDate = dateFrom == null ? DateTime.UtcNow.Date : fromDate;
+            toDate = dateTo == null ? fromDate.AddDays(1) : toDate;
 
-            List<Floor> floors = await _context.Floor.Where(f => idList.Contains(f.BuildingId) && f.TenantId == tenantId).ToListAsync();
-            idList = floors.Select(f => f.Id).ToList();
+            // 1. Get all buildings under this project
+            _logger.LogInfo("Fetching buildings for projectId: {ProjectId}", projectId);
+            var buildings = await _context.Buildings
+                .Where(b => b.ProjectId == projectId && b.TenantId == tenantId)
+                .ToListAsync();
 
-            List<WorkArea> workAreas = await _context.WorkAreas.Where(a => idList.Contains(a.FloorId) && a.TenantId == tenantId).ToListAsync();
-            idList = workAreas.Select(a => a.Id).ToList();
+            var buildingIds = buildings.Select(b => b.Id).ToList();
 
-            List<WorkItem> workItems = await _context.WorkItems.Where(i => idList.Contains(i.WorkAreaId) && i.TenantId == tenantId).Include(i => i.ActivityMaster).ToListAsync();
-            idList = workItems.Select(i => i.Id).ToList();
-            var activityIdList = workItems.Select(i => i.ActivityId).ToList();
+            // 2. Get floors under the buildings
+            var floors = await _context.Floor
+                .Where(f => buildingIds.Contains(f.BuildingId) && f.TenantId == tenantId)
+                .ToListAsync();
+            var floorIds = floors.Select(f => f.Id).ToList();
 
-            List<TaskAllocation> taskAllocations = await _context.TaskAllocations.Where(t => idList.Contains(t.WorkItemId) && t.AssignmentDate.Date >= fromDate.Date && t.AssignmentDate.Date <= toDate.Date && t.TenantId == tenantId).Include(t => t.WorkItem).Include(t => t.Employee).ToListAsync();
-            var taskIdList = taskAllocations.Select(t => t.Id).ToList();
+            // 3. Get work areas under the floors
+            var workAreas = await _context.WorkAreas
+                .Where(a => floorIds.Contains(a.FloorId) && a.TenantId == tenantId)
+                .ToListAsync();
+            var workAreaIds = workAreas.Select(a => a.Id).ToList();
 
-            List<TaskMembers> teamMembers = await _context.TaskMembers.Where(t => taskIdList.Contains(t.TaskAllocationId)).ToListAsync();
-            var employeeIdList = teamMembers.Select(e => e.EmployeeId).ToList();
+            // 4. Get work items under the work areas
+            var workItems = await _context.WorkItems
+                .Where(i => workAreaIds.Contains(i.WorkAreaId) && i.TenantId == tenantId)
+                .Include(i => i.ActivityMaster)
+                .ToListAsync();
+            var workItemIds = workItems.Select(i => i.Id).ToList();
 
-            List<Employee> employees = await _context.Employees.Where(e => employeeIdList.Contains(e.Id)).Include(e => e.JobRole).ToListAsync();
+            _logger.LogInfo("Fetching task allocations between {FromDate} and {ToDate}", fromDate, toDate);
 
-            List<TaskComment> allComments = await _context.TaskComments.Include(c => c.Employee).Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
-            var allCommentIds = allComments.Select(c => c.Id).ToList();
+            // 5. Get task allocations in the specified date range
+            var taskAllocations = await _context.TaskAllocations
+                .Include(t => t.Employee)
+                .Include(t => t.ReportedBy)
+                .Include(t => t.ApprovedBy)
+                .Include(t => t.WorkStatus)
+                .Include(t => t.WorkItem)
+                .Where(t => workItemIds.Contains(t.WorkItemId) &&
+                            t.AssignmentDate.Date >= fromDate.Date &&
+                            t.AssignmentDate.Date <= toDate.Date &&
+                            t.TenantId == tenantId)
+                .ToListAsync();
+
+            var taskIds = taskAllocations.Select(t => t.Id).ToList();
+
+            // 6. Load team members
+            _logger.LogInfo("Loading task members and related employee data.");
+            var teamMembers = await _context.TaskMembers
+                .Include(t => t.Employee)
+                .Where(t => taskIds.Contains(t.TaskAllocationId))
+                .ToListAsync();
+
+            // 7. Load task comments
+            _logger.LogInfo("Fetching comments and attachments.");
+            var allComments = await _context.TaskComments
+                .Include(c => c.Employee)
+                .Where(c => taskIds.Contains(c.TaskAllocationId))
+                .ToListAsync();
+            var commentIds = allComments.Select(c => c.Id).ToList();
+
+            // 8. Load all attachments (task and comment)
+            var attachments = await _context.TaskAttachments
+                .Where(t => taskIds.Contains(t.ReferenceId) || commentIds.Contains(t.ReferenceId))
+                .ToListAsync();
+
+            var documentIds = attachments.Select(t => t.DocumentId).ToList();
+
+            // 9. Load actual documents from attachment references
+            var documents = await _context.Documents
+                .Where(d => documentIds.Contains(d.Id))
+                .ToListAsync();
+
+            var tasks = new List<ListTaskVM>();
+
+            _logger.LogInfo("Constructing task response data.");
 
-            var taskAttachments = await _context.TaskAttachments.Where(t => taskIdList.Contains(t.ReferenceId) || allCommentIds.Contains(t.ReferenceId)).ToListAsync();
-            var documentIds = taskAttachments.Select(t => t.DocumentId).ToList();
-            var documents = await _context.Documents.Where(d => documentIds.Contains(d.Id)).ToListAsync();
 
-            List<ListTaskVM> tasks = new List<ListTaskVM>();
-            //foreach (var workItem in workItems)
-            //{
             foreach (var taskAllocation in taskAllocations)
             {
-
                 var response = taskAllocation.ToListTaskVMFromTaskAllocation();
 
-                List<TaskComment> comments = allComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToList();
-                List<BasicEmployeeVM> team = new List<BasicEmployeeVM>();
-                List<TaskMembers> taskMembers = teamMembers.Where(m => m.TaskAllocationId == taskAllocation.Id).ToList();
+                // Attach documents to the main task
+                var taskDocIds = attachments
+                    .Where(a => a.ReferenceId == taskAllocation.Id)
+                    .Select(a => a.DocumentId)
+                    .ToList();
 
-                var taskDocumentIds = taskAttachments.Where(t => t.ReferenceId == taskAllocation.Id).Select(t => t.DocumentId).ToList();
-                var taskDocuments = documents.Where(d => taskDocumentIds.Contains(d.Id)).ToList();
+                var taskDocs = documents
+                    .Where(d => taskDocIds.Contains(d.Id))
+                    .ToList();
 
-                List<string> taskPreSignedUrls = new List<string>();
-                foreach (var document in taskDocuments)
-                {
-                    string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
-                    taskPreSignedUrls.Add(preSignedUrl);
-                }
-                response.ReportedPreSignedUrls = taskPreSignedUrls;
+                response.ReportedPreSignedUrls = taskDocs
+                    .Select(d => _s3Service.GeneratePreSignedUrlAsync(d.S3Key))
+                    .ToList();
 
-                foreach (var taskMember in taskMembers)
-                {
-                    var teamMember = employees.Find(e => e.Id == taskMember.EmployeeId);
-                    if (teamMember != null)
-                    {
-                        team.Add(teamMember.ToBasicEmployeeVMFromEmployee());
-                    }
-                }
-                List<CommentVM> commentVM = new List<CommentVM> { };
-                foreach (var comment in comments)
-                {
-                    var commentDocumentIds = taskAttachments.Where(t => t.ReferenceId == comment.Id).Select(t => t.DocumentId).ToList();
-                    var commentDocuments = documents.Where(d => commentDocumentIds.Contains(d.Id)).ToList();
-                    List<string> commentPreSignedUrls = new List<string>();
-                    foreach (var document in commentDocuments)
-                    {
-                        string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
-                        commentPreSignedUrls.Add(preSignedUrl);
-                    }
-                    CommentVM commentVm = comment.ToCommentVMFromTaskComment();
-                    commentVm.PreSignedUrls = commentPreSignedUrls;
+                // Add team members
+                var taskMemberEntries = teamMembers
+                    .Where(m => m.TaskAllocationId == taskAllocation.Id)
+                    .ToList();
 
-                    commentVM.Add(commentVm);
-                }
-                List<ActivityCheckList> checkLists = await _context.ActivityCheckLists.Where(x => x.ActivityId == (taskAllocation.WorkItem != null ? taskAllocation.WorkItem.ActivityId : Guid.Empty)).ToListAsync();
-                List<CheckListMappings> checkListMappings = await _context.CheckListMappings.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
-                List<CheckListVM> checkList = new List<CheckListVM>();
-                foreach (var check in checkLists)
+                response.teamMembers = taskMemberEntries
+                    .Select(m => m.Employee)
+                    .Where(e => e != null)
+                    .Select(e => e!.ToBasicEmployeeVMFromEmployee())
+                    .ToList();
+
+                // Add comments with attachments
+                var commentVMs = new List<CommentVM>();
+                var taskComments = allComments
+                    .Where(c => c.TaskAllocationId == taskAllocation.Id)
+                    .ToList();
+
+                foreach (var comment in taskComments)
                 {
-                    var checkListMapping = checkListMappings.Find(c => c.CheckListId == check.Id);
-                    if (checkListMapping != null)
-                    {
-                        checkList.Add(check.ToCheckListVMFromActivityCheckList(check.ActivityId, true));
-                    }
-                    else
-                    {
-                        checkList.Add(check.ToCheckListVMFromActivityCheckList(check.ActivityId, false));
-                    }
+                    var commentDocIds = attachments
+                        .Where(a => a.ReferenceId == comment.Id)
+                        .Select(a => a.DocumentId)
+                        .ToList();
+
+                    var commentDocs = documents
+                        .Where(d => commentDocIds.Contains(d.Id))
+                        .ToList();
+
+                    var commentVm = comment.ToCommentVMFromTaskComment();
+                    commentVm.PreSignedUrls = commentDocs
+                        .Select(d => _s3Service.GeneratePreSignedUrlAsync(d.S3Key))
+                        .ToList();
+
+                    commentVMs.Add(commentVm);
                 }
-                response.comments = commentVM;
-                response.teamMembers = team;
-                response.CheckList = checkList;
+
+                response.comments = commentVMs;
+
+                // Checklists
+                var activityId = taskAllocation.WorkItem?.ActivityId ?? Guid.Empty;
+
+                var checkLists = await _context.ActivityCheckLists
+                    .Where(c => c.ActivityId == activityId)
+                    .ToListAsync();
+
+                var checkListMappings = await _context.CheckListMappings
+                    .Where(c => c.TaskAllocationId == taskAllocation.Id)
+                    .ToListAsync();
+
+                response.CheckList = checkLists.Select(check =>
+                {
+                    var isChecked = checkListMappings.Any(m => m.CheckListId == check.Id);
+                    return check.ToCheckListVMFromActivityCheckList(check.ActivityId, isChecked);
+                }).ToList();
+
                 tasks.Add(response);
             }
 
-            //}
+            _logger.LogInfo("Task list constructed successfully. Returning {Count} tasks.", tasks.Count);
+
             return Ok(ApiResponse<object>.SuccessResponse(tasks, "Success", 200));
         }
 
         [HttpGet("get/{taskId}")]
         public async Task<IActionResult> GetTask(Guid taskId)
         {
-            if (taskId == Guid.Empty) return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", "Invalid data", 400));
+            _logger.LogInfo("GetTask called with taskId: {TaskId}", taskId);
 
-            var taskAllocation = await _context.TaskAllocations.Include(t => t.Tenant).Include(t => t.Employee).Include(t => t.WorkItem).FirstOrDefaultAsync(t => t.Id == taskId);
-            if (taskAllocation != null && taskAllocation.Employee != null && taskAllocation.Tenant != null)
+            // Validate input
+            if (taskId == Guid.Empty)
             {
-                //var employee = await _context.Employees.FirstOrDefaultAsync(e => e.Id == taskAllocation.AssignedBy);
-                string employeeName = System.String.Format("{0} {1}", taskAllocation.Employee.FirstName, taskAllocation.Employee.LastName);
-                string tenantName = taskAllocation.Tenant.ContactName ?? string.Empty;
-
-                if (taskAllocation == null) return NotFound(ApiResponse<object>.ErrorResponse("Task Not Found", "Task not found", 404));
-                var taskVM = taskAllocation.TaskAllocationToTaskVM(employeeName);
-                var comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
-                var commentIds = comments.Select(c => c.Id).ToList();
-                var taskAttachments = await _context.TaskAttachments.Where(t => t.ReferenceId == taskAllocation.Id || commentIds.Contains(t.ReferenceId)).ToListAsync();
-                var documentIds = taskAttachments.Select(t => t.DocumentId).ToList();
-                var documents = await _context.Documents.Where(d => documentIds.Contains(d.Id)).ToListAsync();
-                var team = await _context.TaskMembers.Where(m => m.TaskAllocationId == taskAllocation.Id).Include(m => m.Employee).ToListAsync();
-                var teamMembers = new List<EmployeeVM> { };
-
-                var taskDocumentIds = taskAttachments.Where(t => t.ReferenceId == taskAllocation.Id).Select(t => t.DocumentId).ToList();
-                var taskDocuments = documents.Where(d => taskDocumentIds.Contains(d.Id)).ToList();
-
-                List<string> taskPreSignedUrls = new List<string>();
-                foreach (var document in taskDocuments)
-                {
-                    string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
-                    taskPreSignedUrls.Add(preSignedUrl);
-                }
-                taskVM.PreSignedUrls = taskPreSignedUrls;
-                foreach (var member in team)
-                {
-                    var result = member.Employee != null ? member.Employee.ToEmployeeVMFromEmployee() : new EmployeeVM();
-                    teamMembers.Add(result);
-                }
-                List<CommentVM> Comments = new List<CommentVM> { };
-                foreach (var comment in comments)
-                {
-                    var commentDocumentIds = taskAttachments.Where(t => t.ReferenceId == comment.Id).Select(t => t.DocumentId).ToList();
-                    var commentDocuments = documents.Where(d => commentDocumentIds.Contains(d.Id)).ToList();
-                    List<string> commentPreSignedUrls = new List<string>();
-                    foreach (var document in commentDocuments)
-                    {
-                        string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
-                        commentPreSignedUrls.Add(preSignedUrl);
-                    }
-                    CommentVM commentVM = comment.ToCommentVMFromTaskComment();
-                    commentVM.PreSignedUrls = commentPreSignedUrls;
-                    Comments.Add(commentVM);
-                }
-                taskVM.Comments = Comments;
-                taskVM.TeamMembers = teamMembers;
-                return Ok(ApiResponse<object>.SuccessResponse(taskVM, "Success", 200));
+                _logger.LogWarning("Invalid taskId provided.");
+                return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", "Invalid data", 400));
             }
 
+            // Fetch Task Allocation with required related data
+            var taskAllocation = await _context.TaskAllocations
+                .Include(t => t.Tenant)
+                .Include(t => t.Employee)
+                .Include(t => t.ReportedBy)
+                .Include(t => t.ApprovedBy)
+                .Include(t => t.WorkItem)
+                .Include(t => t.WorkStatus)
+                .FirstOrDefaultAsync(t => t.Id == taskId);
 
-            return NotFound(ApiResponse<object>.ErrorResponse("Task Not Found", "Task not Found", 404));
+            if (taskAllocation == null)
+            {
+                _logger.LogWarning("Task not found for taskId: {TaskId}", taskId);
+                return NotFound(ApiResponse<object>.ErrorResponse("Task Not Found", "Task not found", 404));
+            }
+
+            if (taskAllocation.Employee == null || taskAllocation.Tenant == null)
+            {
+                _logger.LogWarning("Task found but missing Employee or Tenant data for taskId: {TaskId}", taskId);
+                return NotFound(ApiResponse<object>.ErrorResponse("Task Not Found", "Task not found", 404));
+            }
+
+            _logger.LogInfo("Task allocation found. Preparing response.");
+
+            var taskVM = taskAllocation.TaskAllocationToTaskVM();
+
+            // Fetch comments and attachments
+            _logger.LogInfo("Fetching comments and attachments for taskId: {TaskId}", taskId);
+
+            var comments = await _context.TaskComments
+                .Where(c => c.TaskAllocationId == taskId)
+                .Include(c => c.Employee)
+                .ToListAsync();
+
+            var commentIds = comments.Select(c => c.Id).ToList();
+
+            var taskAttachments = await _context.TaskAttachments
+                .Where(t => t.ReferenceId == taskId || commentIds.Contains(t.ReferenceId))
+                .ToListAsync();
+
+            var documentIds = taskAttachments.Select(t => t.DocumentId).Distinct().ToList();
+
+            var documents = await _context.Documents
+                .Where(d => documentIds.Contains(d.Id))
+                .ToListAsync();
+
+            // Fetch team members
+            _logger.LogInfo("Fetching team members for taskId: {TaskId}", taskId);
+            var team = await _context.TaskMembers
+                .Where(m => m.TaskAllocationId == taskId)
+                .Include(m => m.Employee)
+                .ToListAsync();
+
+            var teamMembers = team
+                .Where(m => m.Employee != null)
+                .Select(m => m.Employee!.ToBasicEmployeeVMFromEmployee())
+                .ToList();
+
+            taskVM.TeamMembers = teamMembers;
+
+            // Attach documents to the main task
+            _logger.LogInfo("Generating presigned URLs for task documents.");
+            var taskDocumentIds = taskAttachments
+                .Where(t => t.ReferenceId == taskId)
+                .Select(t => t.DocumentId)
+                .ToList();
+
+            var taskDocuments = documents
+                .Where(d => taskDocumentIds.Contains(d.Id))
+                .ToList();
+
+            taskVM.PreSignedUrls = taskDocuments
+                .Select(d => _s3Service.GeneratePreSignedUrlAsync(d.S3Key))
+                .ToList();
+
+            // Construct CommentVM list with document URLs
+            _logger.LogInfo("Preparing comment response data.");
+            var commentVMs = comments.Select(comment =>
+            {
+                var commentDocIds = taskAttachments
+                    .Where(t => t.ReferenceId == comment.Id)
+                    .Select(t => t.DocumentId)
+                    .ToList();
+
+                var commentDocs = documents
+                    .Where(d => commentDocIds.Contains(d.Id))
+                    .ToList();
+
+                var commentVM = comment.ToCommentVMFromTaskComment();
+                commentVM.PreSignedUrls = commentDocs
+                    .Select(d => _s3Service.GeneratePreSignedUrlAsync(d.S3Key))
+                    .ToList();
+
+                return commentVM;
+            }).ToList();
+
+            taskVM.Comments = commentVMs;
+
+            _logger.LogInfo("Task details prepared successfully for taskId: {TaskId}", taskId);
+            return Ok(ApiResponse<object>.SuccessResponse(taskVM, "Success", 200));
+        }
+
+        /// <summary>
+        /// Approves a reported task after validation, updates status, and stores attachments/comments.
+        /// </summary>
+        /// <param name="approveTask">DTO containing task approval details.</param>
+        /// <returns>IActionResult indicating success or failure.</returns>
+        [HttpPost("approve")]
+        public async Task<IActionResult> ApproveTask(ApproveTaskDto approveTask)
+        {
+            Guid tenantId = _userHelper.GetTenantId();
+            var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+            _logger.LogInfo("Employee {EmployeeId} is attempting to approve Task {TaskId}", loggedInEmployee.Id, approveTask.Id);
+
+            // Fetch task allocation with work item, only if it's reported
+            var taskAllocation = await _context.TaskAllocations
+                .Include(t => t.WorkItem)
+                .FirstOrDefaultAsync(t => t.Id == approveTask.Id && t.TenantId == tenantId && t.ReportedDate != null);
+
+            if (taskAllocation == null)
+            {
+                _logger.LogWarning("Task {TaskId} not found or not reported yet for Tenant {TenantId} by Employee {EmployeeId}",
+                    approveTask.Id, tenantId, loggedInEmployee.Id);
+
+                return NotFound(ApiResponse<object>.ErrorResponse("Task not found", "Task not found", 404));
+            }
+
+            // Check for permission to approve tasks
+            var hasPermission = await _permissionServices.HasPermission(Approve_Task, loggedInEmployee.Id);
+            if (!hasPermission)
+            {
+                _logger.LogWarning("Employee {EmployeeId} attempted to approve Task {TaskId} without permission", loggedInEmployee.Id, approveTask.Id);
+                return StatusCode(403, ApiResponse<object>.ErrorResponse("You don't have access", "User not authorized to approve tasks", 403));
+            }
+
+            // Validation: Approved task count cannot exceed completed task count
+            if (taskAllocation.CompletedTask < approveTask.ApprovedTask)
+            {
+                _logger.LogWarning("Invalid approval attempt on Task {TaskId}: Approved tasks ({ApprovedTask}) > Completed tasks ({CompletedTask})",
+                    approveTask.Id, approveTask.ApprovedTask, taskAllocation.CompletedTask);
+
+                return BadRequest(ApiResponse<object>.ErrorResponse("Approved tasks cannot be greater than completed tasks",
+                    "Approved tasks cannot be greater than completed tasks", 400));
+            }
+
+            // Update completed work in the associated work item, if it exists
+            if (taskAllocation.WorkItem != null && taskAllocation.CompletedTask != approveTask.ApprovedTask)
+            {
+                if (taskAllocation.CompletedTask > 0)
+                {
+                    taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
+                }
+                taskAllocation.WorkItem.CompletedWork += approveTask.ApprovedTask;
+            }
+
+            // Update task allocation details
+            taskAllocation.ApprovedById = loggedInEmployee.Id;
+            taskAllocation.ApprovedDate = DateTime.UtcNow;
+            taskAllocation.WorkStatusId = approveTask.WorkStatus;
+            taskAllocation.CompletedTask = approveTask.ApprovedTask;
+
+            // Add a comment (optional)
+            var comment = new TaskComment
+            {
+                TaskAllocationId = taskAllocation.Id,
+                CommentDate = DateTime.UtcNow,
+                Comment = approveTask.Comment ?? string.Empty,
+                CommentedBy = loggedInEmployee.Id,
+                TenantId = tenantId
+            };
+            _context.TaskComments.Add(comment);
+
+            // Handle image attachments, if any
+            if (approveTask.Images?.Count > 0)
+            {
+                var workAreaId = taskAllocation.WorkItem?.WorkAreaId;
+                var workArea = await _context.WorkAreas.Include(a => a.Floor)
+                    .FirstOrDefaultAsync(a => a.Id == workAreaId) ?? new WorkArea();
+
+                var buildingId = workArea.Floor?.BuildingId;
+
+                var building = await _context.Buildings
+                    .FirstOrDefaultAsync(b => b.Id == buildingId);
+
+                foreach (var image in approveTask.Images)
+                {
+                    if (string.IsNullOrEmpty(image.Base64Data))
+                    {
+                        _logger.LogWarning("Image for Task {TaskId} is missing base64 data", approveTask.Id);
+                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+                    }
+
+                    var base64 = image.Base64Data.Contains(",") ? image.Base64Data[(image.Base64Data.IndexOf(",") + 1)..] : image.Base64Data;
+
+                    var fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    var fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_comment");
+                    var objectKey = $"tenant-{tenantId}/project-{building?.ProjectId}/Activity/{fileName}";
+
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
+
+                    var document = new Document
+                    {
+                        FileName = fileName,
+                        ContentType = image.ContentType ?? string.Empty,
+                        S3Key = objectKey,
+                        Base64Data = image.Base64Data,
+                        FileSize = image.FileSize,
+                        UploadedAt = DateTime.UtcNow,
+                        TenantId = tenantId
+                    };
+
+                    _context.Documents.Add(document);
+
+                    var attachment = new TaskAttachment
+                    {
+                        DocumentId = document.Id,
+                        ReferenceId = comment.Id
+                    };
+
+                    _context.TaskAttachments.Add(attachment);
+
+                    _logger.LogInfo("Attachment uploaded for Task {TaskId}: {FileName}", approveTask.Id, fileName);
+                }
+            }
+
+            // Commit all changes to the database
+            await _context.SaveChangesAsync();
+
+            _logger.LogInfo("Task {TaskId} successfully approved by Employee {EmployeeId}", approveTask.Id, loggedInEmployee.Id);
+
+            return Ok(ApiResponse<object>.SuccessResponse("Task has been approved", "Task has been approved", 200));
         }
     }
 }
-- 
2.43.0


From 1f5614314243069ccf3e79d3b711a6acea21df3f Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 16 Jun 2025 16:24:49 +0530
Subject: [PATCH 18/48] Added new API to get list of work status

---
 .../Activities/CreateWorkStatusMasterDto.cs   |  8 +++
 .../Activities/UpdateWorkStatusMasterDto.cs   |  9 +++
 .../Controllers/MasterController.cs           | 62 +++++++++++++++++++
 Marco.Pms.Services/Helpers/MasterHelper.cs    | 45 +++++++++++++-
 4 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 Marco.Pms.Model/Dtos/Activities/CreateWorkStatusMasterDto.cs
 create mode 100644 Marco.Pms.Model/Dtos/Activities/UpdateWorkStatusMasterDto.cs

diff --git a/Marco.Pms.Model/Dtos/Activities/CreateWorkStatusMasterDto.cs b/Marco.Pms.Model/Dtos/Activities/CreateWorkStatusMasterDto.cs
new file mode 100644
index 0000000..b4ff25f
--- /dev/null
+++ b/Marco.Pms.Model/Dtos/Activities/CreateWorkStatusMasterDto.cs
@@ -0,0 +1,8 @@
+namespace Marco.Pms.Model.Dtos.Master
+{
+    public class CreateWorkStatusMasterDto
+    {
+        public string? Name { get; set; }
+        public string? Description { get; set; }
+    }
+}
diff --git a/Marco.Pms.Model/Dtos/Activities/UpdateWorkStatusMasterDto.cs b/Marco.Pms.Model/Dtos/Activities/UpdateWorkStatusMasterDto.cs
new file mode 100644
index 0000000..a40052f
--- /dev/null
+++ b/Marco.Pms.Model/Dtos/Activities/UpdateWorkStatusMasterDto.cs
@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.Dtos.Master
+{
+    public class UpdateWorkStatusMasterDto
+    {
+        public Guid Id { get; set; }
+        public string? Name { get; set; }
+        public string? Description { get; set; }
+    }
+}
diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index 7835e8d..4e6ad8f 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -671,6 +671,68 @@ namespace Marco.Pms.Services.Controllers
             }
         }
 
+        // -------------------------------- Work Status  --------------------------------
+
+        [HttpGet("work-status")]
+        public async Task<IActionResult> GetWorkStatusMasterList()
+        {
+            var response = await _masterHelper.GetWorkStatusList();
+            return StatusCode(response.StatusCode, response);
+        }
+
+        [HttpPost("work-status")]
+        public async Task<IActionResult> CreateWorkStatusMaster([FromBody] CreateWorkStatusMasterDto createWorkStatusDto)
+        {
+            if (!ModelState.IsValid)
+            {
+                var errors = ModelState.Values
+                    .SelectMany(v => v.Errors)
+                    .Select(e => e.ErrorMessage)
+                    .ToList();
+                _logger.LogError("User sent Invalid Date while marking attendance");
+                return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
+            }
+            var response = await _masterHelper.CreateWorkStatus(createWorkStatusDto);
+            if (response.StatusCode == 200)
+            {
+                return Ok(response);
+            }
+            else if (response.StatusCode == 409)
+            {
+                return Conflict(response);
+            }
+            else
+            {
+                return BadRequest(response);
+            }
+        }
+
+        [HttpPost("work-status/edit/{id}")]
+        public async Task<IActionResult> UpdateWorkStatusMaster(Guid id, [FromBody] UpdateWorkStatusMasterDto updateWorkStatusDto)
+        {
+            var response = await _masterHelper.UpdateWorkStatus(id, updateWorkStatusDto);
+            if (response.StatusCode == 200)
+            {
+                return Ok(response);
+            }
+            else if (response.StatusCode == 404)
+            {
+                return NotFound(response);
+            }
+            else
+            {
+                return BadRequest(response);
+
+            }
+        }
+
+        [HttpDelete("work-status/{id}")]
+        public async Task<IActionResult> DeleteWorkStatusMaster(Guid id)
+        {
+            var response = await _masterHelper.DeleteWorkStatus(id);
+            return Ok(response);
+        }
+
         // -------------------------------- Contact Category  --------------------------------
 
         [HttpGet("contact-categories")]
diff --git a/Marco.Pms.Services/Helpers/MasterHelper.cs b/Marco.Pms.Services/Helpers/MasterHelper.cs
index 60d2385..508205b 100644
--- a/Marco.Pms.Services/Helpers/MasterHelper.cs
+++ b/Marco.Pms.Services/Helpers/MasterHelper.cs
@@ -5,6 +5,7 @@ using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Mapper;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Master;
+using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.EntityFrameworkCore;
@@ -16,13 +17,19 @@ namespace Marco.Pms.Services.Helpers
         private readonly ApplicationDbContext _context;
         private readonly ILoggingService _logger;
         private readonly UserHelper _userHelper;
+        private readonly PermissionServices _permissionService;
+        private readonly Guid View_Master;
+        private readonly Guid Manage_Master;
 
 
-        public MasterHelper(ApplicationDbContext context, ILoggingService logger, UserHelper userHelper)
+        public MasterHelper(ApplicationDbContext context, ILoggingService logger, UserHelper userHelper, PermissionServices permissionServices)
         {
             _context = context;
             _logger = logger;
             _userHelper = userHelper;
+            _permissionService = permissionServices;
+            View_Master = Guid.Parse("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d");
+            Manage_Master = Guid.Parse("588a8824-f924-4955-82d8-fc51956cf323");
         }
         // -------------------------------- Contact Category  --------------------------------
         public async Task<ApiResponse<object>> CreateContactCategory(CreateContactCategoryDto contactCategoryDto)
@@ -247,5 +254,41 @@ namespace Marco.Pms.Services.Helpers
             return ApiResponse<object>.SuccessResponse(new { }, "Tag deleted successfully", 200);
         }
 
+        // -------------------------------- Work Status  --------------------------------
+        public async Task<ApiResponse<object>> GetWorkStatusList()
+        {
+            Guid tenantId = _userHelper.GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            bool hasViewPermission = await _permissionService.HasPermission(View_Master, LoggedInEmployee.Id);
+
+            if (!hasViewPermission)
+            {
+                return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+            }
+            var workStatus = await _context.WorkStatusMasters.Where(ws => ws.TenantId == tenantId).Select(ws => new { ws.Id, ws.Name, ws.Description, ws.IsSystem }).ToListAsync();
+
+            return ApiResponse<object>.SuccessResponse(workStatus, $"{workStatus.Count} number of work status fetched successfully", 200);
+
+        }
+        public async Task<ApiResponse<object>> CreateWorkStatus(CreateWorkStatusMasterDto createWorkStatusDto)
+        {
+            Guid tenantId = _userHelper.GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+        }
+        public async Task<ApiResponse<object>> UpdateWorkStatus(Guid id, UpdateWorkStatusMasterDto contacupdateWorkStatusDtotTagDto)
+        {
+            var tenantId = _userHelper.GetTenantId();
+            Employee LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+        }
+        public async Task<ApiResponse<object>> DeleteWorkStatus(Guid id)
+        {
+            Guid tenantId = _userHelper.GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+
+        }
+
     }
 }
-- 
2.43.0


From e391c82659de7862a1c132a3d7a329871b290843 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 16 Jun 2025 16:58:56 +0530
Subject: [PATCH 19/48] Added CRUD operation APIs for work Status master table

---
 .../Controllers/MasterController.cs           |  29 +--
 Marco.Pms.Services/Helpers/MasterHelper.cs    | 198 ++++++++++++++++--
 2 files changed, 181 insertions(+), 46 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index 4e6ad8f..ebd8998 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -693,44 +693,21 @@ namespace Marco.Pms.Services.Controllers
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
             }
             var response = await _masterHelper.CreateWorkStatus(createWorkStatusDto);
-            if (response.StatusCode == 200)
-            {
-                return Ok(response);
-            }
-            else if (response.StatusCode == 409)
-            {
-                return Conflict(response);
-            }
-            else
-            {
-                return BadRequest(response);
-            }
+            return StatusCode(response.StatusCode, response);
         }
 
         [HttpPost("work-status/edit/{id}")]
         public async Task<IActionResult> UpdateWorkStatusMaster(Guid id, [FromBody] UpdateWorkStatusMasterDto updateWorkStatusDto)
         {
             var response = await _masterHelper.UpdateWorkStatus(id, updateWorkStatusDto);
-            if (response.StatusCode == 200)
-            {
-                return Ok(response);
-            }
-            else if (response.StatusCode == 404)
-            {
-                return NotFound(response);
-            }
-            else
-            {
-                return BadRequest(response);
-
-            }
+            return StatusCode(response.StatusCode, response);
         }
 
         [HttpDelete("work-status/{id}")]
         public async Task<IActionResult> DeleteWorkStatusMaster(Guid id)
         {
             var response = await _masterHelper.DeleteWorkStatus(id);
-            return Ok(response);
+            return StatusCode(response.StatusCode, response);
         }
 
         // -------------------------------- Contact Category  --------------------------------
diff --git a/Marco.Pms.Services/Helpers/MasterHelper.cs b/Marco.Pms.Services/Helpers/MasterHelper.cs
index 508205b..115b4b6 100644
--- a/Marco.Pms.Services/Helpers/MasterHelper.cs
+++ b/Marco.Pms.Services/Helpers/MasterHelper.cs
@@ -3,6 +3,7 @@ using Marco.Pms.Model.Directory;
 using Marco.Pms.Model.Dtos.Master;
 using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Mapper;
+using Marco.Pms.Model.Master;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Master;
 using Marco.Pms.Services.Service;
@@ -257,38 +258,195 @@ namespace Marco.Pms.Services.Helpers
         // -------------------------------- Work Status  --------------------------------
         public async Task<ApiResponse<object>> GetWorkStatusList()
         {
-            Guid tenantId = _userHelper.GetTenantId();
-            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
-            bool hasViewPermission = await _permissionService.HasPermission(View_Master, LoggedInEmployee.Id);
+            _logger.LogInfo("GetWorkStatusList called.");
 
-            if (!hasViewPermission)
+            try
             {
-                return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+                // Step 1: Get tenant and logged-in employee info
+                Guid tenantId = _userHelper.GetTenantId();
+                var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+                // Step 2: Check permission to view master data
+                bool hasViewPermission = await _permissionService.HasPermission(View_Master, loggedInEmployee.Id);
+                if (!hasViewPermission)
+                {
+                    _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id);
+                    return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+                }
+
+                // Step 3: Fetch work statuses for the tenant
+                var workStatusList = await _context.WorkStatusMasters
+                    .Where(ws => ws.TenantId == tenantId)
+                    .Select(ws => new
+                    {
+                        ws.Id,
+                        ws.Name,
+                        ws.Description,
+                        ws.IsSystem
+                    })
+                    .ToListAsync();
+
+                _logger.LogInfo("{Count} work statuses fetched for tenantId: {TenantId}", workStatusList.Count, tenantId);
+
+                // Step 4: Return successful response
+                return ApiResponse<object>.SuccessResponse(
+                    workStatusList,
+                    $"{workStatusList.Count} work status records fetched successfully",
+                    200
+                );
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error occurred while fetching work status list : {Error}", ex.Message);
+                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to fetch work status list", 500);
             }
-            var workStatus = await _context.WorkStatusMasters.Where(ws => ws.TenantId == tenantId).Select(ws => new { ws.Id, ws.Name, ws.Description, ws.IsSystem }).ToListAsync();
-
-            return ApiResponse<object>.SuccessResponse(workStatus, $"{workStatus.Count} number of work status fetched successfully", 200);
-
         }
         public async Task<ApiResponse<object>> CreateWorkStatus(CreateWorkStatusMasterDto createWorkStatusDto)
         {
-            Guid tenantId = _userHelper.GetTenantId();
-            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
-            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+            _logger.LogInfo("CreateWorkStatus called with Name: {Name}", createWorkStatusDto.Name ?? "");
+
+            try
+            {
+                // Step 1: Get tenant and logged-in employee
+                Guid tenantId = _userHelper.GetTenantId();
+                var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+                // Step 2: Check if user has permission to manage master data
+                var hasManageMasterPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id);
+                if (!hasManageMasterPermission)
+                {
+                    _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id);
+                    return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+                }
+
+                // Step 3: Check if work status with the same name already exists
+                var existingWorkStatus = await _context.WorkStatusMasters
+                    .FirstOrDefaultAsync(ws => ws.Name == createWorkStatusDto.Name && ws.TenantId == tenantId);
+
+                if (existingWorkStatus != null)
+                {
+                    _logger.LogWarning("Work status already exists: {Name}", createWorkStatusDto.Name ?? "");
+                    return ApiResponse<object>.ErrorResponse("Work status already exists", "Work status already exists", 400);
+                }
+
+                // Step 4: Create new WorkStatusMaster entry
+                var workStatus = new WorkStatusMaster
+                {
+                    Name = createWorkStatusDto.Name?.Trim() ?? "",
+                    Description = createWorkStatusDto.Description?.Trim() ?? "",
+                    IsSystem = false,
+                    TenantId = tenantId
+                };
+
+                _context.WorkStatusMasters.Add(workStatus);
+                await _context.SaveChangesAsync();
+
+                _logger.LogInfo("Work status created successfully: {Id}, Name: {Name}", workStatus.Id, workStatus.Name);
+                return ApiResponse<object>.SuccessResponse(workStatus, "Work status created successfully", 200);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error occurred while creating work status : {Error}", ex.Message);
+                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to create work status", 500);
+            }
         }
-        public async Task<ApiResponse<object>> UpdateWorkStatus(Guid id, UpdateWorkStatusMasterDto contacupdateWorkStatusDtotTagDto)
+        public async Task<ApiResponse<object>> UpdateWorkStatus(Guid id, UpdateWorkStatusMasterDto updateWorkStatusDto)
         {
-            var tenantId = _userHelper.GetTenantId();
-            Employee LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
-            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+            _logger.LogInfo("UpdateWorkStatus called for WorkStatus ID: {Id}, New Name: {Name}", id, updateWorkStatusDto.Name ?? "");
+
+            try
+            {
+                // Step 1: Get tenant and employee info
+                Guid tenantId = _userHelper.GetTenantId();
+                var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+                // Step 2: Check permission to update master
+                var hasManageMasterPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id);
+                if (!hasManageMasterPermission)
+                {
+                    _logger.LogWarning("Update denied. EmployeeId: {EmployeeId} does not have Manage Master permission.", loggedInEmployee.Id);
+                    return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+                }
+
+                // Step 3: Retrieve existing work status by id and tenant
+                var workStatus = await _context.WorkStatusMasters
+                    .FirstOrDefaultAsync(ws => ws.Id == id && ws.TenantId == tenantId);
+
+                if (workStatus == null)
+                {
+                    _logger.LogWarning("Work status not found for Id: {Id}", id);
+                    return ApiResponse<object>.ErrorResponse("Work status not found", "Work status not found", 404);
+                }
+
+                // Step 4: Update fields
+                workStatus.Name = updateWorkStatusDto.Name?.Trim() ?? "";
+                workStatus.Description = updateWorkStatusDto.Description?.Trim() ?? "";
+
+                await _context.SaveChangesAsync();
+
+                _logger.LogInfo("Work status updated successfully. Id: {Id}", workStatus.Id);
+                return ApiResponse<object>.SuccessResponse(workStatus, "Work status updated successfully", 200);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error occurred while updating work status Id: {Id} : {Error}", id, ex.Message);
+                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to update work status", 500);
+            }
         }
         public async Task<ApiResponse<object>> DeleteWorkStatus(Guid id)
         {
-            Guid tenantId = _userHelper.GetTenantId();
-            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
-            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+            _logger.LogInfo("DeleteWorkStatus called for Id: {Id}", id);
 
+            try
+            {
+                // Step 1: Get current tenant and logged-in employee
+                Guid tenantId = _userHelper.GetTenantId();
+                var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+                // Step 2: Check permission to manage master data
+                var hasManageMasterPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id);
+                if (!hasManageMasterPermission)
+                {
+                    _logger.LogWarning("Delete denied. EmployeeId: {EmployeeId} lacks Manage_Master permission.", loggedInEmployee.Id);
+                    return ApiResponse<object>.ErrorResponse("You don't have access", "Access denied for deleting work status", 403);
+                }
+
+                // Step 3: Find the work status
+                var workStatus = await _context.WorkStatusMasters
+                    .FirstOrDefaultAsync(ws => ws.Id == id && ws.TenantId == tenantId);
+
+                if (workStatus == null)
+                {
+                    _logger.LogWarning("Work status not found for Id: {Id}", id);
+                    return ApiResponse<object>.ErrorResponse("Work status not found", "Work status not found", 404);
+                }
+
+                // Step 4: Check for dependencies in TaskAllocations
+                bool hasDependency = await _context.TaskAllocations
+                    .AnyAsync(ta => ta.TenantId == tenantId && ta.WorkStatusId == id);
+
+                if (hasDependency)
+                {
+                    _logger.LogWarning("Cannot delete WorkStatus Id: {Id} due to existing task dependency", id);
+                    return ApiResponse<object>.ErrorResponse(
+                        "Work status has a dependency in assigned tasks and cannot be deleted",
+                        "Deletion failed due to associated tasks",
+                        400
+                    );
+                }
+
+                // Step 5: Delete and persist
+                _context.WorkStatusMasters.Remove(workStatus);
+                await _context.SaveChangesAsync();
+
+                _logger.LogInfo("Work status deleted successfully. Id: {Id}", id);
+                return ApiResponse<object>.SuccessResponse(new { }, "Work status deleted successfully", 200);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error occurred while deleting WorkStatus Id: {Id} : {Error}", id, ex.Message);
+                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to delete work status", 500);
+            }
         }
-
     }
 }
-- 
2.43.0


From ff9c7c94345b9c905622e5b334af18bddd5a1a22 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 16 Jun 2025 17:19:59 +0530
Subject: [PATCH 20/48] Added code to validate the id received by path
 parameter with id received by payload

---
 Marco.Pms.Services/Helpers/MasterHelper.cs | 39 ++++++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/Marco.Pms.Services/Helpers/MasterHelper.cs b/Marco.Pms.Services/Helpers/MasterHelper.cs
index 115b4b6..0698733 100644
--- a/Marco.Pms.Services/Helpers/MasterHelper.cs
+++ b/Marco.Pms.Services/Helpers/MasterHelper.cs
@@ -356,41 +356,58 @@ namespace Marco.Pms.Services.Helpers
 
             try
             {
-                // Step 1: Get tenant and employee info
+                // Step 1: Validate input
+                if (id == Guid.Empty || id != updateWorkStatusDto.Id)
+                {
+                    _logger.LogWarning("Invalid ID provided for update. Route ID: {RouteId}, DTO ID: {DtoId}", id, updateWorkStatusDto.Id);
+                    return ApiResponse<object>.ErrorResponse("Invalid data provided", "The provided work status ID is invalid", 400);
+                }
+
+                // Step 2: Get tenant and logged-in employee
                 Guid tenantId = _userHelper.GetTenantId();
                 var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
 
-                // Step 2: Check permission to update master
+                // Step 3: Check permissions
                 var hasManageMasterPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id);
                 if (!hasManageMasterPermission)
                 {
-                    _logger.LogWarning("Update denied. EmployeeId: {EmployeeId} does not have Manage Master permission.", loggedInEmployee.Id);
-                    return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+                    _logger.LogWarning("Access denied. EmployeeId: {EmployeeId} does not have Manage Master permission.", loggedInEmployee.Id);
+                    return ApiResponse<object>.ErrorResponse("Access denied", "You do not have permission to update this work status", 403);
                 }
 
-                // Step 3: Retrieve existing work status by id and tenant
+                // Step 4: Retrieve the work status record
                 var workStatus = await _context.WorkStatusMasters
                     .FirstOrDefaultAsync(ws => ws.Id == id && ws.TenantId == tenantId);
 
                 if (workStatus == null)
                 {
-                    _logger.LogWarning("Work status not found for Id: {Id}", id);
-                    return ApiResponse<object>.ErrorResponse("Work status not found", "Work status not found", 404);
+                    _logger.LogWarning("Work status not found for ID: {Id}", id);
+                    return ApiResponse<object>.ErrorResponse("Work status not found", "No work status found with the provided ID", 404);
                 }
 
-                // Step 4: Update fields
+                // Step 5: Check for duplicate name (optional)
+                var isDuplicate = await _context.WorkStatusMasters
+                    .AnyAsync(ws => ws.Name == updateWorkStatusDto.Name && ws.Id != id && ws.TenantId == tenantId);
+
+                if (isDuplicate)
+                {
+                    _logger.LogWarning("Duplicate work status name '{Name}' detected during update. ID: {Id}", updateWorkStatusDto.Name ?? "", id);
+                    return ApiResponse<object>.ErrorResponse("Work status with the same name already exists", "Duplicate name", 400);
+                }
+
+                // Step 6: Update fields
                 workStatus.Name = updateWorkStatusDto.Name?.Trim() ?? "";
                 workStatus.Description = updateWorkStatusDto.Description?.Trim() ?? "";
 
                 await _context.SaveChangesAsync();
 
-                _logger.LogInfo("Work status updated successfully. Id: {Id}", workStatus.Id);
+                _logger.LogInfo("Work status updated successfully. ID: {Id}", id);
                 return ApiResponse<object>.SuccessResponse(workStatus, "Work status updated successfully", 200);
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error occurred while updating work status Id: {Id} : {Error}", id, ex.Message);
-                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to update work status", 500);
+                _logger.LogError("Error occurred while updating work status ID: {Id} : {Error}", id, ex.Message);
+                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to update the work status at this time", 500);
             }
         }
         public async Task<ApiResponse<object>> DeleteWorkStatus(Guid id)
-- 
2.43.0


From 6ebc74499f7093f1c54258c9cd5051ba00eec42b Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 11 Jun 2025 10:21:39 +0530
Subject: [PATCH 21/48] Add basic implementation and add in record attendance
 API for testing

---
 .../Controllers/AttendanceController.cs       |  7 +++-
 Marco.Pms.Services/Hub/MarcoHub.cs            | 35 +++++++++++++++++++
 Marco.Pms.Services/Marco.Pms.Services.csproj  |  1 +
 Marco.Pms.Services/Program.cs                 | 24 +++++++++++--
 .../appsettings.Development.json              |  2 +-
 5 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 Marco.Pms.Services/Hub/MarcoHub.cs

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index efaaed0..2236c4c 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -7,11 +7,13 @@ using Marco.Pms.Model.Mapper;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.AttendanceVM;
+using Marco.Pms.Services.Hubs;
 using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
 using Document = Marco.Pms.Model.DocumentManager.Document;
@@ -30,10 +32,11 @@ namespace MarcoBMS.Services.Controllers
         private readonly S3UploadService _s3Service;
         private readonly PermissionServices _permission;
         private readonly ILoggingService _logger;
+        private readonly IHubContext<MarcoHub> _signalR;
 
 
         public AttendanceController(
-             ApplicationDbContext context, EmployeeHelper employeeHelper, ProjectsHelper projectsHelper, UserHelper userHelper, S3UploadService s3Service, ILoggingService logger, PermissionServices permission)
+             ApplicationDbContext context, EmployeeHelper employeeHelper, ProjectsHelper projectsHelper, UserHelper userHelper, S3UploadService s3Service, ILoggingService logger, PermissionServices permission, IHubContext<MarcoHub> signalR)
         {
             _context = context;
             _employeeHelper = employeeHelper;
@@ -42,6 +45,7 @@ namespace MarcoBMS.Services.Controllers
             _s3Service = s3Service;
             _logger = logger;
             _permission = permission;
+            _signalR = signalR;
         }
 
         private Guid GetTenantId()
@@ -558,6 +562,7 @@ namespace MarcoBMS.Services.Controllers
                         Activity = attendance.Activity,
                         JobRoleName = employee.JobRole.Name
                     };
+                    await _signalR.Clients.All.SendAsync("Attendance", new { LoggedInUserId = currentEmployee.Id, ProjectId = recordAttendanceDot.ProjectID, Response = vm });
                     _logger.LogInfo("Attendance for employee {FirstName} {LastName} has been marked", employee.FirstName ?? string.Empty, employee.LastName ?? string.Empty);
                     return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
                 }
diff --git a/Marco.Pms.Services/Hub/MarcoHub.cs b/Marco.Pms.Services/Hub/MarcoHub.cs
new file mode 100644
index 0000000..bf6fc38
--- /dev/null
+++ b/Marco.Pms.Services/Hub/MarcoHub.cs
@@ -0,0 +1,35 @@
+using MarcoBMS.Services.Service;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.SignalR;
+
+namespace Marco.Pms.Services.Hubs
+{
+    [Authorize]
+    public class MarcoHub : Hub
+    {
+        private readonly ILoggingService _logger;
+        public MarcoHub(ILoggingService logger)
+        {
+            _logger = logger;
+        }
+        public async Task SendMessage(string user, string message)
+        {
+            _logger.LogInfo($"User: {user} Message : {message}");
+            await Clients.All.SendAsync("ReceiveMessage", user, message);
+        }
+        public override async Task OnConnectedAsync()
+        {
+            await base.OnConnectedAsync();
+            _logger.LogInfo($"Connected successfully");
+            await Clients.All.SendAsync("Connected successfully");
+        }
+
+        // Optional: override OnDisconnectedAsync
+        public override async Task OnDisconnectedAsync(Exception? exception)
+        {
+            await base.OnDisconnectedAsync(exception);
+            _logger.LogInfo($"DIsonnected successfully");
+            await Clients.All.SendAsync("Disonnected successfully");
+        }
+    }
+}
diff --git a/Marco.Pms.Services/Marco.Pms.Services.csproj b/Marco.Pms.Services/Marco.Pms.Services.csproj
index 6482198..7bef32f 100644
--- a/Marco.Pms.Services/Marco.Pms.Services.csproj
+++ b/Marco.Pms.Services/Marco.Pms.Services.csproj
@@ -17,6 +17,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.12" />
     <PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.12" />
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.12">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/Marco.Pms.Services/Program.cs b/Marco.Pms.Services/Program.cs
index e57fa15..17eb5c7 100644
--- a/Marco.Pms.Services/Program.cs
+++ b/Marco.Pms.Services/Program.cs
@@ -4,6 +4,7 @@ using Marco.Pms.Model.Authentication;
 using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Services.Helpers;
+using Marco.Pms.Services.Hubs;
 using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Middleware;
@@ -59,7 +60,8 @@ builder.Services.AddCors(options =>
     {
         policy.AllowAnyOrigin()
               .AllowAnyMethod()
-              .AllowAnyHeader();
+              .AllowAnyHeader()
+              .WithExposedHeaders("Authorization");
     });
 });
 
@@ -161,10 +163,28 @@ if (jwtSettings != null && jwtSettings.Key != null)
             ValidAudience = jwtSettings.Audience,
             IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtSettings.Key))
         };
+
+        options.Events = new JwtBearerEvents
+        {
+            OnMessageReceived = context =>
+            {
+                var accessToken = context.Request.Query["access_token"];
+                var path = context.HttpContext.Request.Path;
+
+                // Match your hub route here
+                if (!string.IsNullOrEmpty(accessToken) && path.StartsWithSegments("/hubs/marco"))
+                {
+                    context.Token = accessToken;
+                }
+
+                return Task.CompletedTask;
+            }
+        };
     });
     builder.Services.AddSingleton(jwtSettings);
 }
 
+builder.Services.AddSignalR();
 builder.WebHost.ConfigureKestrel(options =>
 {
     options.AddServerHeader = false; // Disable the "Server" header
@@ -207,7 +227,7 @@ app.UseHttpsRedirection();
 
 
 app.UseAuthorization();
-
+app.MapHub<MarcoHub>("/hubs/marco");
 app.MapControllers();
 
 app.Run();
diff --git a/Marco.Pms.Services/appsettings.Development.json b/Marco.Pms.Services/appsettings.Development.json
index 2cbcbcf..1565018 100644
--- a/Marco.Pms.Services/appsettings.Development.json
+++ b/Marco.Pms.Services/appsettings.Development.json
@@ -9,7 +9,7 @@
         "Title": "Dev"
     },
     "ConnectionStrings": {
-        "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMSGuid"
+        "DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1"
     },
     "SmtpSettings": {
         "SmtpServer": "smtp.gmail.com",
-- 
2.43.0


From d78a2fe3b2e552ea9c4d997c2efc180c08ba7378 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 11:04:24 +0530
Subject: [PATCH 22/48] Implemented signalR in project infrastructure APIs

---
 .../Controllers/AttendanceController.cs       |  8 ++++-
 .../Controllers/ProjectController.cs          | 35 +++++++++++++++----
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 2236c4c..8cbd053 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -562,7 +562,13 @@ namespace MarcoBMS.Services.Controllers
                         Activity = attendance.Activity,
                         JobRoleName = employee.JobRole.Name
                     };
-                    await _signalR.Clients.All.SendAsync("Attendance", new { LoggedInUserId = currentEmployee.Id, ProjectId = recordAttendanceDot.ProjectID, Response = vm });
+                    var sendActivity = 0;
+                    if (recordAttendanceDot.Id == Guid.Empty)
+                    {
+                        sendActivity = 1;
+                    }
+                    var notification = new { LoggedInUserId = currentEmployee.Id, Keyword = "Attendance", Activity = sendActivity, ProjectId = attendance.ProjectID, Response = vm };
+                    await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                     _logger.LogInfo("Attendance for employee {FirstName} {LastName} has been marked", employee.FirstName ?? string.Empty, employee.LastName ?? string.Empty);
                     return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
                 }
diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 18a790b..187497e 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -8,12 +8,13 @@ using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Employee;
 using Marco.Pms.Model.ViewModels.Projects;
+using Marco.Pms.Services.Hubs;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 
 namespace MarcoBMS.Services.Controllers
 {
@@ -27,15 +28,18 @@ namespace MarcoBMS.Services.Controllers
         private readonly ILoggingService _logger;
         private readonly RolesHelper _rolesHelper;
         private readonly ProjectsHelper _projectsHelper;
+        private readonly IHubContext<MarcoHub> _signalR;
 
 
-        public ProjectController(ApplicationDbContext context, UserHelper userHelper, ILoggingService logger, RolesHelper rolesHelper, ProjectsHelper projectHelper)
+        public ProjectController(ApplicationDbContext context, UserHelper userHelper, ILoggingService logger, RolesHelper rolesHelper, ProjectsHelper projectHelper, IHubContext<MarcoHub> signalR)
         {
             _context = context;
             _userHelper = userHelper;
             _logger = logger;
             _rolesHelper = rolesHelper;
             _projectsHelper = projectHelper;
+            _signalR = signalR;
+
         }
 
         [HttpGet("list/basic")]
@@ -314,6 +318,7 @@ namespace MarcoBMS.Services.Controllers
         [HttpPost]
         public async Task<IActionResult> Create([FromBody] CreateProjectDto projectDto)
         {
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             if (!ModelState.IsValid)
             {
                 var errors = ModelState.Values
@@ -330,6 +335,9 @@ namespace MarcoBMS.Services.Controllers
             _context.Projects.Add(project);
 
             await _context.SaveChangesAsync();
+            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+
+            await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
             return Ok(ApiResponse<object>.SuccessResponse(project.ToProjectDto(), "Success.", 200));
         }
@@ -338,6 +346,7 @@ namespace MarcoBMS.Services.Controllers
         [Route("update/{id}")]
         public async Task<IActionResult> Update([FromRoute] Guid id, [FromBody] UpdateProjectDto updateProjectDto)
         {
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             if (!ModelState.IsValid)
             {
                 var errors = ModelState.Values
@@ -356,6 +365,10 @@ namespace MarcoBMS.Services.Controllers
 
                 await _context.SaveChangesAsync();
 
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
+
                 return Ok(ApiResponse<object>.SuccessResponse(project.ToProjectDto(), "Success.", 200));
 
             }
@@ -365,7 +378,6 @@ namespace MarcoBMS.Services.Controllers
             }
         }
 
-
         //[HttpPost("assign-employee")]
         //public async Task<IActionResult> AssignEmployee(int? allocationid, int employeeId, int projectId)
         //{
@@ -576,6 +588,7 @@ namespace MarcoBMS.Services.Controllers
         public async Task<IActionResult> CreateProjectTask(List<WorkItemDot> workItemDot)
         {
             Guid tenantId = GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             List<WorkItemVM> workItems = new List<WorkItemVM> { };
             string responseMessage = "";
             if (workItemDot != null)
@@ -607,6 +620,10 @@ namespace MarcoBMS.Services.Controllers
                 }
                 var activity = await _context.ActivityMasters.ToListAsync();
                 var category = await _context.WorkCategoryMasters.ToListAsync();
+
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = workItems };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(workItems, responseMessage, 200));
             }
 
@@ -618,6 +635,7 @@ namespace MarcoBMS.Services.Controllers
         public async Task<IActionResult> DeleteProjectTask(Guid id)
         {
             Guid tenantId = _userHelper.GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             WorkItem? task = await _context.WorkItems.AsNoTracking().FirstOrDefaultAsync(t => t.Id == id && t.TenantId == tenantId);
             if (task != null)
             {
@@ -629,6 +647,9 @@ namespace MarcoBMS.Services.Controllers
                         _context.WorkItems.Remove(task);
                         await _context.SaveChangesAsync();
                         _logger.LogInfo("Task with ID {WorkItemId} has been successfully deleted.", task.Id);
+
+                        var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = id };
+                        await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                     }
                     else
                     {
@@ -656,6 +677,8 @@ namespace MarcoBMS.Services.Controllers
         public async Task<IActionResult> ManageProjectInfra(List<InfraDot> infraDots)
         {
             Guid tenantId = GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
             var responseData = new InfraVM { };
             string responseMessage = "";
             if (infraDots != null)
@@ -731,6 +754,9 @@ namespace MarcoBMS.Services.Controllers
                         }
                     }
                 }
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = responseData };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(responseData, responseMessage, 200));
             }
             return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Infra Details are not valid.", 400));
@@ -776,9 +802,6 @@ namespace MarcoBMS.Services.Controllers
             return Ok(ApiResponse<object>.SuccessResponse(projects, "Success.", 200));
         }
 
-
-
-
         [HttpPost("assign-projects/{employeeId}")]
         public async Task<ActionResult> AssigneProjectsToEmployee([FromBody] List<ProjectsAllocationDto> projectAllocationDtos, [FromRoute] Guid employeeId)
         {
-- 
2.43.0


From b21d30c18e0299184d41df09f1b2348f1286c62b Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 20:53:24 +0530
Subject: [PATCH 23/48] Changed the keyword for updating and creating project

---
 Marco.Pms.Services/Controllers/ProjectController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 187497e..0cfd536 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -335,7 +335,7 @@ namespace MarcoBMS.Services.Controllers
             _context.Projects.Add(project);
 
             await _context.SaveChangesAsync();
-            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Create_Project", Response = project.ToProjectDto() };
 
             await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
@@ -365,7 +365,7 @@ namespace MarcoBMS.Services.Controllers
 
                 await _context.SaveChangesAsync();
 
-                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Project", Response = project.ToProjectDto() };
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Update_Project", Response = project.ToProjectDto() };
 
                 await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
-- 
2.43.0


From f47586710b5537064c1244d33caa1bacb686a417 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 11 Jun 2025 10:21:39 +0530
Subject: [PATCH 24/48] Add basic implementation and add in record attendance
 API for testing

---
 .../Controllers/AttendanceController.cs       | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 8cbd053..ad40093 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -562,13 +562,7 @@ namespace MarcoBMS.Services.Controllers
                         Activity = attendance.Activity,
                         JobRoleName = employee.JobRole.Name
                     };
-                    var sendActivity = 0;
-                    if (recordAttendanceDot.Id == Guid.Empty)
-                    {
-                        sendActivity = 1;
-                    }
-                    var notification = new { LoggedInUserId = currentEmployee.Id, Keyword = "Attendance", Activity = sendActivity, ProjectId = attendance.ProjectID, Response = vm };
-                    await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
+                    await _signalR.Clients.All.SendAsync("Attendance", new { LoggedInUserId = currentEmployee.Id, ProjectId = recordAttendanceDot.ProjectID, Response = vm });
                     _logger.LogInfo("Attendance for employee {FirstName} {LastName} has been marked", employee.FirstName ?? string.Empty, employee.LastName ?? string.Empty);
                     return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
                 }
@@ -707,16 +701,7 @@ namespace MarcoBMS.Services.Controllers
                     if (string.IsNullOrEmpty(Image.Base64Data))
                         return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
 
-                    //If base64 has a data URI prefix, strip it
-                    var base64 = Image.Base64Data.Contains(",")
-                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
-                        : Image.Base64Data;
-
-                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
-                    string fileName = _s3Service.GenerateFileName(fileType, TenantId, "attendance");
-
-                    string objectKey = $"tenant-{TenantId}/Employee/{recordAttendanceDot.EmployeeID}/Attendance/{fileName}";
-                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
+                    objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, TenantId, "attendance");
                     preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(objectKey);
 
                     document = new Document
-- 
2.43.0


From 793877b8f8166789f7ad078b9d3ed648268bdade Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 12 Jun 2025 11:04:24 +0530
Subject: [PATCH 25/48] Implemented signalR in project infrastructure APIs

---
 Marco.Pms.Services/Controllers/AttendanceController.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index ad40093..d7c4e30 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -562,7 +562,13 @@ namespace MarcoBMS.Services.Controllers
                         Activity = attendance.Activity,
                         JobRoleName = employee.JobRole.Name
                     };
-                    await _signalR.Clients.All.SendAsync("Attendance", new { LoggedInUserId = currentEmployee.Id, ProjectId = recordAttendanceDot.ProjectID, Response = vm });
+                    var sendActivity = 0;
+                    if (recordAttendanceDot.Id == Guid.Empty)
+                    {
+                        sendActivity = 1;
+                    }
+                    var notification = new { LoggedInUserId = currentEmployee.Id, Keyword = "Attendance", Activity = sendActivity, ProjectId = attendance.ProjectID, Response = vm };
+                    await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                     _logger.LogInfo("Attendance for employee {FirstName} {LastName} has been marked", employee.FirstName ?? string.Empty, employee.LastName ?? string.Empty);
                     return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
                 }
-- 
2.43.0


From 29ea1698bcc3a22c9ba646b31ee2953fc35cd2d5 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 13 Jun 2025 16:22:58 +0530
Subject: [PATCH 26/48] Implemented signalR in manage Task API

---
 .../Controllers/ProjectController.cs          | 37 ++++++++++++++++---
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 0cfd536..d391909 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -63,9 +63,9 @@ namespace MarcoBMS.Services.Controllers
                 return Unauthorized(ApiResponse<object>.ErrorResponse("Employee not found.", null, 401));
             }
 
-           
-            List<Project> projects =  await _projectsHelper.GetMyProjects(tenantId, LoggedInEmployee);
-            
+
+            List<Project> projects = await _projectsHelper.GetMyProjects(tenantId, LoggedInEmployee);
+
 
             // 4. Project projection to ProjectInfoVM
             // This part is already quite efficient.
@@ -88,7 +88,7 @@ namespace MarcoBMS.Services.Controllers
             return Ok(ApiResponse<object>.SuccessResponse(response, "Success.", 200));
         }
 
-     
+
 
         [HttpGet("list")]
         public async Task<IActionResult> GetAll()
@@ -518,7 +518,11 @@ namespace MarcoBMS.Services.Controllers
             if (projectAllocationDot != null)
             {
                 Guid TenentID = GetTenantId();
+                var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
                 List<object>? result = new List<object>();
+                List<Guid> employeeIds = new List<Guid>();
+                List<Guid> projectIds = new List<Guid>();
 
                 foreach (var item in projectAllocationDot)
                 {
@@ -547,6 +551,9 @@ namespace MarcoBMS.Services.Controllers
                                 projectAllocationFromDb.IsActive = false;
                                 _context.Entry(projectAllocationFromDb).Property(e => e.ReAllocationDate).IsModified = true;
                                 _context.Entry(projectAllocationFromDb).Property(e => e.IsActive).IsModified = true;
+
+                                employeeIds.Add(projectAllocation.EmployeeId);
+                                projectIds.Add(projectAllocation.ProjectId);
                             }
                             await _context.SaveChangesAsync();
                             var result1 = new
@@ -568,15 +575,21 @@ namespace MarcoBMS.Services.Controllers
                             projectAllocation.IsActive = true;
                             _context.ProjectAllocations.Add(projectAllocation);
                             await _context.SaveChangesAsync();
+
+                            employeeIds.Add(projectAllocation.EmployeeId);
+                            projectIds.Add(projectAllocation.ProjectId);
                         }
 
+
                     }
                     catch (Exception ex)
                     {
                         return Ok(ApiResponse<object>.ErrorResponse(ex.Message, ex, 400));
                     }
                 }
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Assign_Project", ProjectIds = projectIds, EmployeeList = employeeIds };
 
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(result, "Data saved successfully", 200));
 
             }
@@ -590,6 +603,7 @@ namespace MarcoBMS.Services.Controllers
             Guid tenantId = GetTenantId();
             var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             List<WorkItemVM> workItems = new List<WorkItemVM> { };
+            Building building = new Building();
             string responseMessage = "";
             if (workItemDot != null)
             {
@@ -597,6 +611,10 @@ namespace MarcoBMS.Services.Controllers
                 {
                     WorkItem workItem = item.ToWorkItemFromWorkItemDto(tenantId);
 
+                    var workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == workItem.WorkAreaId) ?? new WorkArea();
+
+                    building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty)) ?? new Building();
+
                     if (item.Id != null)
                     {
                         //update
@@ -621,7 +639,7 @@ namespace MarcoBMS.Services.Controllers
                 var activity = await _context.ActivityMasters.ToListAsync();
                 var category = await _context.WorkCategoryMasters.ToListAsync();
 
-                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = workItems };
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectId = building.ProjectId };
 
                 await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(workItems, responseMessage, 200));
@@ -808,7 +826,9 @@ namespace MarcoBMS.Services.Controllers
             if (projectAllocationDtos != null && employeeId != Guid.Empty)
             {
                 Guid TenentID = GetTenantId();
+                var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
                 List<object>? result = new List<object>();
+                List<Guid> projectIds = new List<Guid>();
 
                 foreach (var projectAllocationDto in projectAllocationDtos)
                 {
@@ -836,6 +856,8 @@ namespace MarcoBMS.Services.Controllers
                                 projectAllocationFromDb.IsActive = false;
                                 _context.Entry(projectAllocationFromDb).Property(e => e.ReAllocationDate).IsModified = true;
                                 _context.Entry(projectAllocationFromDb).Property(e => e.IsActive).IsModified = true;
+
+                                projectIds.Add(projectAllocation.ProjectId);
                             }
                             await _context.SaveChangesAsync();
                             var result1 = new
@@ -858,6 +880,8 @@ namespace MarcoBMS.Services.Controllers
                             _context.ProjectAllocations.Add(projectAllocation);
                             await _context.SaveChangesAsync();
 
+                            projectIds.Add(projectAllocation.ProjectId);
+
                         }
 
 
@@ -868,6 +892,9 @@ namespace MarcoBMS.Services.Controllers
                         return Ok(ApiResponse<object>.ErrorResponse(ex.Message, ex, 400));
                     }
                 }
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Assign_Project", ProjectIds = projectIds, EmployeeId = employeeId };
+
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
 
                 return Ok(ApiResponse<object>.SuccessResponse(result, "Data saved successfully", 200));
             }
-- 
2.43.0


From 39378f3a88b8aa3770ea5ef083c7ce4eb5071769 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 16 Jun 2025 18:09:00 +0530
Subject: [PATCH 27/48] Resolved rebase issues

---
 .../Controllers/AttendanceController.cs              | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index d7c4e30..3181ce9 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -707,7 +707,16 @@ namespace MarcoBMS.Services.Controllers
                     if (string.IsNullOrEmpty(Image.Base64Data))
                         return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
 
-                    objectKey = await _s3Service.UploadFileAsync(Image.Base64Data, TenantId, "attendance");
+                    //If base64 has a data URI prefix, strip it
+                    var base64 = Image.Base64Data.Contains(",")
+                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
+                        : Image.Base64Data;
+
+                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    string fileName = _s3Service.GenerateFileName(fileType, TenantId, "attendance");
+
+                    string objectKey = $"tenant-{TenantId}/Employee/{recordAttendanceDot.EmployeeID}/Attendance/{fileName}";
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
                     preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(objectKey);
 
                     document = new Document
@@ -722,6 +731,7 @@ namespace MarcoBMS.Services.Controllers
                     };
                     _context.Documents.Add(document);
 
+
                     await _context.SaveChangesAsync();
                 }
 
-- 
2.43.0


From e2956c0c8cdabf224b0ffeac506218af1d571b50 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Tue, 17 Jun 2025 17:05:52 +0530
Subject: [PATCH 28/48] Added signalR functionality in Project Infrastructure

---
 .../Controllers/ProjectController.cs          | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index d391909..b120c04 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -88,8 +88,6 @@ namespace MarcoBMS.Services.Controllers
             return Ok(ApiResponse<object>.SuccessResponse(response, "Success.", 200));
         }
 
-
-
         [HttpGet("list")]
         public async Task<IActionResult> GetAll()
         {
@@ -603,7 +601,8 @@ namespace MarcoBMS.Services.Controllers
             Guid tenantId = GetTenantId();
             var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
             List<WorkItemVM> workItems = new List<WorkItemVM> { };
-            Building building = new Building();
+            List<Guid> projectIds = new List<Guid>();
+            string message = "";
             string responseMessage = "";
             if (workItemDot != null)
             {
@@ -613,21 +612,23 @@ namespace MarcoBMS.Services.Controllers
 
                     var workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == workItem.WorkAreaId) ?? new WorkArea();
 
-                    building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty)) ?? new Building();
+                    Building building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty)) ?? new Building();
 
                     if (item.Id != null)
                     {
                         //update
                         _context.WorkItems.Update(workItem);
                         await _context.SaveChangesAsync();
-                        responseMessage = "Task Added Successfully";
+                        responseMessage = "Task Updated Successfully";
+                        message = $"Task Updated by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
                     }
                     else
                     {
                         //create
                         _context.WorkItems.Add(workItem);
                         await _context.SaveChangesAsync();
-                        responseMessage = "Task Updated Successfully";
+                        responseMessage = "Task Added Successfully";
+                        message = $"Task Added by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
                     }
                     var result = new WorkItemVM
                     {
@@ -635,11 +636,12 @@ namespace MarcoBMS.Services.Controllers
                         WorkItem = workItem
                     };
                     workItems.Add(result);
+                    projectIds.Add(building.ProjectId);
                 }
                 var activity = await _context.ActivityMasters.ToListAsync();
                 var category = await _context.WorkCategoryMasters.ToListAsync();
 
-                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectId = building.ProjectId };
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectIds = projectIds, Message = message };
 
                 await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(workItems, responseMessage, 200));
@@ -654,7 +656,8 @@ namespace MarcoBMS.Services.Controllers
         {
             Guid tenantId = _userHelper.GetTenantId();
             var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
-            WorkItem? task = await _context.WorkItems.AsNoTracking().FirstOrDefaultAsync(t => t.Id == id && t.TenantId == tenantId);
+            List<Guid> projectIds = new List<Guid>();
+            WorkItem? task = await _context.WorkItems.AsNoTracking().Include(t => t.WorkArea).FirstOrDefaultAsync(t => t.Id == id && t.TenantId == tenantId);
             if (task != null)
             {
                 if (task.CompletedWork == 0)
@@ -666,7 +669,13 @@ namespace MarcoBMS.Services.Controllers
                         await _context.SaveChangesAsync();
                         _logger.LogInfo("Task with ID {WorkItemId} has been successfully deleted.", task.Id);
 
-                        var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = id };
+                        var floorId = task.WorkArea?.FloorId;
+                        var floor = await _context.Floor.Include(f => f.Building).FirstOrDefaultAsync(f => f.Id == floorId);
+
+
+                        projectIds.Add(floor?.Building?.ProjectId ?? Guid.Empty);
+
+                        var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectIds = projectIds, Message = $"Task Deleted by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}" };
                         await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                     }
                     else
@@ -699,6 +708,8 @@ namespace MarcoBMS.Services.Controllers
 
             var responseData = new InfraVM { };
             string responseMessage = "";
+            string message = "";
+            List<Guid> projectIds = new List<Guid>();
             if (infraDots != null)
             {
                 foreach (var item in infraDots)
@@ -716,6 +727,7 @@ namespace MarcoBMS.Services.Controllers
                             await _context.SaveChangesAsync();
                             responseData.building = building;
                             responseMessage = "Buliding Added Successfully";
+                            message = "Building Added";
                         }
                         else
                         {
@@ -724,8 +736,10 @@ namespace MarcoBMS.Services.Controllers
                             await _context.SaveChangesAsync();
                             responseData.building = building;
                             responseMessage = "Buliding Updated Successfully";
+                            message = "Building Updated";
 
                         }
+                        projectIds.Add(building.ProjectId);
                     }
                     if (item.Floor != null)
                     {
@@ -739,6 +753,7 @@ namespace MarcoBMS.Services.Controllers
                             await _context.SaveChangesAsync();
                             responseData.floor = floor;
                             responseMessage = "Floor Added Successfully";
+                            message = "Floor Added";
                         }
                         else
                         {
@@ -747,7 +762,10 @@ namespace MarcoBMS.Services.Controllers
                             await _context.SaveChangesAsync();
                             responseData.floor = floor;
                             responseMessage = "Floor Updated Successfully";
+                            message = "Floor Updated";
                         }
+                        Building? building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == floor.BuildingId);
+                        projectIds.Add(building?.ProjectId ?? Guid.Empty);
                     }
                     if (item.WorkArea != null)
                     {
@@ -761,6 +779,7 @@ namespace MarcoBMS.Services.Controllers
                             await _context.SaveChangesAsync();
                             responseData.workArea = workArea;
                             responseMessage = "Work Area Added Successfully";
+                            message = "Work Area Added";
                         }
                         else
                         {
@@ -769,10 +788,14 @@ namespace MarcoBMS.Services.Controllers
                             await _context.SaveChangesAsync();
                             responseData.workArea = workArea;
                             responseMessage = "Work Area Updated Successfully";
+                            message = "Work Area Updated";
                         }
+                        Floor? floor = await _context.Floor.Include(f => f.Building).FirstOrDefaultAsync(f => f.Id == workArea.FloorId);
+                        projectIds.Add(floor?.Building?.ProjectId ?? Guid.Empty);
                     }
                 }
-                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", Response = responseData };
+                message = $"{message} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
+                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectIds = projectIds, Message = message };
 
                 await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 return Ok(ApiResponse<object>.SuccessResponse(responseData, responseMessage, 200));
-- 
2.43.0


From 303f3267739fad575f93e7c96b40eb9fe3c9001b Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 18 Jun 2025 12:00:35 +0530
Subject: [PATCH 29/48] Implemented signalR in Employee module

---
 .../Controllers/EmployeeController.cs         | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/EmployeeController.cs b/Marco.Pms.Services/Controllers/EmployeeController.cs
index 30ac36d..93580dd 100644
--- a/Marco.Pms.Services/Controllers/EmployeeController.cs
+++ b/Marco.Pms.Services/Controllers/EmployeeController.cs
@@ -9,11 +9,13 @@ using Marco.Pms.Model.Mapper;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Employee;
+using Marco.Pms.Services.Hubs;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
 
 namespace MarcoBMS.Services.Controllers
@@ -32,9 +34,11 @@ namespace MarcoBMS.Services.Controllers
         private readonly UserHelper _userHelper;
         private readonly IConfiguration _configuration;
         private readonly ILoggingService _logger;
+        private readonly IHubContext<MarcoHub> _signalR;
 
         public EmployeeController(UserManager<ApplicationUser> userManager, IEmailSender emailSender,
-            ApplicationDbContext context, EmployeeHelper employeeHelper, UserHelper userHelper, IConfiguration configuration, ILoggingService logger)
+            ApplicationDbContext context, EmployeeHelper employeeHelper, UserHelper userHelper, IConfiguration configuration, ILoggingService logger,
+            IHubContext<MarcoHub> signalR)
         {
             _context = context;
             _userManager = userManager;
@@ -43,6 +47,7 @@ namespace MarcoBMS.Services.Controllers
             _userHelper = userHelper;
             _configuration = configuration;
             _logger = logger;
+            _signalR = signalR;
         }
 
         [HttpGet]
@@ -154,6 +159,8 @@ namespace MarcoBMS.Services.Controllers
         public async Task<IActionResult> CreateUser([FromBody] CreateUserDto model)
         {
             Guid tenantId = _userHelper.GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            Guid employeeId = Guid.Empty;
             if (model == null)
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", "Invaild Data", 400));
 
@@ -180,6 +187,7 @@ namespace MarcoBMS.Services.Controllers
 
                         _context.Employees.Update(existingEmployee);
                         await _context.SaveChangesAsync();
+                        employeeId = existingEmployee.Id;
                         responsemessage = "User updated successfully.";
                     }
                     else
@@ -214,7 +222,7 @@ namespace MarcoBMS.Services.Controllers
                         _context.Employees.Add(newEmployee);
 
                         await _context.SaveChangesAsync();
-
+                        employeeId = newEmployee.Id;
 
                         /* SEND USER REGISTRATION MAIL*/
                         var token = await _userManager.GeneratePasswordResetTokenAsync(user);
@@ -233,6 +241,7 @@ namespace MarcoBMS.Services.Controllers
                         _context.Employees.Update(existingEmployee);
                         await _context.SaveChangesAsync();
 
+                        employeeId = existingEmployee.Id;
 
                         /* SEND USER REGISTRATION MAIL*/
                         var token = await _userManager.GeneratePasswordResetTokenAsync(user);
@@ -256,17 +265,22 @@ namespace MarcoBMS.Services.Controllers
                     existingEmployee = GetUpdateEmployeeModel(model, existingEmployee);
                     _context.Employees.Update(existingEmployee);
                     responsemessage = "User updated successfully.";
+                    employeeId = existingEmployee.Id;
                 }
                 else
                 {
                     // Create Employee record if missing
                     Employee newEmployee = GetNewEmployeeModel(model, tenantId, string.Empty);
                     _context.Employees.Add(newEmployee);
+                    employeeId = newEmployee.Id;
                 }
                 await _context.SaveChangesAsync();
                 responsemessage = "User created successfully.";
 
             }
+            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Employee", EmployeeId = employeeId };
+
+            await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
             return Ok(ApiResponse<object>.SuccessResponse("Success.", responsemessage, 200));
         }
 
@@ -420,6 +434,9 @@ namespace MarcoBMS.Services.Controllers
                     }
                     await _context.SaveChangesAsync();
                     _logger.LogInfo("Employee with ID {EmployeId} Deleted successfully", employee.Id);
+                    var notification = new { LoggedInUserId = LoggedEmployee.Id, Keyword = "Employee", EmployeeId = employee.Id };
+
+                    await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                 }
             }
             else
-- 
2.43.0


From 1c58265a9f666a5cadf735a469aea908a4bf2ead Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Wed, 18 Jun 2025 17:34:33 +0530
Subject: [PATCH 30/48] added new fields inside workItem- parentTaskId and
 Description

---
 ...orkItemForParentId_Description.Designer.cs | 3381 +++++++++++++++++
 ...EnhancedWorkItemForParentId_Description.cs |   41 +
 .../ApplicationDbContextModelSnapshot.cs      |    6 +
 Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs  |    2 +
 Marco.Pms.Model/Mapper/InfraMapper.cs         |    4 +-
 Marco.Pms.Model/Projects/WorkItem.cs          |    6 +
 Marco.Pms.Services/Helpers/DirectoryHelper.cs |    4 +-
 7 files changed, 3441 insertions(+), 3 deletions(-)
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.Designer.cs
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.cs

diff --git a/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.Designer.cs
new file mode 100644
index 0000000..4d39cf1
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.Designer.cs
@@ -0,0 +1,3381 @@
+// <auto-generated />
+using System;
+using Marco.Pms.DataAccess.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250618112021_EnhancedWorkItemForParentId_Description")]
+    partial class EnhancedWorkItemForParentId_Description
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            //MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("ApprovedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ApprovedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AssignedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AssignmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("CompletedTask")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("PlannedTask")
+                        .HasColumnType("double");
+
+                    b.Property<Guid?>("ReportedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReportedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("ReportedTask")
+                        .HasColumnType("double");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkItemId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApprovedById");
+
+                    b.HasIndex("AssignedBy");
+
+                    b.HasIndex("ReportedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkItemId");
+
+                    b.HasIndex("WorkStatusId");
+
+                    b.ToTable("TaskAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ReferenceId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CommentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CommentedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentedBy");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskMembers");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ApprovedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AttendanceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("InTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("OutTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ProjectID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Attendes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ActivityTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AttendanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Latitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Longitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("UpdatedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdatedOn")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AttendanceId");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("AttendanceLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MPIN")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MPINToken")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("MPINDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("ExpriesInSec")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OTP")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("OTPDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedByID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedByID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buckets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ContactCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Organization")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactCategoryId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Contacts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactCategoryMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EmailAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactsEmails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactNotes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    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")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactTagId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("ContactTagId");
+
+                    b.ToTable("ContactTagMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactTagMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("RefereanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdateAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("DirectoryUpdateLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("EmployeeBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Base64Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("BatchId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("S3Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ThumbS3Key")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UploadedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AadharNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CurrentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyPhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("JoiningDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MiddleName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PanNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PermanentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.HasIndex("JobRoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("RoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("EmployeeRoleMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeOnly>("EndTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkShifts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsMandatory")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityCheckLists");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("CheckListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FeatureId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeatureId");
+
+                    b.ToTable("FeaturePermissions");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"),
+                            Description = "Access all information related to the project.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "View Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"),
+                            Description = "Potentially edit the project name, description, start/end dates, or status.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"),
+                            Description = "The \"Manage Team\" feature allows authorized users to organize project personnel by adding, removing, and assigning employee to projects.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Team"
+                        },
+                        new
+                        {
+                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "View Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure.",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "Manage Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"),
+                            Description = "Grants a user comprehensive read-only access to all details associated with tasks within a project. This includes task descriptions, statuses, assignees, due dates, dependencies, progress, history, and any related attachments or discussions.",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "View Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("08752f33-3b29-4816-b76b-ea8a968ed3c5"),
+                            Description = "This allows them to create new tasks, modify existing task attributes (description, status, assignee, due date, etc.),",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2"),
+                            Description = "Grants a user the ability to designate team members responsible for specific tasks and to update the completion status or provide progress updates for those tasks",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Assign/Report Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"),
+                            Description = "Grants a user the authority to officially confirm the completion or acceptance of a task, often signifying that it meets the required standards or criteria",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Approve Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                            Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"),
+                            Description = "Grants a user the authority to create new employee profiles and modify existing employee details within the system. This typically includes adding or updating information such as names, contact details, roles, departments, skills, and potentially other personal or professional data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"),
+                            Description = "Grants a user the authority to manage employee application roles, enabling them to assign or revoke access privileges within the system.",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Assign Roles"
+                        },
+                        new
+                        {
+                            Id = new Guid("915e6bff-65f6-4e3f-aea8-3fd217d3ea9e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Team Attendance "
+                        },
+                        new
+                        {
+                            Id = new Guid("57802c4a-00aa-4a1f-a048-fd2f70dd44b6"),
+                            Description = "Grants a user the authority to approve requests from employees to adjust or correct their recorded attendance. This typically involves reviewing the reason for the regularization, verifying any supporting documentation, and then officially accepting the changes to the employee's attendance records",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Regularize Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("ccb0589f-712b-43de-92ed-5b6088e7dc4e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Self Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"),
+                            Description = "Grants a user read-only access to foundational or reference data within the system. \"Masters\" typically refer to predefined lists, categories, or templates that are used throughout the application to standardize information and maintain consistency",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("588a8824-f924-4955-82d8-fc51956cf323"),
+                            Description = "Grants a user the authority to create, modify, and delete foundational or reference data within the system. These \"masters\" are typically the core lists, categories, and configurations that other data and functionalities rely upon, such as departments, job titles, product categories",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("4286a13b-bb40-4879-8c6d-18e9e393beda"),
+                            Description = "Full control over all directories, including the ability to manage permissions for all directories in the system.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Admin"
+                        },
+                        new
+                        {
+                            Id = new Guid("62668630-13ce-4f52-a0f0-db38af2230c5"),
+                            Description = "Full control over directories they created or have been assigned. Can also manage permissions for those directories.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Manager"
+                        },
+                        new
+                        {
+                            Id = new Guid("0f919170-92d4-4337-abd3-49b66fc871bb"),
+                            Description = "Full control over directories they created. Can view contacts in directories they either created or were assigned to. Can manage permissions only for directories they created.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory User"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.Property<Guid>("ApplicationRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FeaturePermissionId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("ApplicationRoleId", "FeaturePermissionId");
+
+                    b.HasIndex("FeaturePermissionId");
+
+                    b.ToTable("RolePermissionMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DomainName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OnBoardingDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IndustryId");
+
+                    b.ToTable("Tenants");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b3466e83-7e11-464c-b93a-daf047838b26"),
+                            ContactName = "Admin",
+                            ContactNumber = "123456789",
+                            Description = "",
+                            DomainName = "www.marcobms.org",
+                            IndustryId = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            IsActive = true,
+                            Name = "MarcoBMS",
+                            OnBoardingDate = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            OragnizationSize = "100-200"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("CommentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MessageText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentMessageId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("SentAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TicketComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("LinkedActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("LinkedProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("PriorityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("StatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PriorityId");
+
+                    b.HasIndex("StatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("Tickets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketTags");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTypeMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTypeMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("c74e5480-2b71-483c-8f4a-1a9c69c32603"),
+                            Description = "An identified problem that affects the performance, reliability, or standards of a product or service",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("d1f55eab-9898-4e46-9f03-b263e33e5d38"),
+                            Description = "A support service that assists users with technical issues, requests, or inquiries.",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("MailListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Recipient")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Schedule")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MailListId");
+
+                    b.ToTable("MailDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmailId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailingList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Keywords")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailingList");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ActivityName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("UnitOfMeasurement")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ActivityMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("ModuleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModuleId");
+
+                    b.ToTable("Features");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            Description = "Manage Project",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            Description = "Manage Infra",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            Description = "Manage Tasks",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Task Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            Description = "Manage Employee",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Employee Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            Description = "Attendance",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            Description = "Global Masters",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Global Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            Description = "Managing all directory related rights",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Directory Management"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Industry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Industries");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            Name = "Information Technology (IT) Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("0a63e657-2c5f-49b5-854b-42c978293154"),
+                            Name = "Manufacturing & Production"
+                        },
+                        new
+                        {
+                            Id = new Guid("bdc61e3b-69ea-4394-bab6-079ec135b5bd"),
+                            Name = "Energy & Resources"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ca200ac-00d7-415e-a410-b948e27ac9d2"),
+                            Name = "Finance & Professional Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("d5621700-cd87-441f-8cdb-6051ddfc83b4"),
+                            Name = "Hospitals and Healthcare Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("23608891-657e-40f0-bbd4-2b0a2ec1a76f"),
+                            Name = "Social Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("a493f4e3-16b1-4411-be3c-6bf2987a3168"),
+                            Name = "Retail & Consumer Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("e9d8ce92-9371-4ed9-9831-83c07f78edec"),
+                            Name = "Transportation & Logistics"
+                        },
+                        new
+                        {
+                            Id = new Guid("8a0d6134-2dbe-4e0a-b250-ff34cb7b9df0"),
+                            Name = "Education & Training"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Module", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Modules");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Description = "Project Module",
+                            Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02",
+                            Name = "Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Description = "Employee Module",
+                            Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637",
+                            Name = "Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Description = "Masters Module",
+                            Key = "504ec132-e6a9-422f-8f85-050602cfce05",
+                            Name = "Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("StatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            Status = "Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Status = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "On Hold",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
+                            Status = "Completed",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketPriorityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Level")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketPriorityMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("188d29b3-10f3-42d0-9587-1a46ae7a0320"),
+                            ColorCode = "008000",
+                            IsDefault = true,
+                            Level = 1,
+                            Name = "Low",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("0919bc84-9f82-4ecf-98c7-962755dd9a97"),
+                            ColorCode = "FFFF00",
+                            IsDefault = true,
+                            Level = 2,
+                            Name = "Medium",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 3,
+                            Name = "High",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 4,
+                            Name = "Critical",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("44a7b91d-a0dd-45d1-8616-4d2f71e16401"),
+                            ColorCode = "#FF0000",
+                            IsDefault = true,
+                            Level = 5,
+                            Name = "Urgent",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6b0c409b-3e80-4165-8b39-f3fcacb4c797"),
+                            ColorCode = "#FFCC99",
+                            Description = "This is a newly created issue.",
+                            IsDefault = true,
+                            Name = "New",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("6c5ac37d-5b7d-40f3-adec-2dabaa5cca86"),
+                            ColorCode = "#E6FF99",
+                            Description = "Assigned to employee or team of employees",
+                            IsDefault = true,
+                            Name = "Assigned",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("7f96bcd5-0c66-411b-8a1d-9d1a4785194e"),
+                            ColorCode = "#99E6FF",
+                            Description = "These issues are currently in progress",
+                            IsDefault = true,
+                            Name = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5c72b630-6923-4215-bf2c-b1622afd76e7"),
+                            ColorCode = "#6c757d",
+                            Description = "These issues are currently under review",
+                            IsDefault = true,
+                            Name = "In Review",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("8ff85685-a875-4f21-aa95-d99551315fcc"),
+                            ColorCode = "#B399FF",
+                            Description = "The following issues are resolved and closed",
+                            IsDefault = true,
+                            Name = "Done",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTagMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("ef6c2a65-f61d-4537-9650-a7ab7f8d98db"),
+                            ColorCode = "#e59866",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5a168569-8ad7-4422-8db6-51ef25caddeb"),
+                            ColorCode = "#85c1e9",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkCategoryMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("86bb2cc8-f6b5-4fdd-bbee-c389c713a44b"),
+                            Description = "Created new task in a professional or creative context",
+                            IsSystem = true,
+                            Name = "Fresh Work",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("9ebfa19c-53b9-481b-b863-c25d2f843201"),
+                            Description = "Revising, modifying, or correcting a task to improve its quality or fix issues",
+                            IsSystem = true,
+                            Name = "Rework",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("11a79929-1d07-42dc-9e98-82d0d2f4a240"),
+                            Description = "Any defect, deviation, or non-conformance in a task that fails to meet established standards or customer expectations.",
+                            IsSystem = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("030bb085-e230-4370-aec7-9a74d652864e"),
+                            Description = "Confirm the tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"),
+                            Description = "Not all tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Partially Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"),
+                            Description = "Tasks are not finished as reported or have any issues in al the tasks",
+                            IsSystem = true,
+                            Name = "NCR",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buildings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BuildingId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Floor");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProjectAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ShortName")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectStatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Projects");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("85bf587b-7ca9-4685-b77c-d817f5847e85"),
+                            ContactPerson = "Project 1 Contact Person",
+                            EndDate = new DateTime(2026, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            Name = "Project 1",
+                            ProjectAddress = "Project 1 Address",
+                            ProjectStatusId = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            StartDate = new DateTime(2025, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReAllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ProjectAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AreaName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FloorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FloorId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkAreas");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("CompletedWork")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("PlannedWork")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime>("TaskDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkAreaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActivityId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkAreaId");
+
+                    b.HasIndex("WorkCategoryId");
+
+                    b.ToTable("WorkItems");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ApplicationRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("JobRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Utilities.Inquiries", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("About")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrganizatioinName")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Inquiries");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("varchar(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator().HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("IsRootUser")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ApprovedBy")
+                        .WithMany()
+                        .HasForeignKey("ApprovedById");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("AssignedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ReportedBy")
+                        .WithMany()
+                        .HasForeignKey("ReportedById");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem")
+                        .WithMany()
+                        .HasForeignKey("WorkItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkStatusMaster", "WorkStatus")
+                        .WithMany()
+                        .HasForeignKey("WorkStatusId");
+
+                    b.Navigation("ApprovedBy");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("ReportedBy");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkItem");
+
+                    b.Navigation("WorkStatus");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("CommentedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Approver")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Approver");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.AttendanceModule.Attendance", "Attendance")
+                        .WithMany()
+                        .HasForeignKey("AttendanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.DocumentManager.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedByEmployee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy");
+
+                    b.Navigation("Attendance");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedByEmployee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedByID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.ContactCategoryMaster", "ContactCategory")
+                        .WithMany()
+                        .HasForeignKey("ContactCategoryId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ContactCategory");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Createdby")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Createdby");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.ContactTagMaster", "ContactTag")
+                        .WithMany()
+                        .HasForeignKey("ContactTagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("ContactTag");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationUser", "ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.HasOne("Marco.Pms.Model.Roles.JobRole", "JobRole")
+                        .WithMany()
+                        .HasForeignKey("JobRoleId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("JobRole");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Role");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Feature", "Feature")
+                        .WithMany("FeaturePermissions")
+                        .HasForeignKey("FeatureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feature");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.FeaturePermission", null)
+                        .WithMany()
+                        .HasForeignKey("FeaturePermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Industry", "Industry")
+                        .WithMany()
+                        .HasForeignKey("IndustryId");
+
+                    b.Navigation("Industry");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Forum.TicketComment", "TicketComment")
+                        .WithMany("Attachments")
+                        .HasForeignKey("CommentId");
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ticket");
+
+                    b.Navigation("TicketComment");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketPriorityMaster", "Priority")
+                        .WithMany()
+                        .HasForeignKey("PriorityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.TicketStatusMaster", "TicketStatusMaster")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketTypeMaster", "TicketTypeMaster")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Priority");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("TicketStatusMaster");
+
+                    b.Navigation("TicketTypeMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketTagMaster", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+
+                    b.Navigation("Ticket");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Mail.MailingList", "MailBody")
+                        .WithMany()
+                        .HasForeignKey("MailListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MailBody");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Module", "Module")
+                        .WithMany()
+                        .HasForeignKey("ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Building", "Building")
+                        .WithMany()
+                        .HasForeignKey("BuildingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Building");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.StatusMaster", "ProjectStatus")
+                        .WithMany()
+                        .HasForeignKey("ProjectStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProjectStatus");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .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("Employee");
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Floor", "Floor")
+                        .WithMany()
+                        .HasForeignKey("FloorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Floor");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.ActivityMaster", "ActivityMaster")
+                        .WithMany()
+                        .HasForeignKey("ActivityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea")
+                        .WithMany()
+                        .HasForeignKey("WorkAreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkCategoryMaster", "WorkCategoryMaster")
+                        .WithMany()
+                        .HasForeignKey("WorkCategoryId");
+
+                    b.Navigation("ActivityMaster");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkArea");
+
+                    b.Navigation("WorkCategoryMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Navigation("FeaturePermissions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.cs b/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.cs
new file mode 100644
index 0000000..c4a12fd
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.cs
@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class EnhancedWorkItemForParentId_Description : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Description",
+                table: "WorkItems",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ParentTaskId",
+                table: "WorkItems",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Description",
+                table: "WorkItems");
+
+            migrationBuilder.DropColumn(
+                name: "ParentTaskId",
+                table: "WorkItems");
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
index 4988121..1f93208 100644
--- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -2176,6 +2176,12 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<double>("CompletedWork")
                         .HasColumnType("double");
 
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
                     b.Property<double>("PlannedWork")
                         .HasColumnType("double");
 
diff --git a/Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs b/Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs
index c2fc990..e6ba436 100644
--- a/Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs
+++ b/Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs
@@ -11,5 +11,7 @@ namespace Marco.Pms.Model.Dtos.Project
         public Guid ActivityID { get; set; }
         public int PlannedWork { get; set; }
         public int CompletedWork { get; set; }
+        public Guid? ParentTaskId { get; set; }
+        public string? Comment { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Mapper/InfraMapper.cs b/Marco.Pms.Model/Mapper/InfraMapper.cs
index f6fec5b..4ccb7c8 100644
--- a/Marco.Pms.Model/Mapper/InfraMapper.cs
+++ b/Marco.Pms.Model/Mapper/InfraMapper.cs
@@ -59,7 +59,9 @@ namespace Marco.Pms.Model.Mapper
                 WorkCategoryId = model.WorkCategoryId,
                 TaskDate = DateTime.Now,
                 TenantId = tenantId,
-                WorkAreaId = model.WorkAreaID
+                WorkAreaId = model.WorkAreaID,
+                ParentTaskId = model.ParentTaskId,
+                Description = model.Comment
 
             };
         }
diff --git a/Marco.Pms.Model/Projects/WorkItem.cs b/Marco.Pms.Model/Projects/WorkItem.cs
index 150ffc2..9596dc3 100644
--- a/Marco.Pms.Model/Projects/WorkItem.cs
+++ b/Marco.Pms.Model/Projects/WorkItem.cs
@@ -20,11 +20,17 @@ namespace Marco.Pms.Model.Projects
         [ValidateNever]
         public ActivityMaster? ActivityMaster { get; set; }
 
+
         [ForeignKey("WorkCategoryId")]
         [ValidateNever]
         public WorkCategoryMaster? WorkCategoryMaster { get; set; }
+
+        public Guid? ParentTaskId { get; set; } 
+
         public double PlannedWork { get; set; }
         public double CompletedWork { get; set; }
+
+        public string? Description { get; set; } 
         public DateTime TaskDate { get; set; }
     }
 }
diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
index d34b0d3..d14e44c 100644
--- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs
+++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
@@ -903,11 +903,11 @@ namespace Marco.Pms.Services.Helpers
                 List<ContactNote> notes = new List<ContactNote>();
                 if (active)
                 {
-                    notes = await _context.ContactNotes.Where(n => n.ContactId == contact.Id && n.IsActive && n.TenantId == tenantId).ToListAsync();
+                    notes = await _context.ContactNotes.Include(n => n.Createdby).Where(n => n.ContactId == contact.Id && n.IsActive && n.TenantId == tenantId).ToListAsync();
                 }
                 else
                 {
-                    notes = await _context.ContactNotes.Where(n => n.ContactId == contact.Id && n.TenantId == tenantId).ToListAsync();
+                    notes = await _context.ContactNotes.Include(n => n.Createdby).Where(n => n.ContactId == contact.Id && n.TenantId == tenantId).ToListAsync();
                 }
                 var noteIds = notes.Select(n => n.Id).ToList();
                 List<DirectoryUpdateLog>? updateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.RefereanceId)).ToListAsync();
-- 
2.43.0


From 4164c7d761db99896d2b8337723ec2ae58d12044 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 18 Jun 2025 18:12:28 +0530
Subject: [PATCH 31/48] Cheange the message sending when manageing project
 infrastructure

---
 Marco.Pms.Services/Controllers/ProjectController.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index b120c04..9f1131e 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -620,7 +620,7 @@ namespace MarcoBMS.Services.Controllers
                         _context.WorkItems.Update(workItem);
                         await _context.SaveChangesAsync();
                         responseMessage = "Task Updated Successfully";
-                        message = $"Task Updated by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
+                        message = $"Task Updated in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
                     }
                     else
                     {
@@ -628,7 +628,7 @@ namespace MarcoBMS.Services.Controllers
                         _context.WorkItems.Add(workItem);
                         await _context.SaveChangesAsync();
                         responseMessage = "Task Added Successfully";
-                        message = $"Task Added by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
+                        message = $"Task Added in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
                     }
                     var result = new WorkItemVM
                     {
@@ -675,7 +675,7 @@ namespace MarcoBMS.Services.Controllers
 
                         projectIds.Add(floor?.Building?.ProjectId ?? Guid.Empty);
 
-                        var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectIds = projectIds, Message = $"Task Deleted by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}" };
+                        var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectIds = projectIds, Message = $"Task Deleted in Building: {floor?.Building?.Name}, on Floor: {floor?.FloorName}, in Area: {task.WorkArea?.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}" };
                         await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
                     }
                     else
@@ -766,6 +766,7 @@ namespace MarcoBMS.Services.Controllers
                         }
                         Building? building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == floor.BuildingId);
                         projectIds.Add(building?.ProjectId ?? Guid.Empty);
+                        message = $"{message} in Building: {building?.Name}";
                     }
                     if (item.WorkArea != null)
                     {
@@ -792,6 +793,7 @@ namespace MarcoBMS.Services.Controllers
                         }
                         Floor? floor = await _context.Floor.Include(f => f.Building).FirstOrDefaultAsync(f => f.Id == workArea.FloorId);
                         projectIds.Add(floor?.Building?.ProjectId ?? Guid.Empty);
+                        message = $"{message} in Building: {floor?.Building?.Name}, on Floor: {floor?.FloorName}";
                     }
                 }
                 message = $"{message} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
-- 
2.43.0


From aa2bc674eb66d0d480a3c47c2d076a106c27d6b3 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 18 Jun 2025 19:08:06 +0530
Subject: [PATCH 32/48] Optimized the task management API

---
 .../Controllers/ProjectController.cs          | 97 +++++++++++--------
 1 file changed, 58 insertions(+), 39 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 18a790b..9f6d083 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -13,7 +13,6 @@ using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
 
 namespace MarcoBMS.Services.Controllers
 {
@@ -59,9 +58,9 @@ namespace MarcoBMS.Services.Controllers
                 return Unauthorized(ApiResponse<object>.ErrorResponse("Employee not found.", null, 401));
             }
 
-           
-            List<Project> projects =  await _projectsHelper.GetMyProjects(tenantId, LoggedInEmployee);
-            
+
+            List<Project> projects = await _projectsHelper.GetMyProjects(tenantId, LoggedInEmployee);
+
 
             // 4. Project projection to ProjectInfoVM
             // This part is already quite efficient.
@@ -84,7 +83,7 @@ namespace MarcoBMS.Services.Controllers
             return Ok(ApiResponse<object>.SuccessResponse(response, "Success.", 200));
         }
 
-     
+
 
         [HttpGet("list")]
         public async Task<IActionResult> GetAll()
@@ -573,45 +572,65 @@ namespace MarcoBMS.Services.Controllers
         }
 
         [HttpPost("task")]
-        public async Task<IActionResult> CreateProjectTask(List<WorkItemDot> workItemDot)
+        public async Task<IActionResult> CreateProjectTask(List<WorkItemDot> workItemDtos)
         {
-            Guid tenantId = GetTenantId();
-            List<WorkItemVM> workItems = new List<WorkItemVM> { };
-            string responseMessage = "";
-            if (workItemDot != null)
-            {
-                foreach (var item in workItemDot)
-                {
-                    WorkItem workItem = item.ToWorkItemFromWorkItemDto(tenantId);
+            _logger.LogInfo("CreateProjectTask called with {Count} items", workItemDtos?.Count ?? 0);
 
-                    if (item.Id != null)
-                    {
-                        //update
-                        _context.WorkItems.Update(workItem);
-                        await _context.SaveChangesAsync();
-                        responseMessage = "Task Added Successfully";
-                    }
-                    else
-                    {
-                        //create
-                        _context.WorkItems.Add(workItem);
-                        await _context.SaveChangesAsync();
-                        responseMessage = "Task Updated Successfully";
-                    }
-                    var result = new WorkItemVM
-                    {
-                        WorkItemId = workItem.Id,
-                        WorkItem = workItem
-                    };
-                    workItems.Add(result);
-                }
-                var activity = await _context.ActivityMasters.ToListAsync();
-                var category = await _context.WorkCategoryMasters.ToListAsync();
-                return Ok(ApiResponse<object>.SuccessResponse(workItems, responseMessage, 200));
+            // Validate request
+            if (workItemDtos == null || !workItemDtos.Any())
+            {
+                _logger.LogWarning("No work items provided in the request.");
+                return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Work Item details are not valid.", 400));
             }
 
-            return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Work Item Details are not valid.", 400));
+            Guid tenantId = GetTenantId();
+            var workItemsToCreate = new List<WorkItem>();
+            var workItemsToUpdate = new List<WorkItem>();
+            var responseList = new List<WorkItemVM>();
 
+            foreach (var itemDto in workItemDtos)
+            {
+                var workItem = itemDto.ToWorkItemFromWorkItemDto(tenantId);
+
+                if (itemDto.Id != null && itemDto.Id != Guid.Empty)
+                {
+                    // Update existing
+                    workItemsToUpdate.Add(workItem);
+                }
+                else
+                {
+                    // Create new
+                    workItem.Id = Guid.NewGuid();
+                    workItemsToCreate.Add(workItem);
+                }
+
+                responseList.Add(new WorkItemVM
+                {
+                    WorkItemId = workItem.Id,
+                    WorkItem = workItem
+                });
+            }
+
+            // Apply DB changes
+            if (workItemsToCreate.Any())
+            {
+                _logger.LogInfo("Adding {Count} new work items", workItemsToCreate.Count);
+                await _context.WorkItems.AddRangeAsync(workItemsToCreate);
+            }
+
+            if (workItemsToUpdate.Any())
+            {
+                _logger.LogInfo("Updating {Count} existing work items", workItemsToUpdate.Count);
+                _context.WorkItems.UpdateRange(workItemsToUpdate);
+            }
+
+            await _context.SaveChangesAsync();
+
+            _logger.LogInfo("CreateProjectTask completed successfully. Created: {Created}, Updated: {Updated}", workItemsToCreate.Count, workItemsToUpdate.Count);
+
+            string responseMessage = $"{(workItemsToCreate.Any() ? "Task(s) created" : "")}{(workItemsToUpdate.Any() ? (workItemsToCreate.Any() ? " and " : "") + "updated" : "")} successfully.";
+
+            return Ok(ApiResponse<object>.SuccessResponse(responseList, responseMessage, 200));
         }
 
         [HttpDelete("task/{id}")]
-- 
2.43.0


From 3dfde6d9a53a412ecd58bf512fe66c9ee4467cba Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 19 Jun 2025 11:43:10 +0530
Subject: [PATCH 33/48] Added new entry in status master table

---
 .../Data/ApplicationDbContext.cs              |    9 +-
 ..._New_Status_Master_In_Progress.Designer.cs | 3275 +++++++++++++++++
 ...620_Added_New_Status_Master_In_Progress.cs |   57 +
 .../ApplicationDbContextModelSnapshot.cs      |   10 +-
 4 files changed, 3347 insertions(+), 4 deletions(-)
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250619060620_Added_New_Status_Master_In_Progress.Designer.cs
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250619060620_Added_New_Status_Master_In_Progress.cs

diff --git a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
index 04cfe61..a168483 100644
--- a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
+++ b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
@@ -161,14 +161,19 @@ namespace Marco.Pms.DataAccess.Data
                 },
                  new StatusMaster
                  {
-                     Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                     Id = new Guid("cdad86aa-8a56-4ff4-b633-9c629057dfef"),
                      Status = "In Progress",
                      TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                 }, new StatusMaster
+                 {
+                     Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                     Status = "On Hold",
+                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                  },
                   new StatusMaster
                   {
                       Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
-                      Status = "On Hold",
+                      Status = "In Active",
                       TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                   },
                    new StatusMaster
diff --git a/Marco.Pms.DataAccess/Migrations/20250619060620_Added_New_Status_Master_In_Progress.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250619060620_Added_New_Status_Master_In_Progress.Designer.cs
new file mode 100644
index 0000000..08ee943
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250619060620_Added_New_Status_Master_In_Progress.Designer.cs
@@ -0,0 +1,3275 @@
+// <auto-generated />
+using System;
+using Marco.Pms.DataAccess.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250619060620_Added_New_Status_Master_In_Progress")]
+    partial class Added_New_Status_Master_In_Progress
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            //MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AssignedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AssignmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("CompletedTask")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("PlannedTask")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime?>("ReportedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkItemId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssignedBy");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkItemId");
+
+                    b.ToTable("TaskAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ReferenceId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CommentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CommentedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentedBy");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskMembers");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ApprovedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AttendanceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("InTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("OutTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ProjectID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Attendes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ActivityTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AttendanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Latitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Longitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("UpdatedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdatedOn")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AttendanceId");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("AttendanceLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MPIN")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MPINToken")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("MPINDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("ExpriesInSec")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OTP")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("OTPDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedByID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedByID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buckets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ContactCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Organization")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactCategoryId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Contacts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactCategoryMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EmailAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactsEmails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactNotes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    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")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactTagId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("ContactTagId");
+
+                    b.ToTable("ContactTagMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactTagMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("RefereanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdateAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("DirectoryUpdateLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("EmployeeBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Base64Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("BatchId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("S3Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ThumbS3Key")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UploadedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AadharNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CurrentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyPhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("JoiningDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MiddleName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PanNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PermanentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.HasIndex("JobRoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("RoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("EmployeeRoleMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeOnly>("EndTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkShifts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsMandatory")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityCheckLists");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("CheckListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FeatureId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeatureId");
+
+                    b.ToTable("FeaturePermissions");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"),
+                            Description = "Access all information related to the project.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "View Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"),
+                            Description = "Potentially edit the project name, description, start/end dates, or status.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"),
+                            Description = "The \"Manage Team\" feature allows authorized users to organize project personnel by adding, removing, and assigning employee to projects.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Team"
+                        },
+                        new
+                        {
+                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "View Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure.",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "Manage Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"),
+                            Description = "Grants a user comprehensive read-only access to all details associated with tasks within a project. This includes task descriptions, statuses, assignees, due dates, dependencies, progress, history, and any related attachments or discussions.",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "View Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("08752f33-3b29-4816-b76b-ea8a968ed3c5"),
+                            Description = "This allows them to create new tasks, modify existing task attributes (description, status, assignee, due date, etc.),",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2"),
+                            Description = "Grants a user the ability to designate team members responsible for specific tasks and to update the completion status or provide progress updates for those tasks",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Assign/Report Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"),
+                            Description = "Grants a user the authority to officially confirm the completion or acceptance of a task, often signifying that it meets the required standards or criteria",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Approve Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                            Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"),
+                            Description = "Grants a user the authority to create new employee profiles and modify existing employee details within the system. This typically includes adding or updating information such as names, contact details, roles, departments, skills, and potentially other personal or professional data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"),
+                            Description = "Grants a user the authority to manage employee application roles, enabling them to assign or revoke access privileges within the system.",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Assign Roles"
+                        },
+                        new
+                        {
+                            Id = new Guid("915e6bff-65f6-4e3f-aea8-3fd217d3ea9e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Team Attendance "
+                        },
+                        new
+                        {
+                            Id = new Guid("57802c4a-00aa-4a1f-a048-fd2f70dd44b6"),
+                            Description = "Grants a user the authority to approve requests from employees to adjust or correct their recorded attendance. This typically involves reviewing the reason for the regularization, verifying any supporting documentation, and then officially accepting the changes to the employee's attendance records",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Regularize Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("ccb0589f-712b-43de-92ed-5b6088e7dc4e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Self Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"),
+                            Description = "Grants a user read-only access to foundational or reference data within the system. \"Masters\" typically refer to predefined lists, categories, or templates that are used throughout the application to standardize information and maintain consistency",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("588a8824-f924-4955-82d8-fc51956cf323"),
+                            Description = "Grants a user the authority to create, modify, and delete foundational or reference data within the system. These \"masters\" are typically the core lists, categories, and configurations that other data and functionalities rely upon, such as departments, job titles, product categories",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("4286a13b-bb40-4879-8c6d-18e9e393beda"),
+                            Description = "Full control over all directories, including the ability to manage permissions for all directories in the system.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Admin"
+                        },
+                        new
+                        {
+                            Id = new Guid("62668630-13ce-4f52-a0f0-db38af2230c5"),
+                            Description = "Full control over directories they created or have been assigned. Can also manage permissions for those directories.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Manager"
+                        },
+                        new
+                        {
+                            Id = new Guid("0f919170-92d4-4337-abd3-49b66fc871bb"),
+                            Description = "Full control over directories they created. Can view contacts in directories they either created or were assigned to. Can manage permissions only for directories they created.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory User"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.Property<Guid>("ApplicationRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FeaturePermissionId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("ApplicationRoleId", "FeaturePermissionId");
+
+                    b.HasIndex("FeaturePermissionId");
+
+                    b.ToTable("RolePermissionMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DomainName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OnBoardingDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IndustryId");
+
+                    b.ToTable("Tenants");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b3466e83-7e11-464c-b93a-daf047838b26"),
+                            ContactName = "Admin",
+                            ContactNumber = "123456789",
+                            Description = "",
+                            DomainName = "www.marcobms.org",
+                            IndustryId = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            IsActive = true,
+                            Name = "MarcoBMS",
+                            OnBoardingDate = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            OragnizationSize = "100-200"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("CommentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MessageText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentMessageId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("SentAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TicketComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("LinkedActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("LinkedProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("PriorityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("StatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PriorityId");
+
+                    b.HasIndex("StatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("Tickets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketTags");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTypeMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTypeMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("c74e5480-2b71-483c-8f4a-1a9c69c32603"),
+                            Description = "An identified problem that affects the performance, reliability, or standards of a product or service",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("d1f55eab-9898-4e46-9f03-b263e33e5d38"),
+                            Description = "A support service that assists users with technical issues, requests, or inquiries.",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("MailListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Recipient")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Schedule")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MailListId");
+
+                    b.ToTable("MailDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmailId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailingList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Keywords")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailingList");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ActivityName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("UnitOfMeasurement")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ActivityMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("ModuleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModuleId");
+
+                    b.ToTable("Features");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            Description = "Manage Project",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            Description = "Manage Infra",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            Description = "Manage Tasks",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Task Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            Description = "Manage Employee",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Employee Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            Description = "Attendance",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            Description = "Global Masters",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Global Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            Description = "Managing all directory related rights",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Directory Management"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Industry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Industries");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            Name = "Information Technology (IT) Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("0a63e657-2c5f-49b5-854b-42c978293154"),
+                            Name = "Manufacturing & Production"
+                        },
+                        new
+                        {
+                            Id = new Guid("bdc61e3b-69ea-4394-bab6-079ec135b5bd"),
+                            Name = "Energy & Resources"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ca200ac-00d7-415e-a410-b948e27ac9d2"),
+                            Name = "Finance & Professional Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("d5621700-cd87-441f-8cdb-6051ddfc83b4"),
+                            Name = "Hospitals and Healthcare Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("23608891-657e-40f0-bbd4-2b0a2ec1a76f"),
+                            Name = "Social Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("a493f4e3-16b1-4411-be3c-6bf2987a3168"),
+                            Name = "Retail & Consumer Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("e9d8ce92-9371-4ed9-9831-83c07f78edec"),
+                            Name = "Transportation & Logistics"
+                        },
+                        new
+                        {
+                            Id = new Guid("8a0d6134-2dbe-4e0a-b250-ff34cb7b9df0"),
+                            Name = "Education & Training"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Module", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Modules");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Description = "Project Module",
+                            Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02",
+                            Name = "Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Description = "Employee Module",
+                            Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637",
+                            Name = "Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Description = "Masters Module",
+                            Key = "504ec132-e6a9-422f-8f85-050602cfce05",
+                            Name = "Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("StatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            Status = "Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("cdad86aa-8a56-4ff4-b633-9c629057dfef"),
+                            Status = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Status = "On Hold",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "In Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
+                            Status = "Completed",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketPriorityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Level")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketPriorityMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("188d29b3-10f3-42d0-9587-1a46ae7a0320"),
+                            ColorCode = "008000",
+                            IsDefault = true,
+                            Level = 1,
+                            Name = "Low",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("0919bc84-9f82-4ecf-98c7-962755dd9a97"),
+                            ColorCode = "FFFF00",
+                            IsDefault = true,
+                            Level = 2,
+                            Name = "Medium",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 3,
+                            Name = "High",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 4,
+                            Name = "Critical",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("44a7b91d-a0dd-45d1-8616-4d2f71e16401"),
+                            ColorCode = "#FF0000",
+                            IsDefault = true,
+                            Level = 5,
+                            Name = "Urgent",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6b0c409b-3e80-4165-8b39-f3fcacb4c797"),
+                            ColorCode = "#FFCC99",
+                            Description = "This is a newly created issue.",
+                            IsDefault = true,
+                            Name = "New",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("6c5ac37d-5b7d-40f3-adec-2dabaa5cca86"),
+                            ColorCode = "#E6FF99",
+                            Description = "Assigned to employee or team of employees",
+                            IsDefault = true,
+                            Name = "Assigned",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("7f96bcd5-0c66-411b-8a1d-9d1a4785194e"),
+                            ColorCode = "#99E6FF",
+                            Description = "These issues are currently in progress",
+                            IsDefault = true,
+                            Name = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5c72b630-6923-4215-bf2c-b1622afd76e7"),
+                            ColorCode = "#6c757d",
+                            Description = "These issues are currently under review",
+                            IsDefault = true,
+                            Name = "In Review",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("8ff85685-a875-4f21-aa95-d99551315fcc"),
+                            ColorCode = "#B399FF",
+                            Description = "The following issues are resolved and closed",
+                            IsDefault = true,
+                            Name = "Done",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTagMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("ef6c2a65-f61d-4537-9650-a7ab7f8d98db"),
+                            ColorCode = "#e59866",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5a168569-8ad7-4422-8db6-51ef25caddeb"),
+                            ColorCode = "#85c1e9",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkCategoryMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("86bb2cc8-f6b5-4fdd-bbee-c389c713a44b"),
+                            Description = "Created new task in a professional or creative context",
+                            IsSystem = true,
+                            Name = "Fresh Work",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("9ebfa19c-53b9-481b-b863-c25d2f843201"),
+                            Description = "Revising, modifying, or correcting a task to improve its quality or fix issues",
+                            IsSystem = true,
+                            Name = "Rework",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("11a79929-1d07-42dc-9e98-82d0d2f4a240"),
+                            Description = "Any defect, deviation, or non-conformance in a task that fails to meet established standards or customer expectations.",
+                            IsSystem = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buildings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BuildingId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Floor");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProjectAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ShortName")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectStatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Projects");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("85bf587b-7ca9-4685-b77c-d817f5847e85"),
+                            ContactPerson = "Project 1 Contact Person",
+                            EndDate = new DateTime(2026, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            Name = "Project 1",
+                            ProjectAddress = "Project 1 Address",
+                            ProjectStatusId = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            StartDate = new DateTime(2025, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReAllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ProjectAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AreaName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FloorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FloorId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkAreas");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("CompletedWork")
+                        .HasColumnType("double");
+
+                    b.Property<double>("PlannedWork")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime>("TaskDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkAreaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActivityId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkAreaId");
+
+                    b.HasIndex("WorkCategoryId");
+
+                    b.ToTable("WorkItems");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ApplicationRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("JobRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Utilities.Inquiries", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("About")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrganizatioinName")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Inquiries");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("varchar(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator().HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("IsRootUser")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("AssignedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem")
+                        .WithMany()
+                        .HasForeignKey("WorkItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkItem");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("CommentedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Approver")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Approver");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.AttendanceModule.Attendance", "Attendance")
+                        .WithMany()
+                        .HasForeignKey("AttendanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.DocumentManager.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedByEmployee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy");
+
+                    b.Navigation("Attendance");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedByEmployee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedByID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.ContactCategoryMaster", "ContactCategory")
+                        .WithMany()
+                        .HasForeignKey("ContactCategoryId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ContactCategory");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Createdby")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Createdby");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.ContactTagMaster", "ContactTag")
+                        .WithMany()
+                        .HasForeignKey("ContactTagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("ContactTag");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationUser", "ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.HasOne("Marco.Pms.Model.Roles.JobRole", "JobRole")
+                        .WithMany()
+                        .HasForeignKey("JobRoleId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("JobRole");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Role");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Feature", "Feature")
+                        .WithMany("FeaturePermissions")
+                        .HasForeignKey("FeatureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feature");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.FeaturePermission", null)
+                        .WithMany()
+                        .HasForeignKey("FeaturePermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Industry", "Industry")
+                        .WithMany()
+                        .HasForeignKey("IndustryId");
+
+                    b.Navigation("Industry");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Forum.TicketComment", "TicketComment")
+                        .WithMany("Attachments")
+                        .HasForeignKey("CommentId");
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ticket");
+
+                    b.Navigation("TicketComment");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketPriorityMaster", "Priority")
+                        .WithMany()
+                        .HasForeignKey("PriorityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.TicketStatusMaster", "TicketStatusMaster")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketTypeMaster", "TicketTypeMaster")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Priority");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("TicketStatusMaster");
+
+                    b.Navigation("TicketTypeMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketTagMaster", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+
+                    b.Navigation("Ticket");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Mail.MailingList", "MailBody")
+                        .WithMany()
+                        .HasForeignKey("MailListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MailBody");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Module", "Module")
+                        .WithMany()
+                        .HasForeignKey("ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Building", "Building")
+                        .WithMany()
+                        .HasForeignKey("BuildingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Building");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.StatusMaster", "ProjectStatus")
+                        .WithMany()
+                        .HasForeignKey("ProjectStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProjectStatus");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .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("Employee");
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Floor", "Floor")
+                        .WithMany()
+                        .HasForeignKey("FloorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Floor");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.ActivityMaster", "ActivityMaster")
+                        .WithMany()
+                        .HasForeignKey("ActivityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea")
+                        .WithMany()
+                        .HasForeignKey("WorkAreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkCategoryMaster", "WorkCategoryMaster")
+                        .WithMany()
+                        .HasForeignKey("WorkCategoryId");
+
+                    b.Navigation("ActivityMaster");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkArea");
+
+                    b.Navigation("WorkCategoryMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Navigation("FeaturePermissions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/20250619060620_Added_New_Status_Master_In_Progress.cs b/Marco.Pms.DataAccess/Migrations/20250619060620_Added_New_Status_Master_In_Progress.cs
new file mode 100644
index 0000000..39aecd6
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250619060620_Added_New_Status_Master_In_Progress.cs
@@ -0,0 +1,57 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_New_Status_Master_In_Progress : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.UpdateData(
+                table: "StatusMasters",
+                keyColumn: "Id",
+                keyValue: new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                column: "Status",
+                value: "On Hold");
+
+            migrationBuilder.UpdateData(
+                table: "StatusMasters",
+                keyColumn: "Id",
+                keyValue: new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                column: "Status",
+                value: "In Active");
+
+            migrationBuilder.InsertData(
+                table: "StatusMasters",
+                columns: new[] { "Id", "Status", "TenantId" },
+                values: new object[] { new Guid("cdad86aa-8a56-4ff4-b633-9c629057dfef"), "In Progress", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "StatusMasters",
+                keyColumn: "Id",
+                keyValue: new Guid("cdad86aa-8a56-4ff4-b633-9c629057dfef"));
+
+            migrationBuilder.UpdateData(
+                table: "StatusMasters",
+                keyColumn: "Id",
+                keyValue: new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                column: "Status",
+                value: "In Progress");
+
+            migrationBuilder.UpdateData(
+                table: "StatusMasters",
+                keyColumn: "Id",
+                keyValue: new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                column: "Status",
+                value: "On Hold");
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
index 245470a..187d2a6 100644
--- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -1659,17 +1659,23 @@ namespace Marco.Pms.DataAccess.Migrations
                         },
                         new
                         {
-                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Id = new Guid("cdad86aa-8a56-4ff4-b633-9c629057dfef"),
                             Status = "In Progress",
                             TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
                         },
                         new
                         {
-                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
                             Status = "On Hold",
                             TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
                         },
                         new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "In Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
                         {
                             Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
                             Status = "Completed",
-- 
2.43.0


From 5d5579882f3c4715bb67321c68c9f31fb7edfda1 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 16 Jun 2025 15:57:04 +0530
Subject: [PATCH 34/48] Added Functionality for approving the reported task

---
 .../Data/ApplicationDbContext.cs              |   27 +
 ...ved_By_In_TaskAllocation_Table.Designer.cs | 3375 +++++++++++++++++
 ...ded_Apporved_By_In_TaskAllocation_Table.cs |  188 +
 .../ApplicationDbContextModelSnapshot.cs      |  106 +
 Marco.Pms.Model/Activities/TaskAllocation.cs  |   31 +-
 .../Activities/WorkStatusMaster.cs            |   12 +
 .../Dtos/Activities/ApproveTaskDto.cs         |   13 +
 .../Dtos/Activities/AssignTaskDto.cs          |    1 +
 .../Dtos/Activities/ReportTaskDto.cs          |    1 +
 Marco.Pms.Model/Mapper/ActivitiesMapper.cs    |   22 +-
 .../ViewModels/Activities/ListTaskVM.cs       |    9 +-
 .../ViewModels/Activities/TaskVM.cs           |   15 +-
 .../Controllers/TaskController.cs             |  825 ++--
 13 files changed, 4355 insertions(+), 270 deletions(-)
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.Designer.cs
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.cs
 create mode 100644 Marco.Pms.Model/Activities/WorkStatusMaster.cs
 create mode 100644 Marco.Pms.Model/Dtos/Activities/ApproveTaskDto.cs

diff --git a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
index a168483..66e9f51 100644
--- a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
+++ b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs
@@ -69,6 +69,7 @@ namespace Marco.Pms.DataAccess.Data
         public DbSet<Document> Documents { get; set; }
         public DbSet<TicketTag> TicketTags { get; set; }
         public DbSet<WorkCategoryMaster> WorkCategoryMasters { get; set; }
+        public DbSet<WorkStatusMaster> WorkStatusMasters { get; set; }
         public DbSet<Contact> Contacts { get; set; }
         public DbSet<ContactCategoryMaster> ContactCategoryMasters { get; set; }
         public DbSet<ContactEmail> ContactsEmails { get; set; }
@@ -434,6 +435,32 @@ namespace Marco.Pms.DataAccess.Data
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
                 }
                 );
+            modelBuilder.Entity<WorkStatusMaster>().HasData(
+                new WorkStatusMaster
+                {
+                    Id = new Guid("030bb085-e230-4370-aec7-9a74d652864e"),
+                    Name = "Approve",
+                    Description = "Confirm the tasks are actually finished as reported",
+                    IsSystem = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                },
+                new WorkStatusMaster
+                {
+                    Id = new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"),
+                    Name = "Partially Approve",
+                    Description = "Not all tasks are actually finished as reported",
+                    IsSystem = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                },
+                new WorkStatusMaster
+                {
+                    Id = new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"),
+                    Name = "NCR",
+                    Description = "Tasks are not finished as reported or have any issues in al the tasks",
+                    IsSystem = true,
+                    TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
+                }
+                );
 
         }
 
diff --git a/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.Designer.cs
new file mode 100644
index 0000000..a00f9f1
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.Designer.cs
@@ -0,0 +1,3375 @@
+// <auto-generated />
+using System;
+using Marco.Pms.DataAccess.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250616064217_Added_Apporved_By_In_TaskAllocation_Table")]
+    partial class Added_Apporved_By_In_TaskAllocation_Table
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            //MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("ApprovedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ApprovedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AssignedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AssignmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("CompletedTask")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("PlannedTask")
+                        .HasColumnType("double");
+
+                    b.Property<Guid?>("ReportedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReportedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("ReportedTask")
+                        .HasColumnType("double");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkItemId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApprovedById");
+
+                    b.HasIndex("AssignedBy");
+
+                    b.HasIndex("ReportedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkItemId");
+
+                    b.HasIndex("WorkStatusId");
+
+                    b.ToTable("TaskAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ReferenceId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CommentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CommentedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentedBy");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskMembers");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ApprovedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AttendanceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("InTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("OutTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ProjectID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Attendes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ActivityTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AttendanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Latitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Longitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("UpdatedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdatedOn")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AttendanceId");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("AttendanceLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MPIN")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MPINToken")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("MPINDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("ExpriesInSec")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OTP")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("OTPDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedByID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedByID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buckets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ContactCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Organization")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactCategoryId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Contacts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactCategoryMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EmailAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactsEmails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactNotes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    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")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactTagId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("ContactTagId");
+
+                    b.ToTable("ContactTagMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactTagMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("RefereanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdateAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("DirectoryUpdateLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("EmployeeBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Base64Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("BatchId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("S3Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ThumbS3Key")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UploadedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AadharNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CurrentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyPhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("JoiningDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MiddleName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PanNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PermanentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.HasIndex("JobRoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("RoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("EmployeeRoleMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeOnly>("EndTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkShifts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsMandatory")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityCheckLists");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("CheckListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FeatureId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeatureId");
+
+                    b.ToTable("FeaturePermissions");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"),
+                            Description = "Access all information related to the project.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "View Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"),
+                            Description = "Potentially edit the project name, description, start/end dates, or status.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"),
+                            Description = "The \"Manage Team\" feature allows authorized users to organize project personnel by adding, removing, and assigning employee to projects.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Team"
+                        },
+                        new
+                        {
+                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "View Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure.",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "Manage Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"),
+                            Description = "Grants a user comprehensive read-only access to all details associated with tasks within a project. This includes task descriptions, statuses, assignees, due dates, dependencies, progress, history, and any related attachments or discussions.",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "View Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("08752f33-3b29-4816-b76b-ea8a968ed3c5"),
+                            Description = "This allows them to create new tasks, modify existing task attributes (description, status, assignee, due date, etc.),",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2"),
+                            Description = "Grants a user the ability to designate team members responsible for specific tasks and to update the completion status or provide progress updates for those tasks",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Assign/Report Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"),
+                            Description = "Grants a user the authority to officially confirm the completion or acceptance of a task, often signifying that it meets the required standards or criteria",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Approve Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                            Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"),
+                            Description = "Grants a user the authority to create new employee profiles and modify existing employee details within the system. This typically includes adding or updating information such as names, contact details, roles, departments, skills, and potentially other personal or professional data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"),
+                            Description = "Grants a user the authority to manage employee application roles, enabling them to assign or revoke access privileges within the system.",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Assign Roles"
+                        },
+                        new
+                        {
+                            Id = new Guid("915e6bff-65f6-4e3f-aea8-3fd217d3ea9e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Team Attendance "
+                        },
+                        new
+                        {
+                            Id = new Guid("57802c4a-00aa-4a1f-a048-fd2f70dd44b6"),
+                            Description = "Grants a user the authority to approve requests from employees to adjust or correct their recorded attendance. This typically involves reviewing the reason for the regularization, verifying any supporting documentation, and then officially accepting the changes to the employee's attendance records",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Regularize Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("ccb0589f-712b-43de-92ed-5b6088e7dc4e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Self Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"),
+                            Description = "Grants a user read-only access to foundational or reference data within the system. \"Masters\" typically refer to predefined lists, categories, or templates that are used throughout the application to standardize information and maintain consistency",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("588a8824-f924-4955-82d8-fc51956cf323"),
+                            Description = "Grants a user the authority to create, modify, and delete foundational or reference data within the system. These \"masters\" are typically the core lists, categories, and configurations that other data and functionalities rely upon, such as departments, job titles, product categories",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("4286a13b-bb40-4879-8c6d-18e9e393beda"),
+                            Description = "Full control over all directories, including the ability to manage permissions for all directories in the system.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Admin"
+                        },
+                        new
+                        {
+                            Id = new Guid("62668630-13ce-4f52-a0f0-db38af2230c5"),
+                            Description = "Full control over directories they created or have been assigned. Can also manage permissions for those directories.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Manager"
+                        },
+                        new
+                        {
+                            Id = new Guid("0f919170-92d4-4337-abd3-49b66fc871bb"),
+                            Description = "Full control over directories they created. Can view contacts in directories they either created or were assigned to. Can manage permissions only for directories they created.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory User"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.Property<Guid>("ApplicationRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FeaturePermissionId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("ApplicationRoleId", "FeaturePermissionId");
+
+                    b.HasIndex("FeaturePermissionId");
+
+                    b.ToTable("RolePermissionMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DomainName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OnBoardingDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IndustryId");
+
+                    b.ToTable("Tenants");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b3466e83-7e11-464c-b93a-daf047838b26"),
+                            ContactName = "Admin",
+                            ContactNumber = "123456789",
+                            Description = "",
+                            DomainName = "www.marcobms.org",
+                            IndustryId = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            IsActive = true,
+                            Name = "MarcoBMS",
+                            OnBoardingDate = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            OragnizationSize = "100-200"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("CommentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MessageText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentMessageId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("SentAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TicketComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("LinkedActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("LinkedProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("PriorityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("StatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PriorityId");
+
+                    b.HasIndex("StatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("Tickets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketTags");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTypeMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTypeMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("c74e5480-2b71-483c-8f4a-1a9c69c32603"),
+                            Description = "An identified problem that affects the performance, reliability, or standards of a product or service",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("d1f55eab-9898-4e46-9f03-b263e33e5d38"),
+                            Description = "A support service that assists users with technical issues, requests, or inquiries.",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("MailListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Recipient")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Schedule")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MailListId");
+
+                    b.ToTable("MailDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmailId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailingList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Keywords")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailingList");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ActivityName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("UnitOfMeasurement")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ActivityMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("ModuleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModuleId");
+
+                    b.ToTable("Features");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            Description = "Manage Project",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            Description = "Manage Infra",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            Description = "Manage Tasks",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Task Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            Description = "Manage Employee",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Employee Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            Description = "Attendance",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            Description = "Global Masters",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Global Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            Description = "Managing all directory related rights",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Directory Management"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Industry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Industries");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            Name = "Information Technology (IT) Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("0a63e657-2c5f-49b5-854b-42c978293154"),
+                            Name = "Manufacturing & Production"
+                        },
+                        new
+                        {
+                            Id = new Guid("bdc61e3b-69ea-4394-bab6-079ec135b5bd"),
+                            Name = "Energy & Resources"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ca200ac-00d7-415e-a410-b948e27ac9d2"),
+                            Name = "Finance & Professional Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("d5621700-cd87-441f-8cdb-6051ddfc83b4"),
+                            Name = "Hospitals and Healthcare Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("23608891-657e-40f0-bbd4-2b0a2ec1a76f"),
+                            Name = "Social Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("a493f4e3-16b1-4411-be3c-6bf2987a3168"),
+                            Name = "Retail & Consumer Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("e9d8ce92-9371-4ed9-9831-83c07f78edec"),
+                            Name = "Transportation & Logistics"
+                        },
+                        new
+                        {
+                            Id = new Guid("8a0d6134-2dbe-4e0a-b250-ff34cb7b9df0"),
+                            Name = "Education & Training"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Module", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Modules");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Description = "Project Module",
+                            Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02",
+                            Name = "Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Description = "Employee Module",
+                            Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637",
+                            Name = "Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Description = "Masters Module",
+                            Key = "504ec132-e6a9-422f-8f85-050602cfce05",
+                            Name = "Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("StatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            Status = "Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Status = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "On Hold",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
+                            Status = "Completed",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketPriorityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Level")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketPriorityMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("188d29b3-10f3-42d0-9587-1a46ae7a0320"),
+                            ColorCode = "008000",
+                            IsDefault = true,
+                            Level = 1,
+                            Name = "Low",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("0919bc84-9f82-4ecf-98c7-962755dd9a97"),
+                            ColorCode = "FFFF00",
+                            IsDefault = true,
+                            Level = 2,
+                            Name = "Medium",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 3,
+                            Name = "High",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 4,
+                            Name = "Critical",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("44a7b91d-a0dd-45d1-8616-4d2f71e16401"),
+                            ColorCode = "#FF0000",
+                            IsDefault = true,
+                            Level = 5,
+                            Name = "Urgent",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6b0c409b-3e80-4165-8b39-f3fcacb4c797"),
+                            ColorCode = "#FFCC99",
+                            Description = "This is a newly created issue.",
+                            IsDefault = true,
+                            Name = "New",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("6c5ac37d-5b7d-40f3-adec-2dabaa5cca86"),
+                            ColorCode = "#E6FF99",
+                            Description = "Assigned to employee or team of employees",
+                            IsDefault = true,
+                            Name = "Assigned",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("7f96bcd5-0c66-411b-8a1d-9d1a4785194e"),
+                            ColorCode = "#99E6FF",
+                            Description = "These issues are currently in progress",
+                            IsDefault = true,
+                            Name = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5c72b630-6923-4215-bf2c-b1622afd76e7"),
+                            ColorCode = "#6c757d",
+                            Description = "These issues are currently under review",
+                            IsDefault = true,
+                            Name = "In Review",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("8ff85685-a875-4f21-aa95-d99551315fcc"),
+                            ColorCode = "#B399FF",
+                            Description = "The following issues are resolved and closed",
+                            IsDefault = true,
+                            Name = "Done",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTagMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("ef6c2a65-f61d-4537-9650-a7ab7f8d98db"),
+                            ColorCode = "#e59866",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5a168569-8ad7-4422-8db6-51ef25caddeb"),
+                            ColorCode = "#85c1e9",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkCategoryMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("86bb2cc8-f6b5-4fdd-bbee-c389c713a44b"),
+                            Description = "Created new task in a professional or creative context",
+                            IsSystem = true,
+                            Name = "Fresh Work",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("9ebfa19c-53b9-481b-b863-c25d2f843201"),
+                            Description = "Revising, modifying, or correcting a task to improve its quality or fix issues",
+                            IsSystem = true,
+                            Name = "Rework",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("11a79929-1d07-42dc-9e98-82d0d2f4a240"),
+                            Description = "Any defect, deviation, or non-conformance in a task that fails to meet established standards or customer expectations.",
+                            IsSystem = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("030bb085-e230-4370-aec7-9a74d652864e"),
+                            Description = "Confirm the tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"),
+                            Description = "Not all tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Partially Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"),
+                            Description = "Tasks are not finished as reported or have any issues in al the tasks",
+                            IsSystem = true,
+                            Name = "NCR",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buildings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BuildingId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Floor");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProjectAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ShortName")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectStatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Projects");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("85bf587b-7ca9-4685-b77c-d817f5847e85"),
+                            ContactPerson = "Project 1 Contact Person",
+                            EndDate = new DateTime(2026, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            Name = "Project 1",
+                            ProjectAddress = "Project 1 Address",
+                            ProjectStatusId = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            StartDate = new DateTime(2025, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReAllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ProjectAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AreaName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FloorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FloorId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkAreas");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("CompletedWork")
+                        .HasColumnType("double");
+
+                    b.Property<double>("PlannedWork")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime>("TaskDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkAreaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActivityId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkAreaId");
+
+                    b.HasIndex("WorkCategoryId");
+
+                    b.ToTable("WorkItems");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ApplicationRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("JobRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Utilities.Inquiries", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("About")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrganizatioinName")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Inquiries");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("varchar(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator().HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("IsRootUser")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ApprovedBy")
+                        .WithMany()
+                        .HasForeignKey("ApprovedById");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("AssignedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ReportedBy")
+                        .WithMany()
+                        .HasForeignKey("ReportedById");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem")
+                        .WithMany()
+                        .HasForeignKey("WorkItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkStatusMaster", "WorkStatus")
+                        .WithMany()
+                        .HasForeignKey("WorkStatusId");
+
+                    b.Navigation("ApprovedBy");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("ReportedBy");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkItem");
+
+                    b.Navigation("WorkStatus");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("CommentedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Approver")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Approver");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.AttendanceModule.Attendance", "Attendance")
+                        .WithMany()
+                        .HasForeignKey("AttendanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.DocumentManager.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedByEmployee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy");
+
+                    b.Navigation("Attendance");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedByEmployee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedByID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.ContactCategoryMaster", "ContactCategory")
+                        .WithMany()
+                        .HasForeignKey("ContactCategoryId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ContactCategory");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Createdby")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Createdby");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.ContactTagMaster", "ContactTag")
+                        .WithMany()
+                        .HasForeignKey("ContactTagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("ContactTag");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationUser", "ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.HasOne("Marco.Pms.Model.Roles.JobRole", "JobRole")
+                        .WithMany()
+                        .HasForeignKey("JobRoleId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("JobRole");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Role");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Feature", "Feature")
+                        .WithMany("FeaturePermissions")
+                        .HasForeignKey("FeatureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feature");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.FeaturePermission", null)
+                        .WithMany()
+                        .HasForeignKey("FeaturePermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Industry", "Industry")
+                        .WithMany()
+                        .HasForeignKey("IndustryId");
+
+                    b.Navigation("Industry");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Forum.TicketComment", "TicketComment")
+                        .WithMany("Attachments")
+                        .HasForeignKey("CommentId");
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ticket");
+
+                    b.Navigation("TicketComment");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketPriorityMaster", "Priority")
+                        .WithMany()
+                        .HasForeignKey("PriorityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.TicketStatusMaster", "TicketStatusMaster")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketTypeMaster", "TicketTypeMaster")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Priority");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("TicketStatusMaster");
+
+                    b.Navigation("TicketTypeMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketTagMaster", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+
+                    b.Navigation("Ticket");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Mail.MailingList", "MailBody")
+                        .WithMany()
+                        .HasForeignKey("MailListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MailBody");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Module", "Module")
+                        .WithMany()
+                        .HasForeignKey("ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Building", "Building")
+                        .WithMany()
+                        .HasForeignKey("BuildingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Building");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.StatusMaster", "ProjectStatus")
+                        .WithMany()
+                        .HasForeignKey("ProjectStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProjectStatus");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .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("Employee");
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Floor", "Floor")
+                        .WithMany()
+                        .HasForeignKey("FloorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Floor");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.ActivityMaster", "ActivityMaster")
+                        .WithMany()
+                        .HasForeignKey("ActivityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea")
+                        .WithMany()
+                        .HasForeignKey("WorkAreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkCategoryMaster", "WorkCategoryMaster")
+                        .WithMany()
+                        .HasForeignKey("WorkCategoryId");
+
+                    b.Navigation("ActivityMaster");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkArea");
+
+                    b.Navigation("WorkCategoryMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Navigation("FeaturePermissions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.cs b/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.cs
new file mode 100644
index 0000000..62cd405
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250616064217_Added_Apporved_By_In_TaskAllocation_Table.cs
@@ -0,0 +1,188 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_Apporved_By_In_TaskAllocation_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "ApprovedById",
+                table: "TaskAllocations",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "ApprovedDate",
+                table: "TaskAllocations",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ParentTaskId",
+                table: "TaskAllocations",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ReportedById",
+                table: "TaskAllocations",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<double>(
+                name: "ReportedTask",
+                table: "TaskAllocations",
+                type: "double",
+                nullable: false,
+                defaultValue: 0.0);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "WorkStatusId",
+                table: "TaskAllocations",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateTable(
+                name: "WorkStatusMasters",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "longtext", nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsSystem = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WorkStatusMasters", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_WorkStatusMasters_Tenants_TenantId",
+                        column: x => x.TenantId,
+                        principalTable: "Tenants",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.InsertData(
+                table: "WorkStatusMasters",
+                columns: new[] { "Id", "Description", "IsSystem", "Name", "TenantId" },
+                values: new object[,]
+                {
+                    { new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"), "Tasks are not finished as reported or have any issues in al the tasks", true, "NCR", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("030bb085-e230-4370-aec7-9a74d652864e"), "Confirm the tasks are actually finished as reported", true, "Approve", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") },
+                    { new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"), "Not all tasks are actually finished as reported", true, "Partially Approve", new Guid("b3466e83-7e11-464c-b93a-daf047838b26") }
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TaskAllocations_ApprovedById",
+                table: "TaskAllocations",
+                column: "ApprovedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TaskAllocations_ReportedById",
+                table: "TaskAllocations",
+                column: "ReportedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TaskAllocations_WorkStatusId",
+                table: "TaskAllocations",
+                column: "WorkStatusId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WorkStatusMasters_TenantId",
+                table: "WorkStatusMasters",
+                column: "TenantId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_TaskAllocations_Employees_ApprovedById",
+                table: "TaskAllocations",
+                column: "ApprovedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_TaskAllocations_Employees_ReportedById",
+                table: "TaskAllocations",
+                column: "ReportedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_TaskAllocations_WorkStatusMasters_WorkStatusId",
+                table: "TaskAllocations",
+                column: "WorkStatusId",
+                principalTable: "WorkStatusMasters",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_TaskAllocations_Employees_ApprovedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_TaskAllocations_Employees_ReportedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_TaskAllocations_WorkStatusMasters_WorkStatusId",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropTable(
+                name: "WorkStatusMasters");
+
+            migrationBuilder.DropIndex(
+                name: "IX_TaskAllocations_ApprovedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropIndex(
+                name: "IX_TaskAllocations_ReportedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropIndex(
+                name: "IX_TaskAllocations_WorkStatusId",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "ApprovedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "ApprovedDate",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "ParentTaskId",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "ReportedById",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "ReportedTask",
+                table: "TaskAllocations");
+
+            migrationBuilder.DropColumn(
+                name: "WorkStatusId",
+                table: "TaskAllocations");
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
index 187d2a6..9bf43db 100644
--- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -28,6 +28,12 @@ namespace Marco.Pms.DataAccess.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("char(36)");
 
+                    b.Property<Guid?>("ApprovedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ApprovedDate")
+                        .HasColumnType("datetime(6)");
+
                     b.Property<Guid>("AssignedBy")
                         .HasColumnType("char(36)");
 
@@ -40,26 +46,44 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<string>("Description")
                         .HasColumnType("longtext");
 
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
                     b.Property<double>("PlannedTask")
                         .HasColumnType("double");
 
+                    b.Property<Guid?>("ReportedById")
+                        .HasColumnType("char(36)");
+
                     b.Property<DateTime?>("ReportedDate")
                         .HasColumnType("datetime(6)");
 
+                    b.Property<double>("ReportedTask")
+                        .HasColumnType("double");
+
                     b.Property<Guid>("TenantId")
                         .HasColumnType("char(36)");
 
                     b.Property<Guid>("WorkItemId")
                         .HasColumnType("char(36)");
 
+                    b.Property<Guid?>("WorkStatusId")
+                        .HasColumnType("char(36)");
+
                     b.HasKey("Id");
 
+                    b.HasIndex("ApprovedById");
+
                     b.HasIndex("AssignedBy");
 
+                    b.HasIndex("ReportedById");
+
                     b.HasIndex("TenantId");
 
                     b.HasIndex("WorkItemId");
 
+                    b.HasIndex("WorkStatusId");
+
                     b.ToTable("TaskAllocations");
                 });
 
@@ -1926,6 +1950,59 @@ namespace Marco.Pms.DataAccess.Migrations
                         });
                 });
 
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("030bb085-e230-4370-aec7-9a74d652864e"),
+                            Description = "Confirm the tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"),
+                            Description = "Not all tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Partially Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"),
+                            Description = "Tasks are not finished as reported or have any issues in al the tasks",
+                            IsSystem = true,
+                            Name = "NCR",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
             modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
                 {
                     b.Property<Guid>("Id")
@@ -2435,12 +2512,20 @@ namespace Marco.Pms.DataAccess.Migrations
 
             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
                 {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ApprovedBy")
+                        .WithMany()
+                        .HasForeignKey("ApprovedById");
+
                     b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
                         .WithMany()
                         .HasForeignKey("AssignedBy")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ReportedBy")
+                        .WithMany()
+                        .HasForeignKey("ReportedById");
+
                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
                         .WithMany()
                         .HasForeignKey("TenantId")
@@ -2453,11 +2538,21 @@ namespace Marco.Pms.DataAccess.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Marco.Pms.Model.Master.WorkStatusMaster", "WorkStatus")
+                        .WithMany()
+                        .HasForeignKey("WorkStatusId");
+
+                    b.Navigation("ApprovedBy");
+
                     b.Navigation("Employee");
 
+                    b.Navigation("ReportedBy");
+
                     b.Navigation("Tenant");
 
                     b.Navigation("WorkItem");
+
+                    b.Navigation("WorkStatus");
                 });
 
             modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
@@ -3058,6 +3153,17 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Navigation("Tenant");
                 });
 
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
             modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
                 {
                     b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
diff --git a/Marco.Pms.Model/Activities/TaskAllocation.cs b/Marco.Pms.Model/Activities/TaskAllocation.cs
index 3347cef..4c8681c 100644
--- a/Marco.Pms.Model/Activities/TaskAllocation.cs
+++ b/Marco.Pms.Model/Activities/TaskAllocation.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 using Marco.Pms.Model.Employees;
+using Marco.Pms.Model.Master;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
@@ -10,29 +11,43 @@ namespace Marco.Pms.Model.Activities
     public class TaskAllocation : TenantRelation
     {
         public Guid Id { get; set; }
-
-
+        public Guid? ParentTaskId { get; set; }
         public DateTime AssignmentDate { get; set; }
         public double PlannedTask { get; set; }
         public double CompletedTask { get; set; }
+        public double ReportedTask { get; set; }
         public DateTime? ReportedDate { get; set; }
-
+        public DateTime? ApprovedDate { get; set; }
         public string? Description { get; set; }
 
-        //public int? WorkItemMappingId { get; set; }
-        //[ForeignKey("WorkItemMappingId")]
-        //[ValidateNever]
-        //public WorkItemMapping? WorkItemMapping { get; set; }
+        public Guid AssignedBy { get; set; }   //Employee Id 
 
-        public Guid AssignedBy { get; set; }   //Employee Id
         [ForeignKey("AssignedBy")]
         [ValidateNever]
         public Employee? Employee { get; set; }
 
+        public Guid? ReportedById { get; set; }   //Employee Id
+
+        [ForeignKey("ReportedById")]
+        [ValidateNever]
+        public Employee? ReportedBy { get; set; }
+
+        public Guid? ApprovedById { get; set; }   //Employee Id
+
+        [ForeignKey("ApprovedById")]
+        [ValidateNever]
+        public Employee? ApprovedBy { get; set; }
+
         public Guid WorkItemId { get; set; }
+
         [ForeignKey("WorkItemId")]
         [ValidateNever]
         public WorkItem? WorkItem { get; set; }
 
+        public Guid? WorkStatusId { get; set; }
+
+        [ForeignKey("WorkStatusId")]
+        [ValidateNever]
+        public WorkStatusMaster? WorkStatus { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Activities/WorkStatusMaster.cs b/Marco.Pms.Model/Activities/WorkStatusMaster.cs
new file mode 100644
index 0000000..52074c7
--- /dev/null
+++ b/Marco.Pms.Model/Activities/WorkStatusMaster.cs
@@ -0,0 +1,12 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Master
+{
+    public class WorkStatusMaster : TenantRelation
+    {
+        public Guid Id { get; set; }
+        public string Name { get; set; } = string.Empty;
+        public string Description { get; set; } = string.Empty;
+        public bool IsSystem { get; set; } = false;
+    }
+}
diff --git a/Marco.Pms.Model/Dtos/Activities/ApproveTaskDto.cs b/Marco.Pms.Model/Dtos/Activities/ApproveTaskDto.cs
new file mode 100644
index 0000000..cada0f5
--- /dev/null
+++ b/Marco.Pms.Model/Dtos/Activities/ApproveTaskDto.cs
@@ -0,0 +1,13 @@
+using Marco.Pms.Model.Utilities;
+
+namespace Marco.Pms.Model.Dtos.Activities
+{
+    public class ApproveTaskDto
+    {
+        public Guid Id { get; set; }
+        public Guid WorkStatus { get; set; }
+        public long ApprovedTask { get; set; }
+        public string? Comment { get; set; }
+        public List<FileUploadModel>? Images { get; set; }
+    }
+}
diff --git a/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs b/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs
index 671902e..a4423f0 100644
--- a/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/AssignTaskDto.cs
@@ -3,6 +3,7 @@
     public class AssignTaskDto
     {
         public DateTime AssignmentDate { get; set; }
+        public Guid? ParentTaskId { get; set; }
         public double PlannedTask { get; set; }
         public string? Description { get; set; }
         public List<Guid>? TaskTeam { get; set; }   //Employee Ids
diff --git a/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs b/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
index 13eb9b5..d63b653 100644
--- a/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
+++ b/Marco.Pms.Model/Dtos/Activities/ReportTaskDto.cs
@@ -5,6 +5,7 @@ namespace Marco.Pms.Model.Dtos.Activities
     public class ReportTaskDto
     {
         public Guid Id { get; set; }
+        public Guid? ParentTaskId { get; set; }
         public double CompletedTask { get; set; }
         public DateTime ReportedDate { get; set; }
         public string? Comment { get; set; }
diff --git a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
index f860bac..4083ccf 100644
--- a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
+++ b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
@@ -13,6 +13,7 @@ namespace Marco.Pms.Model.Mapper
             return new TaskAllocation
             {
                 AssignmentDate = assignTask.AssignmentDate,
+                ParentTaskId = assignTask.ParentTaskId,
                 PlannedTask = assignTask.PlannedTask,
                 CompletedTask = 0,
                 Description = assignTask.Description,
@@ -43,18 +44,23 @@ namespace Marco.Pms.Model.Mapper
                 TenantId = tenantId
             };
         }
-        public static TaskVM TaskAllocationToTaskVM(this TaskAllocation taskAllocation, string employeeName)
+        public static TaskVM TaskAllocationToTaskVM(this TaskAllocation taskAllocation)
         {
             return new TaskVM
             {
                 Id = taskAllocation.Id,
                 AssignmentDate = taskAllocation.AssignmentDate,
+                ReportedDate = taskAllocation.ReportedDate,
+                ApprovedDate = taskAllocation.ApprovedDate,
                 PlannedTask = taskAllocation.PlannedTask,
                 CompletedTask = taskAllocation.CompletedTask,
-                ReportedDate = taskAllocation.ReportedDate,
+                NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.ReportedTask - taskAllocation.CompletedTask),
                 Description = taskAllocation.Description,
-                AssignBy = employeeName,
-                WorkItem = taskAllocation.WorkItem
+                AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(),
+                ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(),
+                ApprovedBy = taskAllocation.ApprovedBy?.ToBasicEmployeeVMFromEmployee(),
+                WorkItem = taskAllocation.WorkItem,
+                WorkStatus = taskAllocation.WorkStatus
             };
         }
         public static AssignedTaskVM ToAssignTaskVMFromTaskAllocation(this TaskAllocation taskAllocation)
@@ -100,12 +106,18 @@ namespace Marco.Pms.Model.Mapper
             return new ListTaskVM
             {
                 Id = taskAllocation.Id,
+                ParentTaskId = taskAllocation.ParentTaskId,
                 AssignmentDate = taskAllocation.AssignmentDate,
+                ApprovedDate = taskAllocation.ApprovedDate,
                 Description = taskAllocation.Description,
                 PlannedTask = taskAllocation.PlannedTask,
                 ReportedDate = taskAllocation.ReportedDate,
+                WorkStatus = taskAllocation.WorkStatus,
                 CompletedTask = taskAllocation.CompletedTask,
-                AssignedBy = taskAllocation.Employee != null ? taskAllocation.Employee.ToBasicEmployeeVMFromEmployee() : new BasicEmployeeVM(),
+                NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.ReportedTask - taskAllocation.CompletedTask),
+                AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(),
+                ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(),
+                ApprovedBy = taskAllocation.ApprovedBy?.ToBasicEmployeeVMFromEmployee(),
                 WorkItemId = taskAllocation.WorkItemId,
                 WorkItem = taskAllocation.WorkItem
             };
diff --git a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
index 9785bd2..c71b813 100644
--- a/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs
@@ -1,15 +1,22 @@
-using Marco.Pms.Model.Projects;
+using Marco.Pms.Model.Master;
+using Marco.Pms.Model.Projects;
 
 namespace Marco.Pms.Model.ViewModels.Activities
 {
     public class ListTaskVM
     {
         public Guid Id { get; set; }
+        public Guid? ParentTaskId { get; set; }
         public DateTime AssignmentDate { get; set; }
         public DateTime? ReportedDate { get; set; }
+        public DateTime? ApprovedDate { get; set; }
         public double PlannedTask { get; set; }
         public double CompletedTask { get; set; }
+        public double NotApprovedTask { get; set; }
         public BasicEmployeeVM? AssignedBy { get; set; }
+        public BasicEmployeeVM? ReportedBy { get; set; }
+        public BasicEmployeeVM? ApprovedBy { get; set; }
+        public WorkStatusMaster? WorkStatus { get; set; }
         public string? Description { get; set; }
         public Guid WorkItemId { get; set; }
         public List<string>? ReportedPreSignedUrls { get; set; }
diff --git a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
index 18a29b0..f3373b4 100644
--- a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
@@ -1,5 +1,5 @@
-using Marco.Pms.Model.Projects;
-using Marco.Pms.Model.ViewModels.Employee;
+using Marco.Pms.Model.Master;
+using Marco.Pms.Model.Projects;
 
 namespace Marco.Pms.Model.ViewModels.Activities
 {
@@ -7,14 +7,19 @@ namespace Marco.Pms.Model.ViewModels.Activities
     {
         public Guid Id { get; set; }
         public DateTime AssignmentDate { get; set; }
+        public DateTime? ReportedDate { get; set; }
+        public DateTime? ApprovedDate { get; set; }
         public double PlannedTask { get; set; }
         public double CompletedTask { get; set; }
-        public DateTime? ReportedDate { get; set; }
+        public double NotApprovedTask { get; set; }
         public string? Description { get; set; }
-        public string? AssignBy { get; set; }
+        public BasicEmployeeVM? AssignedBy { get; set; }
+        public BasicEmployeeVM? ReportedBy { get; set; }
+        public BasicEmployeeVM? ApprovedBy { get; set; }
+        public WorkStatusMaster? WorkStatus { get; set; }
         public WorkItem? WorkItem { get; set; }
         public List<string>? PreSignedUrls { get; set; }
         public List<CommentVM>? Comments { get; set; }
-        public List<EmployeeVM>? TeamMembers { get; set; }
+        public List<BasicEmployeeVM>? TeamMembers { get; set; }
     }
 }
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index ea4fbf1..ab34561 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -1,15 +1,14 @@
 using Marco.Pms.DataAccess.Data;
 using Marco.Pms.Model.Activities;
 using Marco.Pms.Model.Dtos.Activities;
-using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Mapper;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Activities;
-using Marco.Pms.Model.ViewModels.Employee;
 using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
+using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.CodeAnalysis;
@@ -27,13 +26,20 @@ namespace MarcoBMS.Services.Controllers
         private readonly ApplicationDbContext _context;
         private readonly UserHelper _userHelper;
         private readonly S3UploadService _s3Service;
+        private readonly ILoggingService _logger;
+        private readonly PermissionServices _permissionServices;
+        private readonly Guid Approve_Task;
+        private readonly Guid Assign_Report_Task;
 
-
-        public TaskController(ApplicationDbContext context, UserHelper userHelper, S3UploadService s3Service)
+        public TaskController(ApplicationDbContext context, UserHelper userHelper, S3UploadService s3Service, ILoggingService logger, PermissionServices permissionServices)
         {
             _context = context;
             _userHelper = userHelper;
             _s3Service = s3Service;
+            _logger = logger;
+            _permissionServices = permissionServices;
+            Approve_Task = Guid.Parse("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c");
+            Assign_Report_Task = Guid.Parse("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2");
         }
 
         private Guid GetTenantId()
@@ -44,49 +50,68 @@ namespace MarcoBMS.Services.Controllers
         [HttpPost("assign")]
         public async Task<IActionResult> AssignTask([FromBody] AssignTaskDto assignTask)
         {
+            // Validate the incoming model
             if (!ModelState.IsValid)
             {
                 var errors = ModelState.Values
                     .SelectMany(v => v.Errors)
                     .Select(e => e.ErrorMessage)
                     .ToList();
+
+                _logger.LogWarning("AssignTask failed validation: {@Errors}", errors);
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
-
             }
-            var tenantId = GetTenantId();
-            var Employee = await _userHelper.GetCurrentEmployeeAsync();
 
-            var taskAllocation = assignTask.ToTaskAllocationFromAssignTaskDto(Employee.Id, tenantId);
+            // Retrieve tenant and employee context
+            var tenantId = GetTenantId();
+            var employee = await _userHelper.GetCurrentEmployeeAsync();
+
+            // Check for permission to approve tasks
+            var hasPermission = await _permissionServices.HasPermission(Assign_Report_Task, employee.Id);
+            if (!hasPermission)
+            {
+                _logger.LogWarning("Employee {EmployeeId} attempted to assign Task without permission", employee.Id);
+                return StatusCode(403, ApiResponse<object>.ErrorResponse("You don't have access", "User not authorized to approve tasks", 403));
+            }
+
+            _logger.LogInfo("Employee {EmployeeId} is assigning a new task", employee.Id);
+
+            // Convert DTO to entity and save TaskAllocation
+            var taskAllocation = assignTask.ToTaskAllocationFromAssignTaskDto(employee.Id, tenantId);
             _context.TaskAllocations.Add(taskAllocation);
             await _context.SaveChangesAsync();
+
+            _logger.LogInfo("Task {TaskId} assigned by Employee {EmployeeId}", taskAllocation.Id, employee.Id);
+
             var response = taskAllocation.ToAssignTaskVMFromTaskAllocation();
 
-            var teamMembers = new List<TaskMembers> { };
-            if (assignTask.TaskTeam != null)
+            // Map team members
+            var teamMembers = new List<TaskMembers>();
+            if (assignTask.TaskTeam != null && assignTask.TaskTeam.Any())
             {
-                foreach (var teamMember in assignTask.TaskTeam)
+                teamMembers = assignTask.TaskTeam.Select(memberId => new TaskMembers
                 {
-                    var result = new TaskMembers
-                    {
-                        TaskAllocationId = taskAllocation.Id,
-                        EmployeeId = teamMember,
-                        TenantId = tenantId,
-                    };
-                    teamMembers.Add(result);
-                }
-            }
-            _context.TaskMembers.AddRange(teamMembers);
-            await _context.SaveChangesAsync();
+                    TaskAllocationId = taskAllocation.Id,
+                    EmployeeId = memberId,
+                    TenantId = tenantId
+                }).ToList();
 
-            var idList = teamMembers.Select(m => m.EmployeeId);
-            List<Employee> employees = await _context.Employees.Where(e => idList.Contains(e.Id)).ToListAsync();
-            List<BasicEmployeeVM> team = new List<BasicEmployeeVM>();
-            foreach (var employee in employees)
-            {
-                team.Add(employee.ToBasicEmployeeVMFromEmployee());
+                _context.TaskMembers.AddRange(teamMembers);
+                await _context.SaveChangesAsync();
+
+                _logger.LogInfo("Team members added to Task {TaskId}: {@TeamMemberIds}", taskAllocation.Id, assignTask.TaskTeam);
             }
+
+            // Get team member details
+            var employeeIds = teamMembers.Select(m => m.EmployeeId).ToList();
+            var employees = await _context.Employees
+                .Where(e => employeeIds.Contains(e.Id))
+                .ToListAsync();
+
+            var team = employees.Select(e => e.ToBasicEmployeeVMFromEmployee()).ToList();
             response.teamMembers = team;
-            return Ok(ApiResponse<object>.SuccessResponse(response, "Task assignned successfully", 200));
+
+            return Ok(ApiResponse<object>.SuccessResponse(response, "Task assigned successfully", 200));
         }
 
         [HttpPost("report")]
@@ -98,363 +123,661 @@ namespace MarcoBMS.Services.Controllers
                     .SelectMany(v => v.Errors)
                     .Select(e => e.ErrorMessage)
                     .ToList();
+
+                _logger.LogWarning("Task report validation failed: {@Errors}", errors);
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
-
             }
+
             var tenantId = GetTenantId();
-            var Employee = await _userHelper.GetCurrentEmployeeAsync();
+            var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
 
-            var taskAllocation = await _context.TaskAllocations.Include(t => t.WorkItem).FirstOrDefaultAsync(t => t.Id == reportTask.Id);
-
-            var checkListIds = reportTask.CheckList != null ? reportTask.CheckList.Select(c => c.Id).ToList() : new List<Guid>();
-            var checkList = await _context.ActivityCheckLists.Where(c => checkListIds.Contains(c.Id)).ToListAsync();
-            if (taskAllocation == null || taskAllocation.WorkItem == null)
+            var hasPermission = await _permissionServices.HasPermission(Assign_Report_Task, loggedInEmployee.Id);
+            if (!hasPermission)
             {
+                _logger.LogWarning("Unauthorized task report attempt by Employee {EmployeeId} for Task {TaskId}", loggedInEmployee.Id, reportTask.Id);
+                return StatusCode(403, ApiResponse<object>.ErrorResponse("You don't have access", "User not authorized to report tasks", 403));
+            }
+
+            var taskAllocation = await _context.TaskAllocations
+                .Include(t => t.WorkItem)
+                .FirstOrDefaultAsync(t => t.Id == reportTask.Id);
+
+            if (taskAllocation == null)
+            {
+                _logger.LogWarning("No task allocation found with ID {TaskId}", reportTask.Id);
                 return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400));
             }
-            WorkArea workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == taskAllocation.WorkItem.WorkAreaId) ?? new WorkArea();
 
-            var bulding = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty));
+            var checkListIds = reportTask.CheckList?.Select(c => c.Id).ToList() ?? new List<Guid>();
+            var checkList = await _context.ActivityCheckLists
+                .Where(c => checkListIds.Contains(c.Id))
+                .ToListAsync();
+
             if (taskAllocation.WorkItem != null)
             {
-                if (taskAllocation.CompletedTask != 0)
-                {
+                if (taskAllocation.CompletedTask > 0)
                     taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
-                }
-                taskAllocation.ReportedDate = reportTask.ReportedDate;
-                taskAllocation.CompletedTask = reportTask.CompletedTask;
+
                 taskAllocation.WorkItem.CompletedWork += reportTask.CompletedTask;
             }
-            List<CheckListMappings> checkListMappings = new List<CheckListMappings>();
-            List<CheckListVM> checkListVMs = new List<CheckListVM>();
+
+            taskAllocation.ParentTaskId = reportTask.ParentTaskId;
+            taskAllocation.ReportedDate = reportTask.ReportedDate;
+            taskAllocation.ReportedById = loggedInEmployee.Id;
+            taskAllocation.CompletedTask = reportTask.CompletedTask;
+            taskAllocation.ReportedTask = reportTask.CompletedTask;
+
+            var checkListMappings = new List<CheckListMappings>();
+            var checkListVMs = new List<CheckListVM>();
+
             if (reportTask.CheckList != null)
             {
+                var activityId = taskAllocation.WorkItem?.ActivityId ?? Guid.Empty;
+
                 foreach (var checkDto in reportTask.CheckList)
                 {
-                    checkListVMs.Add(checkDto.ToCheckListVMFromReportCheckListDto(taskAllocation.WorkItem != null ? taskAllocation.WorkItem.ActivityId : Guid.Empty));
-                    if (checkDto.IsChecked)
+                    checkListVMs.Add(checkDto.ToCheckListVMFromReportCheckListDto(activityId));
+
+                    if (checkDto.IsChecked && checkList.Any(c => c.Id == checkDto.Id))
                     {
-                        var check = checkList.Find(c => c.Id == checkDto.Id);
-                        if (check != null)
+                        checkListMappings.Add(new CheckListMappings
                         {
-                            CheckListMappings checkListMapping = new CheckListMappings
-                            {
-                                CheckListId = check.Id,
-                                TaskAllocationId = reportTask.Id
-                            };
-                            checkListMappings.Add(checkListMapping);
-                        }
+                            CheckListId = checkDto.Id,
+                            TaskAllocationId = reportTask.Id
+                        });
                     }
                 }
+
+                _context.CheckListMappings.AddRange(checkListMappings);
             }
-            _context.CheckListMappings.AddRange(checkListMappings);
-            var comment = reportTask.ToCommentFromReportTaskDto(tenantId, Employee.Id);
 
-            var Images = reportTask.Images;
+            var comment = reportTask.ToCommentFromReportTaskDto(tenantId, loggedInEmployee.Id);
+            _context.TaskComments.Add(comment);
 
-            if (Images != null && Images.Count > 0)
+            if (reportTask.Images?.Any() == true)
             {
+                var workAreaId = taskAllocation.WorkItem?.WorkAreaId;
+                var workArea = await _context.WorkAreas.Include(a => a.Floor)
+                    .FirstOrDefaultAsync(a => a.Id == workAreaId) ?? new WorkArea();
 
-                foreach (var Image in Images)
+                var buildingId = workArea.Floor?.BuildingId;
+
+                var building = await _context.Buildings
+                    .FirstOrDefaultAsync(b => b.Id == buildingId);
+
+                foreach (var image in reportTask.Images)
                 {
-
-                    if (string.IsNullOrEmpty(Image.Base64Data))
+                    if (string.IsNullOrEmpty(image.Base64Data))
+                    {
+                        _logger.LogWarning("Image upload failed: Base64 data is missing");
                         return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+                    }
 
-                    //If base64 has a data URI prefix, strip it
-                    var base64 = Image.Base64Data.Contains(",")
-                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
-                        : Image.Base64Data;
+                    var base64 = image.Base64Data.Contains(',')
+                        ? image.Base64Data[(image.Base64Data.IndexOf(",") + 1)..]
+                        : image.Base64Data;
 
-                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
-                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_report");
+                    var fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    var fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_report");
+                    var objectKey = $"tenant-{tenantId}/project-{building?.ProjectId}/Actitvity/{fileName}";
 
-                    string objectKey = $"tenant-{tenantId}/project-{bulding?.ProjectId}/Actitvity/{fileName}";
                     await _s3Service.UploadFileAsync(base64, fileType, objectKey);
 
-                    Document document = new Document
+                    var document = new Document
                     {
-                        FileName = Image.FileName ?? "",
-                        ContentType = Image.ContentType ?? "",
+                        FileName = image.FileName ?? "",
+                        ContentType = image.ContentType ?? "",
                         S3Key = objectKey,
-                        Base64Data = Image.Base64Data,
-                        FileSize = Image.FileSize,
+                        Base64Data = image.Base64Data,
+                        FileSize = image.FileSize,
                         UploadedAt = DateTime.UtcNow,
                         TenantId = tenantId
                     };
                     _context.Documents.Add(document);
-                    TaskAttachment attachment = new TaskAttachment
+
+                    var attachment = new TaskAttachment
                     {
                         DocumentId = document.Id,
                         ReferenceId = reportTask.Id
                     };
                     _context.TaskAttachments.Add(attachment);
                 }
-                await _context.SaveChangesAsync();
             }
 
-            _context.TaskComments.Add(comment);
             await _context.SaveChangesAsync();
 
             var response = taskAllocation.ToReportTaskVMFromTaskAllocation();
-            List<TaskComment> comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
-            List<CommentVM> resultComments = new List<CommentVM> { };
-            foreach (var result in comments)
-            {
-                resultComments.Add(result.ToCommentVMFromTaskComment());
-            }
-            response.Comments = resultComments;
+            var comments = await _context.TaskComments
+                .Where(c => c.TaskAllocationId == taskAllocation.Id)
+                .ToListAsync();
+
+            response.Comments = comments.Select(c => c.ToCommentVMFromTaskComment()).ToList();
             response.checkList = checkListVMs;
+
+            _logger.LogInfo("Task {TaskId} reported successfully by Employee {EmployeeId}", taskAllocation.Id, loggedInEmployee.Id);
+
             return Ok(ApiResponse<object>.SuccessResponse(response, "Task reported successfully", 200));
         }
 
         [HttpPost("comment")]
         public async Task<IActionResult> AddCommentForTask([FromBody] CreateCommentDto createComment)
         {
-            var tenantId = GetTenantId();
-            var Employee = await _userHelper.GetCurrentEmployeeAsync();
+            _logger.LogInfo("AddCommentForTask called for TaskAllocationId: {TaskId}", createComment.TaskAllocationId);
+
+            var tenantId = GetTenantId();
+            var employee = await _userHelper.GetCurrentEmployeeAsync();
+
+            // Validate Task Allocation and associated WorkItem
+            var taskAllocation = await _context.TaskAllocations
+                .Include(t => t.WorkItem)
+                .FirstOrDefaultAsync(t => t.Id == createComment.TaskAllocationId);
 
-            var taskAllocation = await _context.TaskAllocations.Include(t => t.WorkItem).FirstOrDefaultAsync(t => t.Id == createComment.TaskAllocationId);
             if (taskAllocation == null || taskAllocation.WorkItem == null)
             {
+                _logger.LogWarning("Invalid task allocation or work item not found.");
                 return BadRequest(ApiResponse<object>.ErrorResponse("No such task has been allocated.", "No such task has been allocated.", 400));
             }
-            WorkArea workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == taskAllocation.WorkItem.WorkAreaId) ?? new WorkArea();
 
-            var bulding = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty));
+            // Fetch WorkArea and Building (if available)
+            var workArea = await _context.WorkAreas
+                .Include(a => a.Floor)
+                .FirstOrDefaultAsync(a => a.Id == taskAllocation.WorkItem.WorkAreaId) ?? new WorkArea();
 
-            var comment = createComment.ToCommentFromCommentDto(tenantId, Employee.Id);
+            var buildingId = workArea.Floor?.BuildingId ?? Guid.Empty;
+            var building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == buildingId);
+
+            // Save comment
+            var comment = createComment.ToCommentFromCommentDto(tenantId, employee.Id);
             _context.TaskComments.Add(comment);
             await _context.SaveChangesAsync();
+            _logger.LogInfo("Comment saved with Id: {CommentId}", comment.Id);
 
-            var Images = createComment.Images;
+            // Process image uploads
+            var images = createComment.Images;
 
-            if (Images != null && Images.Count > 0)
+            if (images != null && images.Any())
             {
-
-                foreach (var Image in Images)
+                foreach (var image in images)
                 {
-
-                    if (string.IsNullOrEmpty(Image.Base64Data))
-                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
-
-                    //If base64 has a data URI prefix, strip it
-                    var base64 = Image.Base64Data.Contains(",")
-                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
-                        : Image.Base64Data;
-
-                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
-                    string fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_report");
-
-                    string objectKey = $"tenant-{tenantId}/project-{bulding?.ProjectId}/Actitvity/{fileName}";
-                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
-
-                    Document document = new Document
+                    if (string.IsNullOrWhiteSpace(image.Base64Data))
                     {
-                        FileName = Image.FileName ?? "",
-                        ContentType = Image.ContentType ?? "",
+                        _logger.LogWarning("Missing Base64 data in one of the images.");
+                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+                    }
+
+                    // Clean base64 string
+                    var base64 = image.Base64Data.Contains(",")
+                        ? image.Base64Data.Substring(image.Base64Data.IndexOf(",") + 1)
+                        : image.Base64Data;
+
+                    var fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    var fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_comment");
+                    var objectKey = $"tenant-{tenantId}/project-{building?.ProjectId}/Activity/{fileName}";
+
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
+                    _logger.LogInfo("Image uploaded to S3 with key: {ObjectKey}", objectKey);
+
+                    var document = new Document
+                    {
+                        FileName = image.FileName ?? string.Empty,
+                        ContentType = image.ContentType ?? fileType,
                         S3Key = objectKey,
-                        Base64Data = Image.Base64Data,
-                        FileSize = Image.FileSize,
+                        Base64Data = image.Base64Data,
+                        FileSize = image.FileSize,
                         UploadedAt = DateTime.UtcNow,
                         TenantId = tenantId
                     };
+
                     _context.Documents.Add(document);
-                    TaskAttachment attachment = new TaskAttachment
+
+                    var attachment = new TaskAttachment
                     {
                         DocumentId = document.Id,
                         ReferenceId = comment.Id
                     };
+
                     _context.TaskAttachments.Add(attachment);
                 }
+
                 await _context.SaveChangesAsync();
+                _logger.LogInfo("Documents and attachments saved for commentId: {CommentId}", comment.Id);
             }
 
-            CommentVM response = comment.ToCommentVMFromTaskComment();
+            // Convert to view model and return response
+            var response = comment.ToCommentVMFromTaskComment();
+            _logger.LogInfo("Returning response for commentId: {CommentId}", comment.Id);
+
             return Ok(ApiResponse<object>.SuccessResponse(response, "Comment saved successfully", 200));
         }
 
         [HttpGet("list")]
         public async Task<IActionResult> GetTasksList([FromQuery] Guid projectId, [FromQuery] string? dateFrom = null, [FromQuery] string? dateTo = null)
         {
+            _logger.LogInfo("GetTasksList called for projectId: {ProjectId}, dateFrom: {DateFrom}, dateTo: {DateTo}", projectId, dateFrom ?? "", dateTo ?? "");
+
             Guid tenantId = GetTenantId();
             DateTime fromDate = new DateTime();
             DateTime toDate = new DateTime();
 
-            if (dateFrom != null && DateTime.TryParse(dateFrom, out fromDate) == false)
+            // Parse and validate dateFrom
+            if (dateFrom != null && !DateTime.TryParse(dateFrom, out fromDate))
             {
+                _logger.LogWarning("Invalid starting date provided: {DateFrom}", dateFrom);
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid starting date.", "Invalid starting date.", 400));
-
             }
-            if (dateTo != null && DateTime.TryParse(dateTo, out toDate) == false)
+
+            // Parse and validate dateTo
+            if (dateTo != null && !DateTime.TryParse(dateTo, out toDate))
             {
+                _logger.LogWarning("Invalid ending date provided: {DateTo}", dateTo);
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid ending date.", "Invalid ending date.", 400));
-
             }
-            if (dateFrom == null) fromDate = DateTime.UtcNow.Date;
-            if (dateTo == null) toDate = fromDate.AddDays(1);
 
-            var jobroles = await _context.JobRoles.Where(r => r.TenantId == tenantId).ToListAsync();
-            //var taskAllocations = await _context.TaskAllocations.Where(t => t.WorkItem.WorkArea.Floor.Building.ProjectId == projectId && t.AssignmentDate >= fromDate && t.AssignmentDate <= toDate && t.TenantId == tenantId).Include(t => t.WorkItemId).ToListAsync();
-            List<Building> buildings = await _context.Buildings.Where(b => b.ProjectId == projectId && b.TenantId == tenantId).ToListAsync();
-            List<Guid> idList = buildings.Select(b => b.Id).ToList();
+            // Set default date range if not provided
+            fromDate = dateFrom == null ? DateTime.UtcNow.Date : fromDate;
+            toDate = dateTo == null ? fromDate.AddDays(1) : toDate;
 
-            List<Floor> floors = await _context.Floor.Where(f => idList.Contains(f.BuildingId) && f.TenantId == tenantId).ToListAsync();
-            idList = floors.Select(f => f.Id).ToList();
+            // 1. Get all buildings under this project
+            _logger.LogInfo("Fetching buildings for projectId: {ProjectId}", projectId);
+            var buildings = await _context.Buildings
+                .Where(b => b.ProjectId == projectId && b.TenantId == tenantId)
+                .ToListAsync();
 
-            List<WorkArea> workAreas = await _context.WorkAreas.Where(a => idList.Contains(a.FloorId) && a.TenantId == tenantId).ToListAsync();
-            idList = workAreas.Select(a => a.Id).ToList();
+            var buildingIds = buildings.Select(b => b.Id).ToList();
 
-            List<WorkItem> workItems = await _context.WorkItems.Where(i => idList.Contains(i.WorkAreaId) && i.TenantId == tenantId).Include(i => i.ActivityMaster).ToListAsync();
-            idList = workItems.Select(i => i.Id).ToList();
-            var activityIdList = workItems.Select(i => i.ActivityId).ToList();
+            // 2. Get floors under the buildings
+            var floors = await _context.Floor
+                .Where(f => buildingIds.Contains(f.BuildingId) && f.TenantId == tenantId)
+                .ToListAsync();
+            var floorIds = floors.Select(f => f.Id).ToList();
 
-            List<TaskAllocation> taskAllocations = await _context.TaskAllocations.Where(t => idList.Contains(t.WorkItemId) && t.AssignmentDate.Date >= fromDate.Date && t.AssignmentDate.Date <= toDate.Date && t.TenantId == tenantId).Include(t => t.WorkItem).Include(t => t.Employee).ToListAsync();
-            var taskIdList = taskAllocations.Select(t => t.Id).ToList();
+            // 3. Get work areas under the floors
+            var workAreas = await _context.WorkAreas
+                .Where(a => floorIds.Contains(a.FloorId) && a.TenantId == tenantId)
+                .ToListAsync();
+            var workAreaIds = workAreas.Select(a => a.Id).ToList();
 
-            List<TaskMembers> teamMembers = await _context.TaskMembers.Where(t => taskIdList.Contains(t.TaskAllocationId)).ToListAsync();
-            var employeeIdList = teamMembers.Select(e => e.EmployeeId).ToList();
+            // 4. Get work items under the work areas
+            var workItems = await _context.WorkItems
+                .Where(i => workAreaIds.Contains(i.WorkAreaId) && i.TenantId == tenantId)
+                .Include(i => i.ActivityMaster)
+                .ToListAsync();
+            var workItemIds = workItems.Select(i => i.Id).ToList();
 
-            List<Employee> employees = await _context.Employees.Where(e => employeeIdList.Contains(e.Id)).Include(e => e.JobRole).ToListAsync();
+            _logger.LogInfo("Fetching task allocations between {FromDate} and {ToDate}", fromDate, toDate);
 
-            List<TaskComment> allComments = await _context.TaskComments.Include(c => c.Employee).Where(c => taskIdList.Contains(c.TaskAllocationId)).ToListAsync();
-            var allCommentIds = allComments.Select(c => c.Id).ToList();
+            // 5. Get task allocations in the specified date range
+            var taskAllocations = await _context.TaskAllocations
+                .Include(t => t.Employee)
+                .Include(t => t.ReportedBy)
+                .Include(t => t.ApprovedBy)
+                .Include(t => t.WorkStatus)
+                .Include(t => t.WorkItem)
+                .Where(t => workItemIds.Contains(t.WorkItemId) &&
+                            t.AssignmentDate.Date >= fromDate.Date &&
+                            t.AssignmentDate.Date <= toDate.Date &&
+                            t.TenantId == tenantId)
+                .ToListAsync();
+
+            var taskIds = taskAllocations.Select(t => t.Id).ToList();
+
+            // 6. Load team members
+            _logger.LogInfo("Loading task members and related employee data.");
+            var teamMembers = await _context.TaskMembers
+                .Include(t => t.Employee)
+                .Where(t => taskIds.Contains(t.TaskAllocationId))
+                .ToListAsync();
+
+            // 7. Load task comments
+            _logger.LogInfo("Fetching comments and attachments.");
+            var allComments = await _context.TaskComments
+                .Include(c => c.Employee)
+                .Where(c => taskIds.Contains(c.TaskAllocationId))
+                .ToListAsync();
+            var commentIds = allComments.Select(c => c.Id).ToList();
+
+            // 8. Load all attachments (task and comment)
+            var attachments = await _context.TaskAttachments
+                .Where(t => taskIds.Contains(t.ReferenceId) || commentIds.Contains(t.ReferenceId))
+                .ToListAsync();
+
+            var documentIds = attachments.Select(t => t.DocumentId).ToList();
+
+            // 9. Load actual documents from attachment references
+            var documents = await _context.Documents
+                .Where(d => documentIds.Contains(d.Id))
+                .ToListAsync();
+
+            var tasks = new List<ListTaskVM>();
+
+            _logger.LogInfo("Constructing task response data.");
 
-            var taskAttachments = await _context.TaskAttachments.Where(t => taskIdList.Contains(t.ReferenceId) || allCommentIds.Contains(t.ReferenceId)).ToListAsync();
-            var documentIds = taskAttachments.Select(t => t.DocumentId).ToList();
-            var documents = await _context.Documents.Where(d => documentIds.Contains(d.Id)).ToListAsync();
 
-            List<ListTaskVM> tasks = new List<ListTaskVM>();
-            //foreach (var workItem in workItems)
-            //{
             foreach (var taskAllocation in taskAllocations)
             {
-
                 var response = taskAllocation.ToListTaskVMFromTaskAllocation();
 
-                List<TaskComment> comments = allComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToList();
-                List<BasicEmployeeVM> team = new List<BasicEmployeeVM>();
-                List<TaskMembers> taskMembers = teamMembers.Where(m => m.TaskAllocationId == taskAllocation.Id).ToList();
+                // Attach documents to the main task
+                var taskDocIds = attachments
+                    .Where(a => a.ReferenceId == taskAllocation.Id)
+                    .Select(a => a.DocumentId)
+                    .ToList();
 
-                var taskDocumentIds = taskAttachments.Where(t => t.ReferenceId == taskAllocation.Id).Select(t => t.DocumentId).ToList();
-                var taskDocuments = documents.Where(d => taskDocumentIds.Contains(d.Id)).ToList();
+                var taskDocs = documents
+                    .Where(d => taskDocIds.Contains(d.Id))
+                    .ToList();
 
-                List<string> taskPreSignedUrls = new List<string>();
-                foreach (var document in taskDocuments)
-                {
-                    string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
-                    taskPreSignedUrls.Add(preSignedUrl);
-                }
-                response.ReportedPreSignedUrls = taskPreSignedUrls;
+                response.ReportedPreSignedUrls = taskDocs
+                    .Select(d => _s3Service.GeneratePreSignedUrlAsync(d.S3Key))
+                    .ToList();
 
-                foreach (var taskMember in taskMembers)
-                {
-                    var teamMember = employees.Find(e => e.Id == taskMember.EmployeeId);
-                    if (teamMember != null)
-                    {
-                        team.Add(teamMember.ToBasicEmployeeVMFromEmployee());
-                    }
-                }
-                List<CommentVM> commentVM = new List<CommentVM> { };
-                foreach (var comment in comments)
-                {
-                    var commentDocumentIds = taskAttachments.Where(t => t.ReferenceId == comment.Id).Select(t => t.DocumentId).ToList();
-                    var commentDocuments = documents.Where(d => commentDocumentIds.Contains(d.Id)).ToList();
-                    List<string> commentPreSignedUrls = new List<string>();
-                    foreach (var document in commentDocuments)
-                    {
-                        string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
-                        commentPreSignedUrls.Add(preSignedUrl);
-                    }
-                    CommentVM commentVm = comment.ToCommentVMFromTaskComment();
-                    commentVm.PreSignedUrls = commentPreSignedUrls;
+                // Add team members
+                var taskMemberEntries = teamMembers
+                    .Where(m => m.TaskAllocationId == taskAllocation.Id)
+                    .ToList();
 
-                    commentVM.Add(commentVm);
-                }
-                List<ActivityCheckList> checkLists = await _context.ActivityCheckLists.Where(x => x.ActivityId == (taskAllocation.WorkItem != null ? taskAllocation.WorkItem.ActivityId : Guid.Empty)).ToListAsync();
-                List<CheckListMappings> checkListMappings = await _context.CheckListMappings.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
-                List<CheckListVM> checkList = new List<CheckListVM>();
-                foreach (var check in checkLists)
+                response.teamMembers = taskMemberEntries
+                    .Select(m => m.Employee)
+                    .Where(e => e != null)
+                    .Select(e => e!.ToBasicEmployeeVMFromEmployee())
+                    .ToList();
+
+                // Add comments with attachments
+                var commentVMs = new List<CommentVM>();
+                var taskComments = allComments
+                    .Where(c => c.TaskAllocationId == taskAllocation.Id)
+                    .ToList();
+
+                foreach (var comment in taskComments)
                 {
-                    var checkListMapping = checkListMappings.Find(c => c.CheckListId == check.Id);
-                    if (checkListMapping != null)
-                    {
-                        checkList.Add(check.ToCheckListVMFromActivityCheckList(check.ActivityId, true));
-                    }
-                    else
-                    {
-                        checkList.Add(check.ToCheckListVMFromActivityCheckList(check.ActivityId, false));
-                    }
+                    var commentDocIds = attachments
+                        .Where(a => a.ReferenceId == comment.Id)
+                        .Select(a => a.DocumentId)
+                        .ToList();
+
+                    var commentDocs = documents
+                        .Where(d => commentDocIds.Contains(d.Id))
+                        .ToList();
+
+                    var commentVm = comment.ToCommentVMFromTaskComment();
+                    commentVm.PreSignedUrls = commentDocs
+                        .Select(d => _s3Service.GeneratePreSignedUrlAsync(d.S3Key))
+                        .ToList();
+
+                    commentVMs.Add(commentVm);
                 }
-                response.comments = commentVM;
-                response.teamMembers = team;
-                response.CheckList = checkList;
+
+                response.comments = commentVMs;
+
+                // Checklists
+                var activityId = taskAllocation.WorkItem?.ActivityId ?? Guid.Empty;
+
+                var checkLists = await _context.ActivityCheckLists
+                    .Where(c => c.ActivityId == activityId)
+                    .ToListAsync();
+
+                var checkListMappings = await _context.CheckListMappings
+                    .Where(c => c.TaskAllocationId == taskAllocation.Id)
+                    .ToListAsync();
+
+                response.CheckList = checkLists.Select(check =>
+                {
+                    var isChecked = checkListMappings.Any(m => m.CheckListId == check.Id);
+                    return check.ToCheckListVMFromActivityCheckList(check.ActivityId, isChecked);
+                }).ToList();
+
                 tasks.Add(response);
             }
 
-            //}
+            _logger.LogInfo("Task list constructed successfully. Returning {Count} tasks.", tasks.Count);
+
             return Ok(ApiResponse<object>.SuccessResponse(tasks, "Success", 200));
         }
 
         [HttpGet("get/{taskId}")]
         public async Task<IActionResult> GetTask(Guid taskId)
         {
-            if (taskId == Guid.Empty) return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", "Invalid data", 400));
+            _logger.LogInfo("GetTask called with taskId: {TaskId}", taskId);
 
-            var taskAllocation = await _context.TaskAllocations.Include(t => t.Tenant).Include(t => t.Employee).Include(t => t.WorkItem).FirstOrDefaultAsync(t => t.Id == taskId);
-            if (taskAllocation != null && taskAllocation.Employee != null && taskAllocation.Tenant != null)
+            // Validate input
+            if (taskId == Guid.Empty)
             {
-                //var employee = await _context.Employees.FirstOrDefaultAsync(e => e.Id == taskAllocation.AssignedBy);
-                string employeeName = System.String.Format("{0} {1}", taskAllocation.Employee.FirstName, taskAllocation.Employee.LastName);
-                string tenantName = taskAllocation.Tenant.ContactName ?? string.Empty;
-
-                if (taskAllocation == null) return NotFound(ApiResponse<object>.ErrorResponse("Task Not Found", "Task not found", 404));
-                var taskVM = taskAllocation.TaskAllocationToTaskVM(employeeName);
-                var comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
-                var commentIds = comments.Select(c => c.Id).ToList();
-                var taskAttachments = await _context.TaskAttachments.Where(t => t.ReferenceId == taskAllocation.Id || commentIds.Contains(t.ReferenceId)).ToListAsync();
-                var documentIds = taskAttachments.Select(t => t.DocumentId).ToList();
-                var documents = await _context.Documents.Where(d => documentIds.Contains(d.Id)).ToListAsync();
-                var team = await _context.TaskMembers.Where(m => m.TaskAllocationId == taskAllocation.Id).Include(m => m.Employee).ToListAsync();
-                var teamMembers = new List<EmployeeVM> { };
-
-                var taskDocumentIds = taskAttachments.Where(t => t.ReferenceId == taskAllocation.Id).Select(t => t.DocumentId).ToList();
-                var taskDocuments = documents.Where(d => taskDocumentIds.Contains(d.Id)).ToList();
-
-                List<string> taskPreSignedUrls = new List<string>();
-                foreach (var document in taskDocuments)
-                {
-                    string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
-                    taskPreSignedUrls.Add(preSignedUrl);
-                }
-                taskVM.PreSignedUrls = taskPreSignedUrls;
-                foreach (var member in team)
-                {
-                    var result = member.Employee != null ? member.Employee.ToEmployeeVMFromEmployee() : new EmployeeVM();
-                    teamMembers.Add(result);
-                }
-                List<CommentVM> Comments = new List<CommentVM> { };
-                foreach (var comment in comments)
-                {
-                    var commentDocumentIds = taskAttachments.Where(t => t.ReferenceId == comment.Id).Select(t => t.DocumentId).ToList();
-                    var commentDocuments = documents.Where(d => commentDocumentIds.Contains(d.Id)).ToList();
-                    List<string> commentPreSignedUrls = new List<string>();
-                    foreach (var document in commentDocuments)
-                    {
-                        string preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(document.S3Key);
-                        commentPreSignedUrls.Add(preSignedUrl);
-                    }
-                    CommentVM commentVM = comment.ToCommentVMFromTaskComment();
-                    commentVM.PreSignedUrls = commentPreSignedUrls;
-                    Comments.Add(commentVM);
-                }
-                taskVM.Comments = Comments;
-                taskVM.TeamMembers = teamMembers;
-                return Ok(ApiResponse<object>.SuccessResponse(taskVM, "Success", 200));
+                _logger.LogWarning("Invalid taskId provided.");
+                return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", "Invalid data", 400));
             }
 
+            // Fetch Task Allocation with required related data
+            var taskAllocation = await _context.TaskAllocations
+                .Include(t => t.Tenant)
+                .Include(t => t.Employee)
+                .Include(t => t.ReportedBy)
+                .Include(t => t.ApprovedBy)
+                .Include(t => t.WorkItem)
+                .Include(t => t.WorkStatus)
+                .FirstOrDefaultAsync(t => t.Id == taskId);
 
-            return NotFound(ApiResponse<object>.ErrorResponse("Task Not Found", "Task not Found", 404));
+            if (taskAllocation == null)
+            {
+                _logger.LogWarning("Task not found for taskId: {TaskId}", taskId);
+                return NotFound(ApiResponse<object>.ErrorResponse("Task Not Found", "Task not found", 404));
+            }
+
+            if (taskAllocation.Employee == null || taskAllocation.Tenant == null)
+            {
+                _logger.LogWarning("Task found but missing Employee or Tenant data for taskId: {TaskId}", taskId);
+                return NotFound(ApiResponse<object>.ErrorResponse("Task Not Found", "Task not found", 404));
+            }
+
+            _logger.LogInfo("Task allocation found. Preparing response.");
+
+            var taskVM = taskAllocation.TaskAllocationToTaskVM();
+
+            // Fetch comments and attachments
+            _logger.LogInfo("Fetching comments and attachments for taskId: {TaskId}", taskId);
+
+            var comments = await _context.TaskComments
+                .Where(c => c.TaskAllocationId == taskId)
+                .Include(c => c.Employee)
+                .ToListAsync();
+
+            var commentIds = comments.Select(c => c.Id).ToList();
+
+            var taskAttachments = await _context.TaskAttachments
+                .Where(t => t.ReferenceId == taskId || commentIds.Contains(t.ReferenceId))
+                .ToListAsync();
+
+            var documentIds = taskAttachments.Select(t => t.DocumentId).Distinct().ToList();
+
+            var documents = await _context.Documents
+                .Where(d => documentIds.Contains(d.Id))
+                .ToListAsync();
+
+            // Fetch team members
+            _logger.LogInfo("Fetching team members for taskId: {TaskId}", taskId);
+            var team = await _context.TaskMembers
+                .Where(m => m.TaskAllocationId == taskId)
+                .Include(m => m.Employee)
+                .ToListAsync();
+
+            var teamMembers = team
+                .Where(m => m.Employee != null)
+                .Select(m => m.Employee!.ToBasicEmployeeVMFromEmployee())
+                .ToList();
+
+            taskVM.TeamMembers = teamMembers;
+
+            // Attach documents to the main task
+            _logger.LogInfo("Generating presigned URLs for task documents.");
+            var taskDocumentIds = taskAttachments
+                .Where(t => t.ReferenceId == taskId)
+                .Select(t => t.DocumentId)
+                .ToList();
+
+            var taskDocuments = documents
+                .Where(d => taskDocumentIds.Contains(d.Id))
+                .ToList();
+
+            taskVM.PreSignedUrls = taskDocuments
+                .Select(d => _s3Service.GeneratePreSignedUrlAsync(d.S3Key))
+                .ToList();
+
+            // Construct CommentVM list with document URLs
+            _logger.LogInfo("Preparing comment response data.");
+            var commentVMs = comments.Select(comment =>
+            {
+                var commentDocIds = taskAttachments
+                    .Where(t => t.ReferenceId == comment.Id)
+                    .Select(t => t.DocumentId)
+                    .ToList();
+
+                var commentDocs = documents
+                    .Where(d => commentDocIds.Contains(d.Id))
+                    .ToList();
+
+                var commentVM = comment.ToCommentVMFromTaskComment();
+                commentVM.PreSignedUrls = commentDocs
+                    .Select(d => _s3Service.GeneratePreSignedUrlAsync(d.S3Key))
+                    .ToList();
+
+                return commentVM;
+            }).ToList();
+
+            taskVM.Comments = commentVMs;
+
+            _logger.LogInfo("Task details prepared successfully for taskId: {TaskId}", taskId);
+            return Ok(ApiResponse<object>.SuccessResponse(taskVM, "Success", 200));
+        }
+
+        /// <summary>
+        /// Approves a reported task after validation, updates status, and stores attachments/comments.
+        /// </summary>
+        /// <param name="approveTask">DTO containing task approval details.</param>
+        /// <returns>IActionResult indicating success or failure.</returns>
+        [HttpPost("approve")]
+        public async Task<IActionResult> ApproveTask(ApproveTaskDto approveTask)
+        {
+            Guid tenantId = _userHelper.GetTenantId();
+            var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+            _logger.LogInfo("Employee {EmployeeId} is attempting to approve Task {TaskId}", loggedInEmployee.Id, approveTask.Id);
+
+            // Fetch task allocation with work item, only if it's reported
+            var taskAllocation = await _context.TaskAllocations
+                .Include(t => t.WorkItem)
+                .FirstOrDefaultAsync(t => t.Id == approveTask.Id && t.TenantId == tenantId && t.ReportedDate != null);
+
+            if (taskAllocation == null)
+            {
+                _logger.LogWarning("Task {TaskId} not found or not reported yet for Tenant {TenantId} by Employee {EmployeeId}",
+                    approveTask.Id, tenantId, loggedInEmployee.Id);
+
+                return NotFound(ApiResponse<object>.ErrorResponse("Task not found", "Task not found", 404));
+            }
+
+            // Check for permission to approve tasks
+            var hasPermission = await _permissionServices.HasPermission(Approve_Task, loggedInEmployee.Id);
+            if (!hasPermission)
+            {
+                _logger.LogWarning("Employee {EmployeeId} attempted to approve Task {TaskId} without permission", loggedInEmployee.Id, approveTask.Id);
+                return StatusCode(403, ApiResponse<object>.ErrorResponse("You don't have access", "User not authorized to approve tasks", 403));
+            }
+
+            // Validation: Approved task count cannot exceed completed task count
+            if (taskAllocation.CompletedTask < approveTask.ApprovedTask)
+            {
+                _logger.LogWarning("Invalid approval attempt on Task {TaskId}: Approved tasks ({ApprovedTask}) > Completed tasks ({CompletedTask})",
+                    approveTask.Id, approveTask.ApprovedTask, taskAllocation.CompletedTask);
+
+                return BadRequest(ApiResponse<object>.ErrorResponse("Approved tasks cannot be greater than completed tasks",
+                    "Approved tasks cannot be greater than completed tasks", 400));
+            }
+
+            // Update completed work in the associated work item, if it exists
+            if (taskAllocation.WorkItem != null && taskAllocation.CompletedTask != approveTask.ApprovedTask)
+            {
+                if (taskAllocation.CompletedTask > 0)
+                {
+                    taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
+                }
+                taskAllocation.WorkItem.CompletedWork += approveTask.ApprovedTask;
+            }
+
+            // Update task allocation details
+            taskAllocation.ApprovedById = loggedInEmployee.Id;
+            taskAllocation.ApprovedDate = DateTime.UtcNow;
+            taskAllocation.WorkStatusId = approveTask.WorkStatus;
+            taskAllocation.CompletedTask = approveTask.ApprovedTask;
+
+            // Add a comment (optional)
+            var comment = new TaskComment
+            {
+                TaskAllocationId = taskAllocation.Id,
+                CommentDate = DateTime.UtcNow,
+                Comment = approveTask.Comment ?? string.Empty,
+                CommentedBy = loggedInEmployee.Id,
+                TenantId = tenantId
+            };
+            _context.TaskComments.Add(comment);
+
+            // Handle image attachments, if any
+            if (approveTask.Images?.Count > 0)
+            {
+                var workAreaId = taskAllocation.WorkItem?.WorkAreaId;
+                var workArea = await _context.WorkAreas.Include(a => a.Floor)
+                    .FirstOrDefaultAsync(a => a.Id == workAreaId) ?? new WorkArea();
+
+                var buildingId = workArea.Floor?.BuildingId;
+
+                var building = await _context.Buildings
+                    .FirstOrDefaultAsync(b => b.Id == buildingId);
+
+                foreach (var image in approveTask.Images)
+                {
+                    if (string.IsNullOrEmpty(image.Base64Data))
+                    {
+                        _logger.LogWarning("Image for Task {TaskId} is missing base64 data", approveTask.Id);
+                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+                    }
+
+                    var base64 = image.Base64Data.Contains(",") ? image.Base64Data[(image.Base64Data.IndexOf(",") + 1)..] : image.Base64Data;
+
+                    var fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    var fileName = _s3Service.GenerateFileName(fileType, tenantId, "task_comment");
+                    var objectKey = $"tenant-{tenantId}/project-{building?.ProjectId}/Activity/{fileName}";
+
+                    await _s3Service.UploadFileAsync(base64, fileType, objectKey);
+
+                    var document = new Document
+                    {
+                        FileName = fileName,
+                        ContentType = image.ContentType ?? string.Empty,
+                        S3Key = objectKey,
+                        Base64Data = image.Base64Data,
+                        FileSize = image.FileSize,
+                        UploadedAt = DateTime.UtcNow,
+                        TenantId = tenantId
+                    };
+
+                    _context.Documents.Add(document);
+
+                    var attachment = new TaskAttachment
+                    {
+                        DocumentId = document.Id,
+                        ReferenceId = comment.Id
+                    };
+
+                    _context.TaskAttachments.Add(attachment);
+
+                    _logger.LogInfo("Attachment uploaded for Task {TaskId}: {FileName}", approveTask.Id, fileName);
+                }
+            }
+
+            // Commit all changes to the database
+            await _context.SaveChangesAsync();
+
+            _logger.LogInfo("Task {TaskId} successfully approved by Employee {EmployeeId}", approveTask.Id, loggedInEmployee.Id);
+
+            return Ok(ApiResponse<object>.SuccessResponse("Task has been approved", "Task has been approved", 200));
         }
     }
 }
-- 
2.43.0


From 99818c42b0654dee70295ff936308a4189b3a10b Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 16 Jun 2025 16:24:49 +0530
Subject: [PATCH 35/48] Added new API to get list of work status

---
 .../Activities/CreateWorkStatusMasterDto.cs   |  8 +++
 .../Activities/UpdateWorkStatusMasterDto.cs   |  9 +++
 .../Controllers/MasterController.cs           | 62 +++++++++++++++++++
 Marco.Pms.Services/Helpers/MasterHelper.cs    | 45 +++++++++++++-
 4 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 Marco.Pms.Model/Dtos/Activities/CreateWorkStatusMasterDto.cs
 create mode 100644 Marco.Pms.Model/Dtos/Activities/UpdateWorkStatusMasterDto.cs

diff --git a/Marco.Pms.Model/Dtos/Activities/CreateWorkStatusMasterDto.cs b/Marco.Pms.Model/Dtos/Activities/CreateWorkStatusMasterDto.cs
new file mode 100644
index 0000000..b4ff25f
--- /dev/null
+++ b/Marco.Pms.Model/Dtos/Activities/CreateWorkStatusMasterDto.cs
@@ -0,0 +1,8 @@
+namespace Marco.Pms.Model.Dtos.Master
+{
+    public class CreateWorkStatusMasterDto
+    {
+        public string? Name { get; set; }
+        public string? Description { get; set; }
+    }
+}
diff --git a/Marco.Pms.Model/Dtos/Activities/UpdateWorkStatusMasterDto.cs b/Marco.Pms.Model/Dtos/Activities/UpdateWorkStatusMasterDto.cs
new file mode 100644
index 0000000..a40052f
--- /dev/null
+++ b/Marco.Pms.Model/Dtos/Activities/UpdateWorkStatusMasterDto.cs
@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.Dtos.Master
+{
+    public class UpdateWorkStatusMasterDto
+    {
+        public Guid Id { get; set; }
+        public string? Name { get; set; }
+        public string? Description { get; set; }
+    }
+}
diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index 7835e8d..4e6ad8f 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -671,6 +671,68 @@ namespace Marco.Pms.Services.Controllers
             }
         }
 
+        // -------------------------------- Work Status  --------------------------------
+
+        [HttpGet("work-status")]
+        public async Task<IActionResult> GetWorkStatusMasterList()
+        {
+            var response = await _masterHelper.GetWorkStatusList();
+            return StatusCode(response.StatusCode, response);
+        }
+
+        [HttpPost("work-status")]
+        public async Task<IActionResult> CreateWorkStatusMaster([FromBody] CreateWorkStatusMasterDto createWorkStatusDto)
+        {
+            if (!ModelState.IsValid)
+            {
+                var errors = ModelState.Values
+                    .SelectMany(v => v.Errors)
+                    .Select(e => e.ErrorMessage)
+                    .ToList();
+                _logger.LogError("User sent Invalid Date while marking attendance");
+                return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
+            }
+            var response = await _masterHelper.CreateWorkStatus(createWorkStatusDto);
+            if (response.StatusCode == 200)
+            {
+                return Ok(response);
+            }
+            else if (response.StatusCode == 409)
+            {
+                return Conflict(response);
+            }
+            else
+            {
+                return BadRequest(response);
+            }
+        }
+
+        [HttpPost("work-status/edit/{id}")]
+        public async Task<IActionResult> UpdateWorkStatusMaster(Guid id, [FromBody] UpdateWorkStatusMasterDto updateWorkStatusDto)
+        {
+            var response = await _masterHelper.UpdateWorkStatus(id, updateWorkStatusDto);
+            if (response.StatusCode == 200)
+            {
+                return Ok(response);
+            }
+            else if (response.StatusCode == 404)
+            {
+                return NotFound(response);
+            }
+            else
+            {
+                return BadRequest(response);
+
+            }
+        }
+
+        [HttpDelete("work-status/{id}")]
+        public async Task<IActionResult> DeleteWorkStatusMaster(Guid id)
+        {
+            var response = await _masterHelper.DeleteWorkStatus(id);
+            return Ok(response);
+        }
+
         // -------------------------------- Contact Category  --------------------------------
 
         [HttpGet("contact-categories")]
diff --git a/Marco.Pms.Services/Helpers/MasterHelper.cs b/Marco.Pms.Services/Helpers/MasterHelper.cs
index 60d2385..508205b 100644
--- a/Marco.Pms.Services/Helpers/MasterHelper.cs
+++ b/Marco.Pms.Services/Helpers/MasterHelper.cs
@@ -5,6 +5,7 @@ using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Mapper;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Master;
+using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.EntityFrameworkCore;
@@ -16,13 +17,19 @@ namespace Marco.Pms.Services.Helpers
         private readonly ApplicationDbContext _context;
         private readonly ILoggingService _logger;
         private readonly UserHelper _userHelper;
+        private readonly PermissionServices _permissionService;
+        private readonly Guid View_Master;
+        private readonly Guid Manage_Master;
 
 
-        public MasterHelper(ApplicationDbContext context, ILoggingService logger, UserHelper userHelper)
+        public MasterHelper(ApplicationDbContext context, ILoggingService logger, UserHelper userHelper, PermissionServices permissionServices)
         {
             _context = context;
             _logger = logger;
             _userHelper = userHelper;
+            _permissionService = permissionServices;
+            View_Master = Guid.Parse("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d");
+            Manage_Master = Guid.Parse("588a8824-f924-4955-82d8-fc51956cf323");
         }
         // -------------------------------- Contact Category  --------------------------------
         public async Task<ApiResponse<object>> CreateContactCategory(CreateContactCategoryDto contactCategoryDto)
@@ -247,5 +254,41 @@ namespace Marco.Pms.Services.Helpers
             return ApiResponse<object>.SuccessResponse(new { }, "Tag deleted successfully", 200);
         }
 
+        // -------------------------------- Work Status  --------------------------------
+        public async Task<ApiResponse<object>> GetWorkStatusList()
+        {
+            Guid tenantId = _userHelper.GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            bool hasViewPermission = await _permissionService.HasPermission(View_Master, LoggedInEmployee.Id);
+
+            if (!hasViewPermission)
+            {
+                return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+            }
+            var workStatus = await _context.WorkStatusMasters.Where(ws => ws.TenantId == tenantId).Select(ws => new { ws.Id, ws.Name, ws.Description, ws.IsSystem }).ToListAsync();
+
+            return ApiResponse<object>.SuccessResponse(workStatus, $"{workStatus.Count} number of work status fetched successfully", 200);
+
+        }
+        public async Task<ApiResponse<object>> CreateWorkStatus(CreateWorkStatusMasterDto createWorkStatusDto)
+        {
+            Guid tenantId = _userHelper.GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+        }
+        public async Task<ApiResponse<object>> UpdateWorkStatus(Guid id, UpdateWorkStatusMasterDto contacupdateWorkStatusDtotTagDto)
+        {
+            var tenantId = _userHelper.GetTenantId();
+            Employee LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+        }
+        public async Task<ApiResponse<object>> DeleteWorkStatus(Guid id)
+        {
+            Guid tenantId = _userHelper.GetTenantId();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+
+        }
+
     }
 }
-- 
2.43.0


From f20b4a42a18bf44942e7111ee5dd1de19f4380ec Mon Sep 17 00:00:00 2001
From: Pramod Mahajan <pramodmahajan1411200@gmail.com>
Date: Wed, 18 Jun 2025 17:34:33 +0530
Subject: [PATCH 36/48] added new fields inside workItem- parentTaskId and
 Description

---
 ...orkItemForParentId_Description.Designer.cs | 3381 +++++++++++++++++
 ...EnhancedWorkItemForParentId_Description.cs |   41 +
 .../ApplicationDbContextModelSnapshot.cs      |    6 +
 Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs  |    2 +
 Marco.Pms.Model/Mapper/InfraMapper.cs         |    4 +-
 Marco.Pms.Model/Projects/WorkItem.cs          |    6 +
 Marco.Pms.Services/Helpers/DirectoryHelper.cs |    4 +-
 7 files changed, 3441 insertions(+), 3 deletions(-)
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.Designer.cs
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.cs

diff --git a/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.Designer.cs
new file mode 100644
index 0000000..4d39cf1
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.Designer.cs
@@ -0,0 +1,3381 @@
+// <auto-generated />
+using System;
+using Marco.Pms.DataAccess.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250618112021_EnhancedWorkItemForParentId_Description")]
+    partial class EnhancedWorkItemForParentId_Description
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            //MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("ApprovedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ApprovedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AssignedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AssignmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("CompletedTask")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("PlannedTask")
+                        .HasColumnType("double");
+
+                    b.Property<Guid?>("ReportedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReportedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("ReportedTask")
+                        .HasColumnType("double");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkItemId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApprovedById");
+
+                    b.HasIndex("AssignedBy");
+
+                    b.HasIndex("ReportedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkItemId");
+
+                    b.HasIndex("WorkStatusId");
+
+                    b.ToTable("TaskAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ReferenceId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TaskAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CommentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CommentedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentedBy");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskMembers");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ApprovedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AttendanceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("InTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("OutTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ProjectID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Attendes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ActivityTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AttendanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Latitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Longitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("UpdatedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdatedOn")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AttendanceId");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("AttendanceLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MPIN")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MPINToken")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("MPINDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("ExpriesInSec")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OTP")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("OTPDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedByID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedByID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buckets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ContactCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Organization")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactCategoryId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Contacts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactCategoryMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EmailAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactsEmails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactNotes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    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")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactTagId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("ContactTagId");
+
+                    b.ToTable("ContactTagMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactTagMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("RefereanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdateAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("DirectoryUpdateLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("EmployeeBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Base64Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("BatchId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("S3Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ThumbS3Key")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UploadedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AadharNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CurrentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyPhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("JoiningDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MiddleName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PanNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PermanentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.HasIndex("JobRoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("RoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("EmployeeRoleMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeOnly>("EndTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkShifts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsMandatory")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityCheckLists");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("CheckListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FeatureId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeatureId");
+
+                    b.ToTable("FeaturePermissions");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"),
+                            Description = "Access all information related to the project.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "View Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"),
+                            Description = "Potentially edit the project name, description, start/end dates, or status.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"),
+                            Description = "The \"Manage Team\" feature allows authorized users to organize project personnel by adding, removing, and assigning employee to projects.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Team"
+                        },
+                        new
+                        {
+                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "View Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure.",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "Manage Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"),
+                            Description = "Grants a user comprehensive read-only access to all details associated with tasks within a project. This includes task descriptions, statuses, assignees, due dates, dependencies, progress, history, and any related attachments or discussions.",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "View Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("08752f33-3b29-4816-b76b-ea8a968ed3c5"),
+                            Description = "This allows them to create new tasks, modify existing task attributes (description, status, assignee, due date, etc.),",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2"),
+                            Description = "Grants a user the ability to designate team members responsible for specific tasks and to update the completion status or provide progress updates for those tasks",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Assign/Report Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"),
+                            Description = "Grants a user the authority to officially confirm the completion or acceptance of a task, often signifying that it meets the required standards or criteria",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Approve Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                            Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"),
+                            Description = "Grants a user the authority to create new employee profiles and modify existing employee details within the system. This typically includes adding or updating information such as names, contact details, roles, departments, skills, and potentially other personal or professional data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"),
+                            Description = "Grants a user the authority to manage employee application roles, enabling them to assign or revoke access privileges within the system.",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Assign Roles"
+                        },
+                        new
+                        {
+                            Id = new Guid("915e6bff-65f6-4e3f-aea8-3fd217d3ea9e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Team Attendance "
+                        },
+                        new
+                        {
+                            Id = new Guid("57802c4a-00aa-4a1f-a048-fd2f70dd44b6"),
+                            Description = "Grants a user the authority to approve requests from employees to adjust or correct their recorded attendance. This typically involves reviewing the reason for the regularization, verifying any supporting documentation, and then officially accepting the changes to the employee's attendance records",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Regularize Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("ccb0589f-712b-43de-92ed-5b6088e7dc4e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Self Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"),
+                            Description = "Grants a user read-only access to foundational or reference data within the system. \"Masters\" typically refer to predefined lists, categories, or templates that are used throughout the application to standardize information and maintain consistency",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("588a8824-f924-4955-82d8-fc51956cf323"),
+                            Description = "Grants a user the authority to create, modify, and delete foundational or reference data within the system. These \"masters\" are typically the core lists, categories, and configurations that other data and functionalities rely upon, such as departments, job titles, product categories",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("4286a13b-bb40-4879-8c6d-18e9e393beda"),
+                            Description = "Full control over all directories, including the ability to manage permissions for all directories in the system.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Admin"
+                        },
+                        new
+                        {
+                            Id = new Guid("62668630-13ce-4f52-a0f0-db38af2230c5"),
+                            Description = "Full control over directories they created or have been assigned. Can also manage permissions for those directories.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Manager"
+                        },
+                        new
+                        {
+                            Id = new Guid("0f919170-92d4-4337-abd3-49b66fc871bb"),
+                            Description = "Full control over directories they created. Can view contacts in directories they either created or were assigned to. Can manage permissions only for directories they created.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory User"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.Property<Guid>("ApplicationRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FeaturePermissionId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("ApplicationRoleId", "FeaturePermissionId");
+
+                    b.HasIndex("FeaturePermissionId");
+
+                    b.ToTable("RolePermissionMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DomainName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OnBoardingDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IndustryId");
+
+                    b.ToTable("Tenants");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b3466e83-7e11-464c-b93a-daf047838b26"),
+                            ContactName = "Admin",
+                            ContactNumber = "123456789",
+                            Description = "",
+                            DomainName = "www.marcobms.org",
+                            IndustryId = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            IsActive = true,
+                            Name = "MarcoBMS",
+                            OnBoardingDate = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            OragnizationSize = "100-200"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("CommentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MessageText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentMessageId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("SentAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TicketComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("LinkedActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("LinkedProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("PriorityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("StatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PriorityId");
+
+                    b.HasIndex("StatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("Tickets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketTags");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTypeMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTypeMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("c74e5480-2b71-483c-8f4a-1a9c69c32603"),
+                            Description = "An identified problem that affects the performance, reliability, or standards of a product or service",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("d1f55eab-9898-4e46-9f03-b263e33e5d38"),
+                            Description = "A support service that assists users with technical issues, requests, or inquiries.",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("MailListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Recipient")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Schedule")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MailListId");
+
+                    b.ToTable("MailDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmailId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailingList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Keywords")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailingList");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ActivityName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("UnitOfMeasurement")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ActivityMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("ModuleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModuleId");
+
+                    b.ToTable("Features");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            Description = "Manage Project",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            Description = "Manage Infra",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            Description = "Manage Tasks",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Task Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            Description = "Manage Employee",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Employee Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            Description = "Attendance",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            Description = "Global Masters",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Global Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            Description = "Managing all directory related rights",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Directory Management"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Industry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Industries");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            Name = "Information Technology (IT) Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("0a63e657-2c5f-49b5-854b-42c978293154"),
+                            Name = "Manufacturing & Production"
+                        },
+                        new
+                        {
+                            Id = new Guid("bdc61e3b-69ea-4394-bab6-079ec135b5bd"),
+                            Name = "Energy & Resources"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ca200ac-00d7-415e-a410-b948e27ac9d2"),
+                            Name = "Finance & Professional Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("d5621700-cd87-441f-8cdb-6051ddfc83b4"),
+                            Name = "Hospitals and Healthcare Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("23608891-657e-40f0-bbd4-2b0a2ec1a76f"),
+                            Name = "Social Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("a493f4e3-16b1-4411-be3c-6bf2987a3168"),
+                            Name = "Retail & Consumer Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("e9d8ce92-9371-4ed9-9831-83c07f78edec"),
+                            Name = "Transportation & Logistics"
+                        },
+                        new
+                        {
+                            Id = new Guid("8a0d6134-2dbe-4e0a-b250-ff34cb7b9df0"),
+                            Name = "Education & Training"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Module", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Modules");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Description = "Project Module",
+                            Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02",
+                            Name = "Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Description = "Employee Module",
+                            Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637",
+                            Name = "Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Description = "Masters Module",
+                            Key = "504ec132-e6a9-422f-8f85-050602cfce05",
+                            Name = "Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("StatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            Status = "Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Status = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "On Hold",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
+                            Status = "Completed",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketPriorityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Level")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketPriorityMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("188d29b3-10f3-42d0-9587-1a46ae7a0320"),
+                            ColorCode = "008000",
+                            IsDefault = true,
+                            Level = 1,
+                            Name = "Low",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("0919bc84-9f82-4ecf-98c7-962755dd9a97"),
+                            ColorCode = "FFFF00",
+                            IsDefault = true,
+                            Level = 2,
+                            Name = "Medium",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 3,
+                            Name = "High",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 4,
+                            Name = "Critical",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("44a7b91d-a0dd-45d1-8616-4d2f71e16401"),
+                            ColorCode = "#FF0000",
+                            IsDefault = true,
+                            Level = 5,
+                            Name = "Urgent",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6b0c409b-3e80-4165-8b39-f3fcacb4c797"),
+                            ColorCode = "#FFCC99",
+                            Description = "This is a newly created issue.",
+                            IsDefault = true,
+                            Name = "New",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("6c5ac37d-5b7d-40f3-adec-2dabaa5cca86"),
+                            ColorCode = "#E6FF99",
+                            Description = "Assigned to employee or team of employees",
+                            IsDefault = true,
+                            Name = "Assigned",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("7f96bcd5-0c66-411b-8a1d-9d1a4785194e"),
+                            ColorCode = "#99E6FF",
+                            Description = "These issues are currently in progress",
+                            IsDefault = true,
+                            Name = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5c72b630-6923-4215-bf2c-b1622afd76e7"),
+                            ColorCode = "#6c757d",
+                            Description = "These issues are currently under review",
+                            IsDefault = true,
+                            Name = "In Review",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("8ff85685-a875-4f21-aa95-d99551315fcc"),
+                            ColorCode = "#B399FF",
+                            Description = "The following issues are resolved and closed",
+                            IsDefault = true,
+                            Name = "Done",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTagMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("ef6c2a65-f61d-4537-9650-a7ab7f8d98db"),
+                            ColorCode = "#e59866",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5a168569-8ad7-4422-8db6-51ef25caddeb"),
+                            ColorCode = "#85c1e9",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkCategoryMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("86bb2cc8-f6b5-4fdd-bbee-c389c713a44b"),
+                            Description = "Created new task in a professional or creative context",
+                            IsSystem = true,
+                            Name = "Fresh Work",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("9ebfa19c-53b9-481b-b863-c25d2f843201"),
+                            Description = "Revising, modifying, or correcting a task to improve its quality or fix issues",
+                            IsSystem = true,
+                            Name = "Rework",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("11a79929-1d07-42dc-9e98-82d0d2f4a240"),
+                            Description = "Any defect, deviation, or non-conformance in a task that fails to meet established standards or customer expectations.",
+                            IsSystem = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("030bb085-e230-4370-aec7-9a74d652864e"),
+                            Description = "Confirm the tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("2a1a5b96-cf93-4111-b4b1-76c19d6333b4"),
+                            Description = "Not all tasks are actually finished as reported",
+                            IsSystem = true,
+                            Name = "Partially Approve",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("00a062e6-62e6-42c5-b6b1-024328651b72"),
+                            Description = "Tasks are not finished as reported or have any issues in al the tasks",
+                            IsSystem = true,
+                            Name = "NCR",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buildings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BuildingId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Floor");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProjectAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ShortName")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectStatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Projects");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("85bf587b-7ca9-4685-b77c-d817f5847e85"),
+                            ContactPerson = "Project 1 Contact Person",
+                            EndDate = new DateTime(2026, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            Name = "Project 1",
+                            ProjectAddress = "Project 1 Address",
+                            ProjectStatusId = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            StartDate = new DateTime(2025, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReAllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ProjectAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AreaName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FloorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FloorId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkAreas");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("CompletedWork")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("PlannedWork")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime>("TaskDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkAreaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActivityId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkAreaId");
+
+                    b.HasIndex("WorkCategoryId");
+
+                    b.ToTable("WorkItems");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ApplicationRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("JobRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Utilities.Inquiries", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("About")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrganizatioinName")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Inquiries");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("varchar(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator().HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("IsRootUser")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ApprovedBy")
+                        .WithMany()
+                        .HasForeignKey("ApprovedById");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("AssignedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "ReportedBy")
+                        .WithMany()
+                        .HasForeignKey("ReportedById");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem")
+                        .WithMany()
+                        .HasForeignKey("WorkItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkStatusMaster", "WorkStatus")
+                        .WithMany()
+                        .HasForeignKey("WorkStatusId");
+
+                    b.Navigation("ApprovedBy");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("ReportedBy");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkItem");
+
+                    b.Navigation("WorkStatus");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("CommentedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Approver")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Approver");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.AttendanceModule.Attendance", "Attendance")
+                        .WithMany()
+                        .HasForeignKey("AttendanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.DocumentManager.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedByEmployee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy");
+
+                    b.Navigation("Attendance");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedByEmployee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedByID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.ContactCategoryMaster", "ContactCategory")
+                        .WithMany()
+                        .HasForeignKey("ContactCategoryId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ContactCategory");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Createdby")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Createdby");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.ContactTagMaster", "ContactTag")
+                        .WithMany()
+                        .HasForeignKey("ContactTagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("ContactTag");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationUser", "ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.HasOne("Marco.Pms.Model.Roles.JobRole", "JobRole")
+                        .WithMany()
+                        .HasForeignKey("JobRoleId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("JobRole");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Role");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Feature", "Feature")
+                        .WithMany("FeaturePermissions")
+                        .HasForeignKey("FeatureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feature");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.FeaturePermission", null)
+                        .WithMany()
+                        .HasForeignKey("FeaturePermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Industry", "Industry")
+                        .WithMany()
+                        .HasForeignKey("IndustryId");
+
+                    b.Navigation("Industry");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Forum.TicketComment", "TicketComment")
+                        .WithMany("Attachments")
+                        .HasForeignKey("CommentId");
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ticket");
+
+                    b.Navigation("TicketComment");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketPriorityMaster", "Priority")
+                        .WithMany()
+                        .HasForeignKey("PriorityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.TicketStatusMaster", "TicketStatusMaster")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketTypeMaster", "TicketTypeMaster")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Priority");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("TicketStatusMaster");
+
+                    b.Navigation("TicketTypeMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketTagMaster", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+
+                    b.Navigation("Ticket");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Mail.MailingList", "MailBody")
+                        .WithMany()
+                        .HasForeignKey("MailListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MailBody");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Module", "Module")
+                        .WithMany()
+                        .HasForeignKey("ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Building", "Building")
+                        .WithMany()
+                        .HasForeignKey("BuildingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Building");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.StatusMaster", "ProjectStatus")
+                        .WithMany()
+                        .HasForeignKey("ProjectStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProjectStatus");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .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("Employee");
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Floor", "Floor")
+                        .WithMany()
+                        .HasForeignKey("FloorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Floor");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.ActivityMaster", "ActivityMaster")
+                        .WithMany()
+                        .HasForeignKey("ActivityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea")
+                        .WithMany()
+                        .HasForeignKey("WorkAreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkCategoryMaster", "WorkCategoryMaster")
+                        .WithMany()
+                        .HasForeignKey("WorkCategoryId");
+
+                    b.Navigation("ActivityMaster");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkArea");
+
+                    b.Navigation("WorkCategoryMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Navigation("FeaturePermissions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.cs b/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.cs
new file mode 100644
index 0000000..c4a12fd
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250618112021_EnhancedWorkItemForParentId_Description.cs
@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class EnhancedWorkItemForParentId_Description : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Description",
+                table: "WorkItems",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "ParentTaskId",
+                table: "WorkItems",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Description",
+                table: "WorkItems");
+
+            migrationBuilder.DropColumn(
+                name: "ParentTaskId",
+                table: "WorkItems");
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
index 9bf43db..cb07f1e 100644
--- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -2182,6 +2182,12 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<double>("CompletedWork")
                         .HasColumnType("double");
 
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentTaskId")
+                        .HasColumnType("char(36)");
+
                     b.Property<double>("PlannedWork")
                         .HasColumnType("double");
 
diff --git a/Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs b/Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs
index c2fc990..e6ba436 100644
--- a/Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs
+++ b/Marco.Pms.Model/Dtos/Projects/WorkItemDot.cs
@@ -11,5 +11,7 @@ namespace Marco.Pms.Model.Dtos.Project
         public Guid ActivityID { get; set; }
         public int PlannedWork { get; set; }
         public int CompletedWork { get; set; }
+        public Guid? ParentTaskId { get; set; }
+        public string? Comment { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Mapper/InfraMapper.cs b/Marco.Pms.Model/Mapper/InfraMapper.cs
index f6fec5b..4ccb7c8 100644
--- a/Marco.Pms.Model/Mapper/InfraMapper.cs
+++ b/Marco.Pms.Model/Mapper/InfraMapper.cs
@@ -59,7 +59,9 @@ namespace Marco.Pms.Model.Mapper
                 WorkCategoryId = model.WorkCategoryId,
                 TaskDate = DateTime.Now,
                 TenantId = tenantId,
-                WorkAreaId = model.WorkAreaID
+                WorkAreaId = model.WorkAreaID,
+                ParentTaskId = model.ParentTaskId,
+                Description = model.Comment
 
             };
         }
diff --git a/Marco.Pms.Model/Projects/WorkItem.cs b/Marco.Pms.Model/Projects/WorkItem.cs
index 150ffc2..9596dc3 100644
--- a/Marco.Pms.Model/Projects/WorkItem.cs
+++ b/Marco.Pms.Model/Projects/WorkItem.cs
@@ -20,11 +20,17 @@ namespace Marco.Pms.Model.Projects
         [ValidateNever]
         public ActivityMaster? ActivityMaster { get; set; }
 
+
         [ForeignKey("WorkCategoryId")]
         [ValidateNever]
         public WorkCategoryMaster? WorkCategoryMaster { get; set; }
+
+        public Guid? ParentTaskId { get; set; } 
+
         public double PlannedWork { get; set; }
         public double CompletedWork { get; set; }
+
+        public string? Description { get; set; } 
         public DateTime TaskDate { get; set; }
     }
 }
diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
index d34b0d3..d14e44c 100644
--- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs
+++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
@@ -903,11 +903,11 @@ namespace Marco.Pms.Services.Helpers
                 List<ContactNote> notes = new List<ContactNote>();
                 if (active)
                 {
-                    notes = await _context.ContactNotes.Where(n => n.ContactId == contact.Id && n.IsActive && n.TenantId == tenantId).ToListAsync();
+                    notes = await _context.ContactNotes.Include(n => n.Createdby).Where(n => n.ContactId == contact.Id && n.IsActive && n.TenantId == tenantId).ToListAsync();
                 }
                 else
                 {
-                    notes = await _context.ContactNotes.Where(n => n.ContactId == contact.Id && n.TenantId == tenantId).ToListAsync();
+                    notes = await _context.ContactNotes.Include(n => n.Createdby).Where(n => n.ContactId == contact.Id && n.TenantId == tenantId).ToListAsync();
                 }
                 var noteIds = notes.Select(n => n.Id).ToList();
                 List<DirectoryUpdateLog>? updateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.RefereanceId)).ToListAsync();
-- 
2.43.0


From 5bc13e215df20e612a8e69c0e8ebb2ed499e2482 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 16 Jun 2025 16:58:56 +0530
Subject: [PATCH 37/48] Added CRUD operation APIs for work Status master table

---
 .../Controllers/MasterController.cs           |  29 +--
 Marco.Pms.Services/Helpers/MasterHelper.cs    | 198 ++++++++++++++++--
 2 files changed, 181 insertions(+), 46 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index 4e6ad8f..ebd8998 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -693,44 +693,21 @@ namespace Marco.Pms.Services.Controllers
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
             }
             var response = await _masterHelper.CreateWorkStatus(createWorkStatusDto);
-            if (response.StatusCode == 200)
-            {
-                return Ok(response);
-            }
-            else if (response.StatusCode == 409)
-            {
-                return Conflict(response);
-            }
-            else
-            {
-                return BadRequest(response);
-            }
+            return StatusCode(response.StatusCode, response);
         }
 
         [HttpPost("work-status/edit/{id}")]
         public async Task<IActionResult> UpdateWorkStatusMaster(Guid id, [FromBody] UpdateWorkStatusMasterDto updateWorkStatusDto)
         {
             var response = await _masterHelper.UpdateWorkStatus(id, updateWorkStatusDto);
-            if (response.StatusCode == 200)
-            {
-                return Ok(response);
-            }
-            else if (response.StatusCode == 404)
-            {
-                return NotFound(response);
-            }
-            else
-            {
-                return BadRequest(response);
-
-            }
+            return StatusCode(response.StatusCode, response);
         }
 
         [HttpDelete("work-status/{id}")]
         public async Task<IActionResult> DeleteWorkStatusMaster(Guid id)
         {
             var response = await _masterHelper.DeleteWorkStatus(id);
-            return Ok(response);
+            return StatusCode(response.StatusCode, response);
         }
 
         // -------------------------------- Contact Category  --------------------------------
diff --git a/Marco.Pms.Services/Helpers/MasterHelper.cs b/Marco.Pms.Services/Helpers/MasterHelper.cs
index 508205b..115b4b6 100644
--- a/Marco.Pms.Services/Helpers/MasterHelper.cs
+++ b/Marco.Pms.Services/Helpers/MasterHelper.cs
@@ -3,6 +3,7 @@ using Marco.Pms.Model.Directory;
 using Marco.Pms.Model.Dtos.Master;
 using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Mapper;
+using Marco.Pms.Model.Master;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Master;
 using Marco.Pms.Services.Service;
@@ -257,38 +258,195 @@ namespace Marco.Pms.Services.Helpers
         // -------------------------------- Work Status  --------------------------------
         public async Task<ApiResponse<object>> GetWorkStatusList()
         {
-            Guid tenantId = _userHelper.GetTenantId();
-            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
-            bool hasViewPermission = await _permissionService.HasPermission(View_Master, LoggedInEmployee.Id);
+            _logger.LogInfo("GetWorkStatusList called.");
 
-            if (!hasViewPermission)
+            try
             {
-                return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+                // Step 1: Get tenant and logged-in employee info
+                Guid tenantId = _userHelper.GetTenantId();
+                var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+                // Step 2: Check permission to view master data
+                bool hasViewPermission = await _permissionService.HasPermission(View_Master, loggedInEmployee.Id);
+                if (!hasViewPermission)
+                {
+                    _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id);
+                    return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+                }
+
+                // Step 3: Fetch work statuses for the tenant
+                var workStatusList = await _context.WorkStatusMasters
+                    .Where(ws => ws.TenantId == tenantId)
+                    .Select(ws => new
+                    {
+                        ws.Id,
+                        ws.Name,
+                        ws.Description,
+                        ws.IsSystem
+                    })
+                    .ToListAsync();
+
+                _logger.LogInfo("{Count} work statuses fetched for tenantId: {TenantId}", workStatusList.Count, tenantId);
+
+                // Step 4: Return successful response
+                return ApiResponse<object>.SuccessResponse(
+                    workStatusList,
+                    $"{workStatusList.Count} work status records fetched successfully",
+                    200
+                );
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error occurred while fetching work status list : {Error}", ex.Message);
+                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to fetch work status list", 500);
             }
-            var workStatus = await _context.WorkStatusMasters.Where(ws => ws.TenantId == tenantId).Select(ws => new { ws.Id, ws.Name, ws.Description, ws.IsSystem }).ToListAsync();
-
-            return ApiResponse<object>.SuccessResponse(workStatus, $"{workStatus.Count} number of work status fetched successfully", 200);
-
         }
         public async Task<ApiResponse<object>> CreateWorkStatus(CreateWorkStatusMasterDto createWorkStatusDto)
         {
-            Guid tenantId = _userHelper.GetTenantId();
-            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
-            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+            _logger.LogInfo("CreateWorkStatus called with Name: {Name}", createWorkStatusDto.Name ?? "");
+
+            try
+            {
+                // Step 1: Get tenant and logged-in employee
+                Guid tenantId = _userHelper.GetTenantId();
+                var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+                // Step 2: Check if user has permission to manage master data
+                var hasManageMasterPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id);
+                if (!hasManageMasterPermission)
+                {
+                    _logger.LogWarning("Access denied for employeeId: {EmployeeId}", loggedInEmployee.Id);
+                    return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+                }
+
+                // Step 3: Check if work status with the same name already exists
+                var existingWorkStatus = await _context.WorkStatusMasters
+                    .FirstOrDefaultAsync(ws => ws.Name == createWorkStatusDto.Name && ws.TenantId == tenantId);
+
+                if (existingWorkStatus != null)
+                {
+                    _logger.LogWarning("Work status already exists: {Name}", createWorkStatusDto.Name ?? "");
+                    return ApiResponse<object>.ErrorResponse("Work status already exists", "Work status already exists", 400);
+                }
+
+                // Step 4: Create new WorkStatusMaster entry
+                var workStatus = new WorkStatusMaster
+                {
+                    Name = createWorkStatusDto.Name?.Trim() ?? "",
+                    Description = createWorkStatusDto.Description?.Trim() ?? "",
+                    IsSystem = false,
+                    TenantId = tenantId
+                };
+
+                _context.WorkStatusMasters.Add(workStatus);
+                await _context.SaveChangesAsync();
+
+                _logger.LogInfo("Work status created successfully: {Id}, Name: {Name}", workStatus.Id, workStatus.Name);
+                return ApiResponse<object>.SuccessResponse(workStatus, "Work status created successfully", 200);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error occurred while creating work status : {Error}", ex.Message);
+                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to create work status", 500);
+            }
         }
-        public async Task<ApiResponse<object>> UpdateWorkStatus(Guid id, UpdateWorkStatusMasterDto contacupdateWorkStatusDtotTagDto)
+        public async Task<ApiResponse<object>> UpdateWorkStatus(Guid id, UpdateWorkStatusMasterDto updateWorkStatusDto)
         {
-            var tenantId = _userHelper.GetTenantId();
-            Employee LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
-            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+            _logger.LogInfo("UpdateWorkStatus called for WorkStatus ID: {Id}, New Name: {Name}", id, updateWorkStatusDto.Name ?? "");
+
+            try
+            {
+                // Step 1: Get tenant and employee info
+                Guid tenantId = _userHelper.GetTenantId();
+                var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+                // Step 2: Check permission to update master
+                var hasManageMasterPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id);
+                if (!hasManageMasterPermission)
+                {
+                    _logger.LogWarning("Update denied. EmployeeId: {EmployeeId} does not have Manage Master permission.", loggedInEmployee.Id);
+                    return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+                }
+
+                // Step 3: Retrieve existing work status by id and tenant
+                var workStatus = await _context.WorkStatusMasters
+                    .FirstOrDefaultAsync(ws => ws.Id == id && ws.TenantId == tenantId);
+
+                if (workStatus == null)
+                {
+                    _logger.LogWarning("Work status not found for Id: {Id}", id);
+                    return ApiResponse<object>.ErrorResponse("Work status not found", "Work status not found", 404);
+                }
+
+                // Step 4: Update fields
+                workStatus.Name = updateWorkStatusDto.Name?.Trim() ?? "";
+                workStatus.Description = updateWorkStatusDto.Description?.Trim() ?? "";
+
+                await _context.SaveChangesAsync();
+
+                _logger.LogInfo("Work status updated successfully. Id: {Id}", workStatus.Id);
+                return ApiResponse<object>.SuccessResponse(workStatus, "Work status updated successfully", 200);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error occurred while updating work status Id: {Id} : {Error}", id, ex.Message);
+                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to update work status", 500);
+            }
         }
         public async Task<ApiResponse<object>> DeleteWorkStatus(Guid id)
         {
-            Guid tenantId = _userHelper.GetTenantId();
-            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
-            return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+            _logger.LogInfo("DeleteWorkStatus called for Id: {Id}", id);
 
+            try
+            {
+                // Step 1: Get current tenant and logged-in employee
+                Guid tenantId = _userHelper.GetTenantId();
+                var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+                // Step 2: Check permission to manage master data
+                var hasManageMasterPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id);
+                if (!hasManageMasterPermission)
+                {
+                    _logger.LogWarning("Delete denied. EmployeeId: {EmployeeId} lacks Manage_Master permission.", loggedInEmployee.Id);
+                    return ApiResponse<object>.ErrorResponse("You don't have access", "Access denied for deleting work status", 403);
+                }
+
+                // Step 3: Find the work status
+                var workStatus = await _context.WorkStatusMasters
+                    .FirstOrDefaultAsync(ws => ws.Id == id && ws.TenantId == tenantId);
+
+                if (workStatus == null)
+                {
+                    _logger.LogWarning("Work status not found for Id: {Id}", id);
+                    return ApiResponse<object>.ErrorResponse("Work status not found", "Work status not found", 404);
+                }
+
+                // Step 4: Check for dependencies in TaskAllocations
+                bool hasDependency = await _context.TaskAllocations
+                    .AnyAsync(ta => ta.TenantId == tenantId && ta.WorkStatusId == id);
+
+                if (hasDependency)
+                {
+                    _logger.LogWarning("Cannot delete WorkStatus Id: {Id} due to existing task dependency", id);
+                    return ApiResponse<object>.ErrorResponse(
+                        "Work status has a dependency in assigned tasks and cannot be deleted",
+                        "Deletion failed due to associated tasks",
+                        400
+                    );
+                }
+
+                // Step 5: Delete and persist
+                _context.WorkStatusMasters.Remove(workStatus);
+                await _context.SaveChangesAsync();
+
+                _logger.LogInfo("Work status deleted successfully. Id: {Id}", id);
+                return ApiResponse<object>.SuccessResponse(new { }, "Work status deleted successfully", 200);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError("Error occurred while deleting WorkStatus Id: {Id} : {Error}", id, ex.Message);
+                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to delete work status", 500);
+            }
         }
-
     }
 }
-- 
2.43.0


From 2e925efcf7d1a0954b2cda28b6e2939622669c3d Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 16 Jun 2025 17:19:59 +0530
Subject: [PATCH 38/48] Added code to validate the id received by path
 parameter with id received by payload

---
 Marco.Pms.Services/Helpers/MasterHelper.cs | 39 ++++++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/Marco.Pms.Services/Helpers/MasterHelper.cs b/Marco.Pms.Services/Helpers/MasterHelper.cs
index 115b4b6..0698733 100644
--- a/Marco.Pms.Services/Helpers/MasterHelper.cs
+++ b/Marco.Pms.Services/Helpers/MasterHelper.cs
@@ -356,41 +356,58 @@ namespace Marco.Pms.Services.Helpers
 
             try
             {
-                // Step 1: Get tenant and employee info
+                // Step 1: Validate input
+                if (id == Guid.Empty || id != updateWorkStatusDto.Id)
+                {
+                    _logger.LogWarning("Invalid ID provided for update. Route ID: {RouteId}, DTO ID: {DtoId}", id, updateWorkStatusDto.Id);
+                    return ApiResponse<object>.ErrorResponse("Invalid data provided", "The provided work status ID is invalid", 400);
+                }
+
+                // Step 2: Get tenant and logged-in employee
                 Guid tenantId = _userHelper.GetTenantId();
                 var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
 
-                // Step 2: Check permission to update master
+                // Step 3: Check permissions
                 var hasManageMasterPermission = await _permissionService.HasPermission(Manage_Master, loggedInEmployee.Id);
                 if (!hasManageMasterPermission)
                 {
-                    _logger.LogWarning("Update denied. EmployeeId: {EmployeeId} does not have Manage Master permission.", loggedInEmployee.Id);
-                    return ApiResponse<object>.ErrorResponse("You don't have access", "Don't have access to take action", 403);
+                    _logger.LogWarning("Access denied. EmployeeId: {EmployeeId} does not have Manage Master permission.", loggedInEmployee.Id);
+                    return ApiResponse<object>.ErrorResponse("Access denied", "You do not have permission to update this work status", 403);
                 }
 
-                // Step 3: Retrieve existing work status by id and tenant
+                // Step 4: Retrieve the work status record
                 var workStatus = await _context.WorkStatusMasters
                     .FirstOrDefaultAsync(ws => ws.Id == id && ws.TenantId == tenantId);
 
                 if (workStatus == null)
                 {
-                    _logger.LogWarning("Work status not found for Id: {Id}", id);
-                    return ApiResponse<object>.ErrorResponse("Work status not found", "Work status not found", 404);
+                    _logger.LogWarning("Work status not found for ID: {Id}", id);
+                    return ApiResponse<object>.ErrorResponse("Work status not found", "No work status found with the provided ID", 404);
                 }
 
-                // Step 4: Update fields
+                // Step 5: Check for duplicate name (optional)
+                var isDuplicate = await _context.WorkStatusMasters
+                    .AnyAsync(ws => ws.Name == updateWorkStatusDto.Name && ws.Id != id && ws.TenantId == tenantId);
+
+                if (isDuplicate)
+                {
+                    _logger.LogWarning("Duplicate work status name '{Name}' detected during update. ID: {Id}", updateWorkStatusDto.Name ?? "", id);
+                    return ApiResponse<object>.ErrorResponse("Work status with the same name already exists", "Duplicate name", 400);
+                }
+
+                // Step 6: Update fields
                 workStatus.Name = updateWorkStatusDto.Name?.Trim() ?? "";
                 workStatus.Description = updateWorkStatusDto.Description?.Trim() ?? "";
 
                 await _context.SaveChangesAsync();
 
-                _logger.LogInfo("Work status updated successfully. Id: {Id}", workStatus.Id);
+                _logger.LogInfo("Work status updated successfully. ID: {Id}", id);
                 return ApiResponse<object>.SuccessResponse(workStatus, "Work status updated successfully", 200);
             }
             catch (Exception ex)
             {
-                _logger.LogError("Error occurred while updating work status Id: {Id} : {Error}", id, ex.Message);
-                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to update work status", 500);
+                _logger.LogError("Error occurred while updating work status ID: {Id} : {Error}", id, ex.Message);
+                return ApiResponse<object>.ErrorResponse("An error occurred", "Unable to update the work status at this time", 500);
             }
         }
         public async Task<ApiResponse<object>> DeleteWorkStatus(Guid id)
-- 
2.43.0


From c9bb18d8e5ec26a3c8ec3058ddd37c01bea5fe47 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 18 Jun 2025 19:08:06 +0530
Subject: [PATCH 39/48] Optimized the task management API

---
 .../Controllers/ProjectController.cs          | 120 +++++++++++-------
 1 file changed, 71 insertions(+), 49 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 9f1131e..1dc9ccf 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -578,7 +578,6 @@ namespace MarcoBMS.Services.Controllers
                             projectIds.Add(projectAllocation.ProjectId);
                         }
 
-
                     }
                     catch (Exception ex)
                     {
@@ -596,59 +595,82 @@ namespace MarcoBMS.Services.Controllers
         }
 
         [HttpPost("task")]
-        public async Task<IActionResult> CreateProjectTask(List<WorkItemDot> workItemDot)
+        public async Task<IActionResult> CreateProjectTask(List<WorkItemDot> workItemDtos)
         {
-            Guid tenantId = GetTenantId();
-            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
-            List<WorkItemVM> workItems = new List<WorkItemVM> { };
-            List<Guid> projectIds = new List<Guid>();
-            string message = "";
-            string responseMessage = "";
-            if (workItemDot != null)
+            _logger.LogInfo("CreateProjectTask called with {Count} items", workItemDtos?.Count ?? 0);
+
+            // Validate request
+            if (workItemDtos == null || !workItemDtos.Any())
             {
-                foreach (var item in workItemDot)
-                {
-                    WorkItem workItem = item.ToWorkItemFromWorkItemDto(tenantId);
-
-                    var workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == workItem.WorkAreaId) ?? new WorkArea();
-
-                    Building building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty)) ?? new Building();
-
-                    if (item.Id != null)
-                    {
-                        //update
-                        _context.WorkItems.Update(workItem);
-                        await _context.SaveChangesAsync();
-                        responseMessage = "Task Updated Successfully";
-                        message = $"Task Updated in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
-                    }
-                    else
-                    {
-                        //create
-                        _context.WorkItems.Add(workItem);
-                        await _context.SaveChangesAsync();
-                        responseMessage = "Task Added Successfully";
-                        message = $"Task Added in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
-                    }
-                    var result = new WorkItemVM
-                    {
-                        WorkItemId = workItem.Id,
-                        WorkItem = workItem
-                    };
-                    workItems.Add(result);
-                    projectIds.Add(building.ProjectId);
-                }
-                var activity = await _context.ActivityMasters.ToListAsync();
-                var category = await _context.WorkCategoryMasters.ToListAsync();
-
-                var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectIds = projectIds, Message = message };
-
-                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
-                return Ok(ApiResponse<object>.SuccessResponse(workItems, responseMessage, 200));
+                _logger.LogWarning("No work items provided in the request.");
+                return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Work Item details are not valid.", 400));
             }
 
-            return BadRequest(ApiResponse<object>.ErrorResponse("Invalid details.", "Work Item Details are not valid.", 400));
+            Guid tenantId = GetTenantId();
+            var workItemsToCreate = new List<WorkItem>();
+            var workItemsToUpdate = new List<WorkItem>();
+            var responseList = new List<WorkItemVM>();
+            var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            string message = "";
+            List<Guid> projectIds = new List<Guid>();
 
+            foreach (var itemDto in workItemDtos)
+            {
+                var workItem = itemDto.ToWorkItemFromWorkItemDto(tenantId);
+                var workArea = await _context.WorkAreas.Include(a => a.Floor).FirstOrDefaultAsync(a => a.Id == workItem.WorkAreaId) ?? new WorkArea();
+
+                Building building = await _context.Buildings.FirstOrDefaultAsync(b => b.Id == (workArea.Floor != null ? workArea.Floor.BuildingId : Guid.Empty)) ?? new Building();
+
+                if (itemDto.Id != null && itemDto.Id != Guid.Empty)
+                {
+                    // Update existing
+                    workItemsToUpdate.Add(workItem);
+                    message = $"Task Added in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
+                }
+                else
+                {
+                    // Create new
+                    workItem.Id = Guid.NewGuid();
+                    workItemsToCreate.Add(workItem);
+                    message = $"Task Updated in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
+                }
+
+                responseList.Add(new WorkItemVM
+                {
+                    WorkItemId = workItem.Id,
+                    WorkItem = workItem
+                });
+                projectIds.Add(building.ProjectId);
+            }
+            string responseMessage = "";
+            // Apply DB changes
+            if (workItemsToCreate.Any())
+            {
+                _logger.LogInfo("Adding {Count} new work items", workItemsToCreate.Count);
+                await _context.WorkItems.AddRangeAsync(workItemsToCreate);
+                responseMessage = "Task Added Successfully";
+
+            }
+
+            if (workItemsToUpdate.Any())
+            {
+                _logger.LogInfo("Updating {Count} existing work items", workItemsToUpdate.Count);
+                _context.WorkItems.UpdateRange(workItemsToUpdate);
+                responseMessage = "Task Updated Successfully";
+
+            }
+
+            await _context.SaveChangesAsync();
+
+            _logger.LogInfo("CreateProjectTask completed successfully. Created: {Created}, Updated: {Updated}", workItemsToCreate.Count, workItemsToUpdate.Count);
+
+
+
+            var notification = new { LoggedInUserId = LoggedInEmployee.Id, Keyword = "Infra", ProjectIds = projectIds, Message = message };
+
+            await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
+
+            return Ok(ApiResponse<object>.SuccessResponse(responseList, responseMessage, 200));
         }
 
         [HttpDelete("task/{id}")]
-- 
2.43.0


From a6a842bf104eb22305a8230f0b5299f53b53388a Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 19 Jun 2025 07:30:55 -0400
Subject: [PATCH 40/48] Fixed rebase issues

---
 Marco.Pms.Services/Controllers/ProjectController.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 1dc9ccf..6b83a6c 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -625,14 +625,14 @@ namespace MarcoBMS.Services.Controllers
                 {
                     // Update existing
                     workItemsToUpdate.Add(workItem);
-                    message = $"Task Added in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
+                    message = $"Task Updated in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
                 }
                 else
                 {
                     // Create new
                     workItem.Id = Guid.NewGuid();
                     workItemsToCreate.Add(workItem);
-                    message = $"Task Updated in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
+                    message = $"Task Added in Building: {building.Name}, on Floor: {workArea.Floor?.FloorName}, in Area: {workArea.AreaName} by {LoggedInEmployee.FirstName} {LoggedInEmployee.LastName}";
                 }
 
                 responseList.Add(new WorkItemVM
-- 
2.43.0


From 64a7cde69cb655b48ad5ccdfc40ed0ad1e257f19 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Thu, 19 Jun 2025 18:28:57 +0530
Subject: [PATCH 41/48] Implemented signalR in record-mobile API

---
 .../Controllers/AttendanceController.cs       | 326 +++++++-----------
 1 file changed, 127 insertions(+), 199 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs
index 3181ce9..d23a007 100644
--- a/Marco.Pms.Services/Controllers/AttendanceController.cs
+++ b/Marco.Pms.Services/Controllers/AttendanceController.cs
@@ -597,257 +597,185 @@ namespace MarcoBMS.Services.Controllers
         {
             if (!ModelState.IsValid)
             {
-                var errors = ModelState.Values
-                    .SelectMany(v => v.Errors)
-                    .Select(e => e.ErrorMessage)
-                    .ToList();
-                _logger.LogError("User sent Invalid Date while marking attendance");
+                var errors = ModelState.Values.SelectMany(v => v.Errors).Select(e => e.ErrorMessage).ToList();
+                _logger.LogError("Invalid attendance model received.");
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid data", errors, 400));
             }
 
-            Guid TenantId = GetTenantId();
+            Guid tenantId = GetTenantId();
+            var currentEmployee = await _userHelper.GetCurrentEmployeeAsync();
 
             using var transaction = await _context.Database.BeginTransactionAsync();
             try
             {
-                Attendance? attendance = await _context.Attendes.FirstOrDefaultAsync(a => a.Id == recordAttendanceDot.Id && a.TenantId == TenantId); ;
-
+                // Validate mark time
                 if (recordAttendanceDot.MarkTime == null)
                 {
-                    _logger.LogError("User sent Invalid Mark Time while marking attendance");
-                    return BadRequest(ApiResponse<object>.ErrorResponse("Invalid Mark Time", "Invalid Mark Time", 400));
+                    _logger.LogWarning("Null mark time provided.");
+                    return BadRequest(ApiResponse<object>.ErrorResponse("Invalid Mark Time", "Mark time is required", 400));
                 }
 
-                DateTime finalDateTime = GetDateFromTimeStamp(recordAttendanceDot.Date, recordAttendanceDot.MarkTime);
-                if (recordAttendanceDot.Comment == null)
+                if (string.IsNullOrWhiteSpace(recordAttendanceDot.Comment))
                 {
-                    _logger.LogError("User sent Invalid comment while marking attendance");
-                    return BadRequest(ApiResponse<object>.ErrorResponse("Invalid Comment", "Invalid Comment", 400));
+                    _logger.LogWarning("Empty comment provided.");
+                    return BadRequest(ApiResponse<object>.ErrorResponse("Invalid Comment", "Comment is required", 400));
                 }
 
-                if (attendance != null)
+                var finalDateTime = GetDateFromTimeStamp(recordAttendanceDot.Date, recordAttendanceDot.MarkTime);
+                var attendance = await _context.Attendes
+                    .FirstOrDefaultAsync(a => a.Id == recordAttendanceDot.Id && a.TenantId == tenantId);
+
+                // Create or update attendance
+                if (attendance == null)
                 {
-                    attendance.Comment = recordAttendanceDot.Comment;
-                    if (recordAttendanceDot.Action == ATTENDANCE_MARK_TYPE.CHECK_IN)
+                    attendance = new Attendance
                     {
-                        attendance.InTime = finalDateTime;
-                        attendance.OutTime = null;
-                        attendance.Activity = ATTENDANCE_MARK_TYPE.CHECK_OUT;
-                    }
-                    else if (recordAttendanceDot.Action == ATTENDANCE_MARK_TYPE.CHECK_OUT)
-                    {
-                        attendance.IsApproved = true;
-                        attendance.Activity = ATTENDANCE_MARK_TYPE.REGULARIZE;
-
-
-                        //string timeString = "10:30 PM"; // Format: "hh:mm tt"
-
-                        attendance.OutTime = finalDateTime;
-                    }
-                    else if (recordAttendanceDot.Action == ATTENDANCE_MARK_TYPE.REQUEST_REGULARIZE)
-                    {
-                        DateTime date = attendance.AttendanceDate;
-                        finalDateTime = GetDateFromTimeStamp(date.Date, recordAttendanceDot.MarkTime);
-                        if (attendance.InTime < finalDateTime)
-                        {
-                            attendance.OutTime = finalDateTime;
-                            attendance.Activity = ATTENDANCE_MARK_TYPE.REQUEST_REGULARIZE;
-                        }
-                        else
-                        {
-                            _logger.LogError("Employee {EmployeeId} sent regularization request but it check-out time is earlier than check-out");
-                            return BadRequest(ApiResponse<object>.ErrorResponse("Check-out time must be later than check-in time", "Check-out time must be later than check-in time", 400));
-                        }
-                        // do nothing
-                    }
-                    else if (recordAttendanceDot.Action == ATTENDANCE_MARK_TYPE.REGULARIZE)
-                    {
-                        attendance.IsApproved = true;
-                        attendance.Activity = ATTENDANCE_MARK_TYPE.REGULARIZE;
-                        // do nothing
-                    }
-                    else if (recordAttendanceDot.Action == ATTENDANCE_MARK_TYPE.REGULARIZE_REJECT)
-                    {
-                        attendance.IsApproved = false;
-                        attendance.Activity = ATTENDANCE_MARK_TYPE.REGULARIZE_REJECT;
-                        // do nothing
-                    }
-                    attendance.Date = DateTime.UtcNow;
-
-                    // update code
-                    _context.Attendes.Update(attendance);
+                        TenantId = tenantId,
+                        AttendanceDate = recordAttendanceDot.Date,
+                        Comment = recordAttendanceDot.Comment,
+                        EmployeeID = recordAttendanceDot.EmployeeID,
+                        ProjectID = recordAttendanceDot.ProjectID,
+                        Date = DateTime.UtcNow,
+                        InTime = finalDateTime,
+                        Activity = ATTENDANCE_MARK_TYPE.CHECK_OUT
+                    };
+                    _context.Attendes.Add(attendance);
                 }
                 else
                 {
-                    attendance = new Attendance();
-                    attendance.TenantId = TenantId;
-                    attendance.AttendanceDate = recordAttendanceDot.Date;
-                    // attendance.Activity = recordAttendanceDot.Action;
                     attendance.Comment = recordAttendanceDot.Comment;
-                    attendance.EmployeeID = recordAttendanceDot.EmployeeID;
-                    attendance.ProjectID = recordAttendanceDot.ProjectID;
                     attendance.Date = DateTime.UtcNow;
 
+                    switch (recordAttendanceDot.Action)
+                    {
+                        case ATTENDANCE_MARK_TYPE.CHECK_IN:
+                            attendance.InTime = finalDateTime;
+                            attendance.OutTime = null;
+                            attendance.Activity = ATTENDANCE_MARK_TYPE.CHECK_OUT;
+                            break;
+                        case ATTENDANCE_MARK_TYPE.CHECK_OUT:
+                            attendance.OutTime = finalDateTime;
+                            attendance.Activity = ATTENDANCE_MARK_TYPE.REGULARIZE;
+                            attendance.IsApproved = true;
+                            break;
+                        case ATTENDANCE_MARK_TYPE.REQUEST_REGULARIZE:
+                            DateTime date = attendance.InTime ?? recordAttendanceDot.Date;
+                            finalDateTime = GetDateFromTimeStamp(date.Date, recordAttendanceDot.MarkTime);
+                            if (attendance.InTime < finalDateTime)
+                            {
+                                attendance.OutTime = finalDateTime;
+                                attendance.Activity = ATTENDANCE_MARK_TYPE.REQUEST_REGULARIZE;
+                            }
+                            else
+                            {
+                                _logger.LogWarning("Regularization check-out time is before check-in.");
+                                return BadRequest(ApiResponse<object>.ErrorResponse("Check-out time must be later than check-in time", "Invalid regularization", 400));
+                            }
+                            break;
+                        case ATTENDANCE_MARK_TYPE.REGULARIZE:
+                            attendance.IsApproved = true;
+                            attendance.Activity = ATTENDANCE_MARK_TYPE.REGULARIZE;
+                            break;
+                        case ATTENDANCE_MARK_TYPE.REGULARIZE_REJECT:
+                            attendance.IsApproved = false;
+                            attendance.Activity = ATTENDANCE_MARK_TYPE.REGULARIZE_REJECT;
+                            break;
+                    }
 
-
-                    attendance.InTime = finalDateTime;
-                    attendance.OutTime = null;
-                    attendance.Activity = ATTENDANCE_MARK_TYPE.CHECK_OUT;
-
-                    _context.Attendes.Add(attendance);
-
+                    _context.Attendes.Update(attendance);
                 }
+
+                // Upload image if present
                 Document? document = null;
-                var Image = recordAttendanceDot.Image;
-                var preSignedUrl = string.Empty;
+                string? preSignedUrl = null;
 
-                if (Image != null && Image.ContentType != null)
+                if (recordAttendanceDot.Image != null && recordAttendanceDot.Image.ContentType != null)
                 {
+                    string base64 = recordAttendanceDot.Image.Base64Data?.Split(',').LastOrDefault() ?? "";
+                    if (string.IsNullOrWhiteSpace(base64))
+                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Image data missing", 400));
 
-                    if (string.IsNullOrEmpty(Image.Base64Data))
-                        return BadRequest(ApiResponse<object>.ErrorResponse("Base64 data is missing", "Base64 data is missing", 400));
+                    var fileType = _s3Service.GetContentTypeFromBase64(base64);
+                    var fileName = _s3Service.GenerateFileName(fileType, tenantId, "attendance");
+                    var objectKey = $"tenant-{tenantId}/Employee/{recordAttendanceDot.EmployeeID}/Attendance/{fileName}";
 
-                    //If base64 has a data URI prefix, strip it
-                    var base64 = Image.Base64Data.Contains(",")
-                        ? Image.Base64Data.Substring(Image.Base64Data.IndexOf(",") + 1)
-                        : Image.Base64Data;
-
-                    string fileType = _s3Service.GetContentTypeFromBase64(base64);
-                    string fileName = _s3Service.GenerateFileName(fileType, TenantId, "attendance");
-
-                    string objectKey = $"tenant-{TenantId}/Employee/{recordAttendanceDot.EmployeeID}/Attendance/{fileName}";
                     await _s3Service.UploadFileAsync(base64, fileType, objectKey);
                     preSignedUrl = _s3Service.GeneratePreSignedUrlAsync(objectKey);
 
                     document = new Document
                     {
-                        FileName = Image.FileName ?? "",
-                        ContentType = Image.ContentType,
+                        FileName = recordAttendanceDot.Image.FileName ?? "",
+                        ContentType = recordAttendanceDot.Image.ContentType,
                         S3Key = objectKey,
-                        Base64Data = Image.Base64Data,
-                        FileSize = Image.FileSize,
+                        Base64Data = recordAttendanceDot.Image.Base64Data,
+                        FileSize = recordAttendanceDot.Image.FileSize,
                         UploadedAt = recordAttendanceDot.Date,
-                        TenantId = TenantId
+                        TenantId = tenantId
                     };
+
                     _context.Documents.Add(document);
-
-
-                    await _context.SaveChangesAsync();
                 }
 
-
-
-
-                // Step 3: Always insert a new log entry
-                if (document != null)
+                // Log attendance
+                var attendanceLog = new AttendanceLog
                 {
-                    var attendanceLog = new AttendanceLog
-                    {
-                        AttendanceId = attendance.Id, // Use existing or new AttendanceId
-                        Activity = attendance.Activity,
+                    AttendanceId = attendance.Id,
+                    Activity = attendance.Activity,
+                    ActivityTime = finalDateTime,
+                    Comment = recordAttendanceDot.Comment,
+                    EmployeeID = recordAttendanceDot.EmployeeID,
+                    Latitude = recordAttendanceDot.Latitude,
+                    Longitude = recordAttendanceDot.Longitude,
+                    DocumentId = document?.Id,
+                    TenantId = tenantId,
+                    UpdatedBy = recordAttendanceDot.EmployeeID,
+                    UpdatedOn = recordAttendanceDot.Date
+                };
+                _context.AttendanceLogs.Add(attendanceLog);
 
-                        ActivityTime = finalDateTime,
-                        Comment = recordAttendanceDot.Comment,
-                        EmployeeID = recordAttendanceDot.EmployeeID,
-                        Latitude = recordAttendanceDot.Latitude,
-                        Longitude = recordAttendanceDot.Longitude,
-                        DocumentId = document.Id,
-                        TenantId = TenantId,
-                        UpdatedBy = recordAttendanceDot.EmployeeID,
-                        UpdatedOn = recordAttendanceDot.Date
-                    };
-                    _context.AttendanceLogs.Add(attendanceLog);
-                }
-                else
-                {
-                    var attendanceLog = new AttendanceLog
-                    {
-                        AttendanceId = attendance.Id, // Use existing or new AttendanceId
-                        Activity = attendance.Activity,
-
-                        ActivityTime = finalDateTime,
-                        Comment = recordAttendanceDot.Comment,
-                        EmployeeID = recordAttendanceDot.EmployeeID,
-                        Latitude = recordAttendanceDot.Latitude,
-                        Longitude = recordAttendanceDot.Longitude,
-                        DocumentId = document != null ? document.Id : null,
-                        TenantId = TenantId,
-                        UpdatedBy = recordAttendanceDot.EmployeeID,
-                        UpdatedOn = recordAttendanceDot.Date
-                    };
-                    _context.AttendanceLogs.Add(attendanceLog);
-                }
-
-                //if (recordAttendanceDot.Image != null && recordAttendanceDot.Image.Count > 0)
-                //{
-                //    attendanceLog.Photo = recordAttendanceDot.Image[0].Base64Data;
-                //}
                 await _context.SaveChangesAsync();
+                await transaction.CommitAsync();
 
-                await transaction.CommitAsync(); // Commit transaction
-
-                Employee employee = await _employeeHelper.GetEmployeeByID(recordAttendanceDot.EmployeeID);
-                if (employee.JobRole != null)
+                // Construct view model
+                var employee = await _employeeHelper.GetEmployeeByID(recordAttendanceDot.EmployeeID);
+                var vm = new EmployeeAttendanceVM
                 {
-                    EmployeeAttendanceVM vm = new EmployeeAttendanceVM();
-                    if (document != null)
-                    {
-                        vm = new EmployeeAttendanceVM()
-                        {
-                            CheckInTime = attendance.InTime,
-                            CheckOutTime = attendance.OutTime,
-                            EmployeeAvatar = null,
-                            EmployeeId = recordAttendanceDot.EmployeeID,
-                            FirstName = employee.FirstName,
-                            LastName = employee.LastName,
-                            Id = attendance.Id,
-                            Activity = attendance.Activity,
-                            JobRoleName = employee.JobRole.Name,
-                            DocumentId = document.Id,
-                            ThumbPreSignedUrl = preSignedUrl,
-                            PreSignedUrl = preSignedUrl
-                        };
-                    }
-                    else
-                    {
-                        vm = new EmployeeAttendanceVM()
-                        {
-                            CheckInTime = attendance.InTime,
-                            CheckOutTime = attendance.OutTime,
-                            EmployeeAvatar = null,
-                            EmployeeId = recordAttendanceDot.EmployeeID,
-                            FirstName = employee.FirstName,
-                            LastName = employee.LastName,
-                            Id = attendance.Id,
-                            Activity = attendance.Activity,
-                            JobRoleName = employee.JobRole.Name,
-                            DocumentId = Guid.Empty,
-                            ThumbPreSignedUrl = string.Empty,
-                            PreSignedUrl = string.Empty
-                        };
-                    }
+                    Id = attendance.Id,
+                    EmployeeId = employee.Id,
+                    FirstName = employee.FirstName,
+                    LastName = employee.LastName,
+                    CheckInTime = attendance.InTime,
+                    CheckOutTime = attendance.OutTime,
+                    Activity = attendance.Activity,
+                    JobRoleName = employee.JobRole?.Name,
+                    DocumentId = document?.Id ?? Guid.Empty,
+                    ThumbPreSignedUrl = preSignedUrl ?? "",
+                    PreSignedUrl = preSignedUrl ?? ""
+                };
 
-                    _logger.LogInfo("Attendance for employee {FirstName} {LastName} has been marked", employee.FirstName ?? string.Empty, employee.LastName ?? string.Empty);
-                    return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
-                }
-                _logger.LogInfo("Attendance for employee {FirstName} {LastName} has been marked", employee.FirstName ?? string.Empty, employee.LastName ?? string.Empty);
-                return Ok(ApiResponse<object>.SuccessResponse(new EmployeeAttendanceVM(), "Attendance marked successfully.", 200));
+                var notification = new
+                {
+                    LoggedInUserId = currentEmployee.Id,
+                    Keyword = "Attendance",
+                    Activity = recordAttendanceDot.Id == Guid.Empty ? 1 : 0,
+                    ProjectId = attendance.ProjectID,
+                    Response = vm
+                };
 
+                await _signalR.Clients.All.SendAsync("NotificationEventHandler", notification);
+
+                _logger.LogInfo("Attendance recorded for employee: {FullName}", $"{employee.FirstName} {employee.LastName}");
+
+                return Ok(ApiResponse<object>.SuccessResponse(vm, "Attendance marked successfully.", 200));
             }
             catch (Exception ex)
             {
-                await transaction.RollbackAsync(); // Rollback on failure
-                _logger.LogError("{Error} while marking attendance", ex.Message);
-                var response = new
-                {
-                    message = ex.Message,
-                    detail = ex.StackTrace,
-                    statusCode = StatusCodes.Status500InternalServerError
-                };
-                return BadRequest(ApiResponse<object>.ErrorResponse(ex.Message, response, 400));
+                await transaction.RollbackAsync();
+                _logger.LogError("Error while recording attendance : {Error}", ex.Message);
+                return BadRequest(ApiResponse<object>.ErrorResponse("Something went wrong", ex.Message, 500));
             }
-
         }
+
         private static DateTime GetDateFromTimeStamp(DateTime date, string timeString)
         {
             //DateTime date = recordAttendanceDot.Date;
-- 
2.43.0


From b78c5c07c50648089b0b81a5798af52146d984aa Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 20 Jun 2025 12:45:35 +0530
Subject: [PATCH 42/48] Added a new API in dashbased ot check attendance
 overview of  specifec project for give number of days

---
 .../DashBoard/AttendanceOverviewVM.cs         |  9 +++
 .../Controllers/DashboardController.cs        | 65 +++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 Marco.Pms.Model/ViewModels/DashBoard/AttendanceOverviewVM.cs

diff --git a/Marco.Pms.Model/ViewModels/DashBoard/AttendanceOverviewVM.cs b/Marco.Pms.Model/ViewModels/DashBoard/AttendanceOverviewVM.cs
new file mode 100644
index 0000000..e1e626e
--- /dev/null
+++ b/Marco.Pms.Model/ViewModels/DashBoard/AttendanceOverviewVM.cs
@@ -0,0 +1,9 @@
+namespace Marco.Pms.Model.ViewModels.DashBoard
+{
+    public class AttendanceOverviewVM
+    {
+        public string? Role { get; set; }
+        public string? Date { get; set; }
+        public int Present { get; set; }
+    }
+}
diff --git a/Marco.Pms.Services/Controllers/DashboardController.cs b/Marco.Pms.Services/Controllers/DashboardController.cs
index c22ca18..8a51336 100644
--- a/Marco.Pms.Services/Controllers/DashboardController.cs
+++ b/Marco.Pms.Services/Controllers/DashboardController.cs
@@ -354,5 +354,70 @@ namespace Marco.Pms.Services.Controllers
             _logger.LogInfo($"Record of performed activities for project {projectId} for date {currentDate.Date} by employee {LoggedInEmployee.Id}");
             return Ok(ApiResponse<object>.SuccessResponse(report, $"Record of performed activities for project {project.Name} for date {currentDate.Date}", 200));
         }
+
+        [HttpGet("attendance-overview/{projectId}")]
+        public async Task<IActionResult> GetAttendanceOverView(Guid projectId, [FromQuery] string days)
+        {
+            _logger.LogInfo("GetAttendanceOverView called for ProjectId: {ProjectId}, Days: {Days}", projectId, days);
+
+            if (!int.TryParse(days, out int dayCount) || dayCount <= 0)
+            {
+                return BadRequest(ApiResponse<object>.ErrorResponse("Invalid number of days", "Days must be a positive integer", 400));
+            }
+
+            DateTime today = DateTime.UtcNow.Date;
+            DateTime startDate = today.AddDays(-dayCount);
+
+            // Step 1: Get project allocations and related job roles
+            var allocations = await _context.ProjectAllocations
+                .Where(pa => pa.ProjectId == projectId)
+                .ToListAsync();
+
+            var jobRoleIds = allocations.Select(pa => pa.JobRoleId).Distinct().ToList();
+            var jobRoles = await _context.JobRoles
+                .Where(jr => jobRoleIds.Contains(jr.Id))
+                .ToListAsync();
+
+            // Step 2: Get attendance records for the given range
+            var attendances = await _context.Attendes
+                .Where(a => a.ProjectID == projectId
+                    && a.InTime.HasValue
+                    && a.InTime.Value.Date >= startDate
+                    && a.InTime.Value.Date <= today)
+                .ToListAsync();
+
+            var result = new List<AttendanceOverviewVM>();
+
+            // Step 3: Generate report per day and job role
+            for (DateTime date = today; date >= startDate; date = date.AddDays(-1))
+            {
+                foreach (var jobRole in jobRoles)
+                {
+                    var employeeIds = allocations
+                        .Where(pa => pa.JobRoleId == jobRole.Id)
+                        .Select(pa => pa.EmployeeId)
+                        .ToList();
+
+                    var count = attendances
+                        .Count(a => employeeIds.Contains(a.EmployeeID) && a.InTime!.Value.Date == date);
+
+                    result.Add(new AttendanceOverviewVM
+                    {
+                        Role = jobRole.Name,
+                        Date = date.ToString("yyyy-MM-dd"),
+                        Present = count
+                    });
+                }
+            }
+
+            var ordered = result
+                .OrderByDescending(r => r.Date)
+                .ThenByDescending(r => r.Present)
+                .ToList();
+
+            _logger.LogInfo("Attendance overview fetched for ProjectId: {ProjectId}, Total Records: {Count}", projectId, ordered.Count);
+
+            return Ok(ApiResponse<object>.SuccessResponse(ordered, $"{ordered.Count} records fetched for attendance overview", 200));
+        }
     }
 }
-- 
2.43.0


From 82ebd07d6170dea0fbce41fa3fd9cca52cc4f2d5 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 20 Jun 2025 13:09:13 +0530
Subject: [PATCH 43/48] Added project validation in attendance Overview API

---
 .../Controllers/DashboardController.cs        | 67 ++++++++++++++-----
 1 file changed, 51 insertions(+), 16 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/DashboardController.cs b/Marco.Pms.Services/Controllers/DashboardController.cs
index 8a51336..8ed0ba0 100644
--- a/Marco.Pms.Services/Controllers/DashboardController.cs
+++ b/Marco.Pms.Services/Controllers/DashboardController.cs
@@ -5,6 +5,7 @@ using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.DashBoard;
+using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
@@ -21,11 +22,13 @@ namespace Marco.Pms.Services.Controllers
         private readonly ApplicationDbContext _context;
         private readonly UserHelper _userHelper;
         private readonly ILoggingService _logger;
-        public DashboardController(ApplicationDbContext context, UserHelper userHelper, ILoggingService logger)
+        private readonly PermissionServices _permissionServices;
+        public DashboardController(ApplicationDbContext context, UserHelper userHelper, ILoggingService logger, PermissionServices permissionServices)
         {
             _context = context;
             _userHelper = userHelper;
             _logger = logger;
+            _permissionServices = permissionServices;
         }
         [HttpGet("progression")]
         public async Task<IActionResult> GetGraph([FromQuery] double days, [FromQuery] string FromDate, [FromQuery] Guid? projectId)
@@ -360,36 +363,67 @@ namespace Marco.Pms.Services.Controllers
         {
             _logger.LogInfo("GetAttendanceOverView called for ProjectId: {ProjectId}, Days: {Days}", projectId, days);
 
+            // Step 1: Validate project existence
+            var project = await _context.Projects.AsNoTracking().FirstOrDefaultAsync(p => p.Id == projectId);
+            if (project == null)
+            {
+                _logger.LogWarning("Project not found for ProjectId: {ProjectId}", projectId);
+                return BadRequest(ApiResponse<object>.ErrorResponse("Project not found", "Project not found", 400));
+            }
+
+            // Step 2: Permission check
+            var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            bool hasAssigned = await _permissionServices.HasProjectPermission(loggedInEmployee, projectId.ToString());
+
+            if (!hasAssigned)
+            {
+                _logger.LogWarning("Unauthorized access attempt. EmployeeId: {EmployeeId}, ProjectId: {ProjectId}", loggedInEmployee.Id, projectId);
+                return StatusCode(403, ApiResponse<object>.ErrorResponse(
+                    "You don't have permission to access this feature",
+                    "You don't have permission to access this feature", 403));
+            }
+
+            // Step 3: Validate and parse days input
             if (!int.TryParse(days, out int dayCount) || dayCount <= 0)
             {
+                _logger.LogWarning("Invalid days input received: {Days}", days);
                 return BadRequest(ApiResponse<object>.ErrorResponse("Invalid number of days", "Days must be a positive integer", 400));
             }
 
+            // Step 4: Define date range
             DateTime today = DateTime.UtcNow.Date;
             DateTime startDate = today.AddDays(-dayCount);
 
-            // Step 1: Get project allocations and related job roles
+            // Step 5: Load project allocations and related job roles
             var allocations = await _context.ProjectAllocations
                 .Where(pa => pa.ProjectId == projectId)
                 .ToListAsync();
 
+            if (!allocations.Any())
+            {
+                _logger.LogInfo("No employee allocations found for project: {ProjectId}", projectId);
+                return Ok(ApiResponse<object>.SuccessResponse(new List<AttendanceOverviewVM>(), "No allocations found", 200));
+            }
+
             var jobRoleIds = allocations.Select(pa => pa.JobRoleId).Distinct().ToList();
+
             var jobRoles = await _context.JobRoles
                 .Where(jr => jobRoleIds.Contains(jr.Id))
                 .ToListAsync();
 
-            // Step 2: Get attendance records for the given range
+            // Step 6: Load attendance records for given date range
             var attendances = await _context.Attendes
-                .Where(a => a.ProjectID == projectId
-                    && a.InTime.HasValue
-                    && a.InTime.Value.Date >= startDate
-                    && a.InTime.Value.Date <= today)
+                .Where(a =>
+                    a.ProjectID == projectId &&
+                    a.InTime.HasValue &&
+                    a.InTime.Value.Date >= startDate &&
+                    a.InTime.Value.Date <= today)
                 .ToListAsync();
 
-            var result = new List<AttendanceOverviewVM>();
+            var overviewList = new List<AttendanceOverviewVM>();
 
-            // Step 3: Generate report per day and job role
-            for (DateTime date = today; date >= startDate; date = date.AddDays(-1))
+            // Step 7: Process attendance per date per role
+            for (DateTime date = today; date > startDate; date = date.AddDays(-1))
             {
                 foreach (var jobRole in jobRoles)
                 {
@@ -398,26 +432,27 @@ namespace Marco.Pms.Services.Controllers
                         .Select(pa => pa.EmployeeId)
                         .ToList();
 
-                    var count = attendances
+                    int presentCount = attendances
                         .Count(a => employeeIds.Contains(a.EmployeeID) && a.InTime!.Value.Date == date);
 
-                    result.Add(new AttendanceOverviewVM
+                    overviewList.Add(new AttendanceOverviewVM
                     {
                         Role = jobRole.Name,
                         Date = date.ToString("yyyy-MM-dd"),
-                        Present = count
+                        Present = presentCount
                     });
                 }
             }
 
-            var ordered = result
+            // Step 8: Order result for consistent presentation
+            var sortedResult = overviewList
                 .OrderByDescending(r => r.Date)
                 .ThenByDescending(r => r.Present)
                 .ToList();
 
-            _logger.LogInfo("Attendance overview fetched for ProjectId: {ProjectId}, Total Records: {Count}", projectId, ordered.Count);
+            _logger.LogInfo("Attendance overview fetched. ProjectId: {ProjectId}, Records: {Count}", projectId, sortedResult.Count);
 
-            return Ok(ApiResponse<object>.SuccessResponse(ordered, $"{ordered.Count} records fetched for attendance overview", 200));
+            return Ok(ApiResponse<object>.SuccessResponse(sortedResult, $"{sortedResult.Count} records fetched for attendance overview", 200));
         }
     }
 }
-- 
2.43.0


From 72a92417b51b37be2d8c919e41f9df370f3f4244 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 23 Jun 2025 14:50:50 +0530
Subject: [PATCH 44/48] Implemented An API to get list of all notes

---
 ...ontacts_And_ContactNotes_Table.Designer.cs | 3280 +++++++++++++++++
 ...edBy_In_Contacts_And_ContactNotes_Table.cs |  101 +
 .../ApplicationDbContextModelSnapshot.cs      |   28 +
 Marco.Pms.Model/Directory/Contact.cs          |    6 +
 Marco.Pms.Model/Directory/ContactNote.cs      |    6 +
 Marco.Pms.Model/Mapper/DirectoryMapper.cs     |    2 +
 .../Controllers/DirectoryController.cs        |    7 +
 Marco.Pms.Services/Helpers/DirectoryHelper.cs |  147 +-
 8 files changed, 3557 insertions(+), 20 deletions(-)
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.Designer.cs
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.cs

diff --git a/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.Designer.cs
new file mode 100644
index 0000000..11dc500
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.Designer.cs
@@ -0,0 +1,3280 @@
+// <auto-generated />
+using System;
+using Marco.Pms.DataAccess.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table")]
+    partial class Added_UpdatedBy_In_Contacts_And_ContactNotes_Table
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            //MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AssignedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AssignmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("CompletedTask")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("PlannedTask")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime?>("ReportedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkItemId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssignedBy");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkItemId");
+
+                    b.ToTable("TaskAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CommentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CommentedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentedBy");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskMembers");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ApprovedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AttendanceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("InTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("OutTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ProjectID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Attendes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ActivityTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AttendanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Latitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Longitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("UpdatedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdatedOn")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AttendanceId");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("AttendanceLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MPIN")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MPINToken")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("MPINDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("ExpriesInSec")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OTP")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("OTPDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedByID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedByID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buckets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ContactCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Organization")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid?>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactCategoryId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("Contacts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactCategoryMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EmailAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactsEmails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid?>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("ContactNotes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    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")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactTagId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("ContactTagId");
+
+                    b.ToTable("ContactTagMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactTagMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("RefereanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdateAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("DirectoryUpdateLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("EmployeeBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Base64Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("BatchId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("S3Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ThumbS3Key")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UploadedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AadharNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CurrentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyPhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("JoiningDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MiddleName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PanNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PermanentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.HasIndex("JobRoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("RoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("EmployeeRoleMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeOnly>("EndTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkShifts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsMandatory")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityCheckLists");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("CheckListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FeatureId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeatureId");
+
+                    b.ToTable("FeaturePermissions");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"),
+                            Description = "Access all information related to the project.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "View Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"),
+                            Description = "Potentially edit the project name, description, start/end dates, or status.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"),
+                            Description = "The \"Manage Team\" feature allows authorized users to organize project personnel by adding, removing, and assigning employee to projects.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Team"
+                        },
+                        new
+                        {
+                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "View Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure.",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "Manage Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"),
+                            Description = "Grants a user comprehensive read-only access to all details associated with tasks within a project. This includes task descriptions, statuses, assignees, due dates, dependencies, progress, history, and any related attachments or discussions.",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "View Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("08752f33-3b29-4816-b76b-ea8a968ed3c5"),
+                            Description = "This allows them to create new tasks, modify existing task attributes (description, status, assignee, due date, etc.),",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2"),
+                            Description = "Grants a user the ability to designate team members responsible for specific tasks and to update the completion status or provide progress updates for those tasks",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Assign/Report Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"),
+                            Description = "Grants a user the authority to officially confirm the completion or acceptance of a task, often signifying that it meets the required standards or criteria",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Approve Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                            Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"),
+                            Description = "Grants a user the authority to create new employee profiles and modify existing employee details within the system. This typically includes adding or updating information such as names, contact details, roles, departments, skills, and potentially other personal or professional data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"),
+                            Description = "Grants a user the authority to manage employee application roles, enabling them to assign or revoke access privileges within the system.",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Assign Roles"
+                        },
+                        new
+                        {
+                            Id = new Guid("915e6bff-65f6-4e3f-aea8-3fd217d3ea9e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Team Attendance "
+                        },
+                        new
+                        {
+                            Id = new Guid("57802c4a-00aa-4a1f-a048-fd2f70dd44b6"),
+                            Description = "Grants a user the authority to approve requests from employees to adjust or correct their recorded attendance. This typically involves reviewing the reason for the regularization, verifying any supporting documentation, and then officially accepting the changes to the employee's attendance records",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Regularize Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("ccb0589f-712b-43de-92ed-5b6088e7dc4e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Self Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"),
+                            Description = "Grants a user read-only access to foundational or reference data within the system. \"Masters\" typically refer to predefined lists, categories, or templates that are used throughout the application to standardize information and maintain consistency",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("588a8824-f924-4955-82d8-fc51956cf323"),
+                            Description = "Grants a user the authority to create, modify, and delete foundational or reference data within the system. These \"masters\" are typically the core lists, categories, and configurations that other data and functionalities rely upon, such as departments, job titles, product categories",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("4286a13b-bb40-4879-8c6d-18e9e393beda"),
+                            Description = "Full control over all directories, including the ability to manage permissions for all directories in the system.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Admin"
+                        },
+                        new
+                        {
+                            Id = new Guid("62668630-13ce-4f52-a0f0-db38af2230c5"),
+                            Description = "Full control over directories they created or have been assigned. Can also manage permissions for those directories.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Manager"
+                        },
+                        new
+                        {
+                            Id = new Guid("0f919170-92d4-4337-abd3-49b66fc871bb"),
+                            Description = "Full control over directories they created. Can view contacts in directories they either created or were assigned to. Can manage permissions only for directories they created.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory User"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.Property<Guid>("ApplicationRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FeaturePermissionId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("ApplicationRoleId", "FeaturePermissionId");
+
+                    b.HasIndex("FeaturePermissionId");
+
+                    b.ToTable("RolePermissionMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DomainName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OnBoardingDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IndustryId");
+
+                    b.ToTable("Tenants");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b3466e83-7e11-464c-b93a-daf047838b26"),
+                            ContactName = "Admin",
+                            ContactNumber = "123456789",
+                            Description = "",
+                            DomainName = "www.marcobms.org",
+                            IndustryId = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            IsActive = true,
+                            Name = "MarcoBMS",
+                            OnBoardingDate = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            OragnizationSize = "100-200"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("CommentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MessageText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentMessageId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("SentAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TicketComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("LinkedActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("LinkedProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("PriorityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("StatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PriorityId");
+
+                    b.HasIndex("StatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("Tickets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketTags");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTypeMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTypeMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("c74e5480-2b71-483c-8f4a-1a9c69c32603"),
+                            Description = "An identified problem that affects the performance, reliability, or standards of a product or service",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("d1f55eab-9898-4e46-9f03-b263e33e5d38"),
+                            Description = "A support service that assists users with technical issues, requests, or inquiries.",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("MailListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Recipient")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Schedule")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MailListId");
+
+                    b.ToTable("MailDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmailId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailingList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Keywords")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailingList");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ActivityName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("UnitOfMeasurement")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ActivityMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("ModuleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModuleId");
+
+                    b.ToTable("Features");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            Description = "Manage Project",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            Description = "Manage Infra",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            Description = "Manage Tasks",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Task Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            Description = "Manage Employee",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Employee Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            Description = "Attendance",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            Description = "Global Masters",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Global Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            Description = "Managing all directory related rights",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Directory Management"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Industry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Industries");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            Name = "Information Technology (IT) Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("0a63e657-2c5f-49b5-854b-42c978293154"),
+                            Name = "Manufacturing & Production"
+                        },
+                        new
+                        {
+                            Id = new Guid("bdc61e3b-69ea-4394-bab6-079ec135b5bd"),
+                            Name = "Energy & Resources"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ca200ac-00d7-415e-a410-b948e27ac9d2"),
+                            Name = "Finance & Professional Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("d5621700-cd87-441f-8cdb-6051ddfc83b4"),
+                            Name = "Hospitals and Healthcare Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("23608891-657e-40f0-bbd4-2b0a2ec1a76f"),
+                            Name = "Social Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("a493f4e3-16b1-4411-be3c-6bf2987a3168"),
+                            Name = "Retail & Consumer Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("e9d8ce92-9371-4ed9-9831-83c07f78edec"),
+                            Name = "Transportation & Logistics"
+                        },
+                        new
+                        {
+                            Id = new Guid("8a0d6134-2dbe-4e0a-b250-ff34cb7b9df0"),
+                            Name = "Education & Training"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Module", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Modules");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Description = "Project Module",
+                            Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02",
+                            Name = "Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Description = "Employee Module",
+                            Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637",
+                            Name = "Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Description = "Masters Module",
+                            Key = "504ec132-e6a9-422f-8f85-050602cfce05",
+                            Name = "Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("StatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            Status = "Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Status = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "On Hold",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
+                            Status = "Completed",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketPriorityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Level")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketPriorityMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("188d29b3-10f3-42d0-9587-1a46ae7a0320"),
+                            ColorCode = "008000",
+                            IsDefault = true,
+                            Level = 1,
+                            Name = "Low",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("0919bc84-9f82-4ecf-98c7-962755dd9a97"),
+                            ColorCode = "FFFF00",
+                            IsDefault = true,
+                            Level = 2,
+                            Name = "Medium",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 3,
+                            Name = "High",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 4,
+                            Name = "Critical",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("44a7b91d-a0dd-45d1-8616-4d2f71e16401"),
+                            ColorCode = "#FF0000",
+                            IsDefault = true,
+                            Level = 5,
+                            Name = "Urgent",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6b0c409b-3e80-4165-8b39-f3fcacb4c797"),
+                            ColorCode = "#FFCC99",
+                            Description = "This is a newly created issue.",
+                            IsDefault = true,
+                            Name = "New",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("6c5ac37d-5b7d-40f3-adec-2dabaa5cca86"),
+                            ColorCode = "#E6FF99",
+                            Description = "Assigned to employee or team of employees",
+                            IsDefault = true,
+                            Name = "Assigned",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("7f96bcd5-0c66-411b-8a1d-9d1a4785194e"),
+                            ColorCode = "#99E6FF",
+                            Description = "These issues are currently in progress",
+                            IsDefault = true,
+                            Name = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5c72b630-6923-4215-bf2c-b1622afd76e7"),
+                            ColorCode = "#6c757d",
+                            Description = "These issues are currently under review",
+                            IsDefault = true,
+                            Name = "In Review",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("8ff85685-a875-4f21-aa95-d99551315fcc"),
+                            ColorCode = "#B399FF",
+                            Description = "The following issues are resolved and closed",
+                            IsDefault = true,
+                            Name = "Done",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTagMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("ef6c2a65-f61d-4537-9650-a7ab7f8d98db"),
+                            ColorCode = "#e59866",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5a168569-8ad7-4422-8db6-51ef25caddeb"),
+                            ColorCode = "#85c1e9",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkCategoryMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("86bb2cc8-f6b5-4fdd-bbee-c389c713a44b"),
+                            Description = "Created new task in a professional or creative context",
+                            IsSystem = true,
+                            Name = "Fresh Work",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("9ebfa19c-53b9-481b-b863-c25d2f843201"),
+                            Description = "Revising, modifying, or correcting a task to improve its quality or fix issues",
+                            IsSystem = true,
+                            Name = "Rework",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("11a79929-1d07-42dc-9e98-82d0d2f4a240"),
+                            Description = "Any defect, deviation, or non-conformance in a task that fails to meet established standards or customer expectations.",
+                            IsSystem = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buildings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BuildingId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Floor");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProjectAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ShortName")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectStatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Projects");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("85bf587b-7ca9-4685-b77c-d817f5847e85"),
+                            ContactPerson = "Project 1 Contact Person",
+                            EndDate = new DateTime(2026, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            Name = "Project 1",
+                            ProjectAddress = "Project 1 Address",
+                            ProjectStatusId = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            StartDate = new DateTime(2025, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReAllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ProjectAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AreaName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FloorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FloorId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkAreas");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("CompletedWork")
+                        .HasColumnType("double");
+
+                    b.Property<double>("PlannedWork")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime>("TaskDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkAreaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActivityId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkAreaId");
+
+                    b.HasIndex("WorkCategoryId");
+
+                    b.ToTable("WorkItems");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ApplicationRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("JobRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Utilities.Inquiries", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("About")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrganizatioinName")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Inquiries");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("varchar(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator().HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("IsRootUser")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("AssignedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem")
+                        .WithMany()
+                        .HasForeignKey("WorkItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkItem");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("CommentedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Approver")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Approver");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.AttendanceModule.Attendance", "Attendance")
+                        .WithMany()
+                        .HasForeignKey("AttendanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.DocumentManager.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedByEmployee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy");
+
+                    b.Navigation("Attendance");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedByEmployee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedByID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.ContactCategoryMaster", "ContactCategory")
+                        .WithMany()
+                        .HasForeignKey("ContactCategoryId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedBy")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById");
+
+                    b.Navigation("ContactCategory");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedBy");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Createdby")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedBy")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById");
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Createdby");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedBy");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.ContactTagMaster", "ContactTag")
+                        .WithMany()
+                        .HasForeignKey("ContactTagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("ContactTag");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationUser", "ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.HasOne("Marco.Pms.Model.Roles.JobRole", "JobRole")
+                        .WithMany()
+                        .HasForeignKey("JobRoleId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("JobRole");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Role");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Feature", "Feature")
+                        .WithMany("FeaturePermissions")
+                        .HasForeignKey("FeatureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feature");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.FeaturePermission", null)
+                        .WithMany()
+                        .HasForeignKey("FeaturePermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Industry", "Industry")
+                        .WithMany()
+                        .HasForeignKey("IndustryId");
+
+                    b.Navigation("Industry");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Forum.TicketComment", "TicketComment")
+                        .WithMany("Attachments")
+                        .HasForeignKey("CommentId");
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ticket");
+
+                    b.Navigation("TicketComment");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketPriorityMaster", "Priority")
+                        .WithMany()
+                        .HasForeignKey("PriorityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.TicketStatusMaster", "TicketStatusMaster")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketTypeMaster", "TicketTypeMaster")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Priority");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("TicketStatusMaster");
+
+                    b.Navigation("TicketTypeMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketTagMaster", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+
+                    b.Navigation("Ticket");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Mail.MailingList", "MailBody")
+                        .WithMany()
+                        .HasForeignKey("MailListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MailBody");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Module", "Module")
+                        .WithMany()
+                        .HasForeignKey("ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Building", "Building")
+                        .WithMany()
+                        .HasForeignKey("BuildingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Building");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.StatusMaster", "ProjectStatus")
+                        .WithMany()
+                        .HasForeignKey("ProjectStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProjectStatus");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .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("Employee");
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Floor", "Floor")
+                        .WithMany()
+                        .HasForeignKey("FloorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Floor");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.ActivityMaster", "ActivityMaster")
+                        .WithMany()
+                        .HasForeignKey("ActivityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea")
+                        .WithMany()
+                        .HasForeignKey("WorkAreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkCategoryMaster", "WorkCategoryMaster")
+                        .WithMany()
+                        .HasForeignKey("WorkCategoryId");
+
+                    b.Navigation("ActivityMaster");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkArea");
+
+                    b.Navigation("WorkCategoryMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Navigation("FeaturePermissions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.cs b/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.cs
new file mode 100644
index 0000000..0ec34c3
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.cs
@@ -0,0 +1,101 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_UpdatedBy_In_Contacts_And_ContactNotes_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "Contacts",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "UpdatedById",
+                table: "Contacts",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "ContactNotes",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "UpdatedById",
+                table: "ContactNotes",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Contacts_UpdatedById",
+                table: "Contacts",
+                column: "UpdatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ContactNotes_UpdatedById",
+                table: "ContactNotes",
+                column: "UpdatedById");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ContactNotes_Employees_UpdatedById",
+                table: "ContactNotes",
+                column: "UpdatedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Contacts_Employees_UpdatedById",
+                table: "Contacts",
+                column: "UpdatedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_ContactNotes_Employees_UpdatedById",
+                table: "ContactNotes");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Contacts_Employees_UpdatedById",
+                table: "Contacts");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Contacts_UpdatedById",
+                table: "Contacts");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ContactNotes_UpdatedById",
+                table: "ContactNotes");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                table: "Contacts");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedById",
+                table: "Contacts");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                table: "ContactNotes");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedById",
+                table: "ContactNotes");
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
index 187d2a6..5f8bb8b 100644
--- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -410,6 +410,12 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<Guid>("TenantId")
                         .HasColumnType("char(36)");
 
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid?>("UpdatedById")
+                        .HasColumnType("char(36)");
+
                     b.HasKey("Id");
 
                     b.HasIndex("ContactCategoryId");
@@ -418,6 +424,8 @@ namespace Marco.Pms.DataAccess.Migrations
 
                     b.HasIndex("TenantId");
 
+                    b.HasIndex("UpdatedById");
+
                     b.ToTable("Contacts");
                 });
 
@@ -521,6 +529,12 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<Guid>("TenantId")
                         .HasColumnType("char(36)");
 
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid?>("UpdatedById")
+                        .HasColumnType("char(36)");
+
                     b.HasKey("Id");
 
                     b.HasIndex("ContactId");
@@ -529,6 +543,8 @@ namespace Marco.Pms.DataAccess.Migrations
 
                     b.HasIndex("TenantId");
 
+                    b.HasIndex("UpdatedById");
+
                     b.ToTable("ContactNotes");
                 });
 
@@ -2641,11 +2657,17 @@ namespace Marco.Pms.DataAccess.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedBy")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById");
+
                     b.Navigation("ContactCategory");
 
                     b.Navigation("CreatedBy");
 
                     b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedBy");
                 });
 
             modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
@@ -2709,11 +2731,17 @@ namespace Marco.Pms.DataAccess.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedBy")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById");
+
                     b.Navigation("Contact");
 
                     b.Navigation("Createdby");
 
                     b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedBy");
                 });
 
             modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
diff --git a/Marco.Pms.Model/Directory/Contact.cs b/Marco.Pms.Model/Directory/Contact.cs
index ecdd622..fe82711 100644
--- a/Marco.Pms.Model/Directory/Contact.cs
+++ b/Marco.Pms.Model/Directory/Contact.cs
@@ -20,6 +20,11 @@ namespace Marco.Pms.Model.Directory
         [ValidateNever]
         [ForeignKey("CreatedById")]
         public Employee? CreatedBy { get; set; }
+        public Guid? UpdatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("UpdatedById")]
+        public Employee? UpdatedBy { get; set; }
 
         [DisplayName("ContactCategoryId")]
         public Guid? ContactCategoryId { get; set; }
@@ -27,5 +32,6 @@ namespace Marco.Pms.Model.Directory
         [ForeignKey(nameof(ContactCategoryId))]
         public ContactCategoryMaster? ContactCategory { get; set; }
         public DateTime CreatedAt { get; set; }
+        public DateTime? UpdatedAt { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Directory/ContactNote.cs b/Marco.Pms.Model/Directory/ContactNote.cs
index e203f1d..57e21e9 100644
--- a/Marco.Pms.Model/Directory/ContactNote.cs
+++ b/Marco.Pms.Model/Directory/ContactNote.cs
@@ -14,7 +14,13 @@ namespace Marco.Pms.Model.Directory
         [ValidateNever]
         [ForeignKey("CreatedById")]
         public Employee? Createdby { get; set; }
+        public Guid? UpdatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("UpdatedById")]
+        public Employee? UpdatedBy { get; set; }
         public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+        public DateTime? UpdatedAt { get; set; }
         public Guid ContactId { get; set; }
 
         [ValidateNever]
diff --git a/Marco.Pms.Model/Mapper/DirectoryMapper.cs b/Marco.Pms.Model/Mapper/DirectoryMapper.cs
index 381c4b0..faf0539 100644
--- a/Marco.Pms.Model/Mapper/DirectoryMapper.cs
+++ b/Marco.Pms.Model/Mapper/DirectoryMapper.cs
@@ -234,7 +234,9 @@ namespace Marco.Pms.Model.Mapper
                 Note = note.Note,
                 ContactId = note.ContactId,
                 CreatedAt = note.CreatedAt,
+                UpdatedAt = note.UpdatedAt,
                 CreatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null,
+                UpdatedBy = note.UpdatedBy != null ? note.UpdatedBy.ToBasicEmployeeVMFromEmployee() : null,
                 IsActive = note.IsActive
             };
         }
diff --git a/Marco.Pms.Services/Controllers/DirectoryController.cs b/Marco.Pms.Services/Controllers/DirectoryController.cs
index 2bf22ea..0555868 100644
--- a/Marco.Pms.Services/Controllers/DirectoryController.cs
+++ b/Marco.Pms.Services/Controllers/DirectoryController.cs
@@ -158,6 +158,13 @@ namespace Marco.Pms.Services.Controllers
 
         // -------------------------------- Contact Notes  --------------------------------
 
+        [HttpGet("notes")]
+        public async Task<IActionResult> GetListOFAllNotes([FromQuery] int? pageSize, [FromQuery] int pageNumber)
+        {
+            var response = await _directoryHelper.GetListOFAllNotes(pageSize ?? 25, pageNumber);
+            return StatusCode(response.StatusCode, response);
+        }
+
         [HttpPost("note")]
         public async Task<IActionResult> CreateContactNote([FromBody] CreateContactNoteDto noteDto)
         {
diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
index d34b0d3..2d06785 100644
--- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs
+++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
@@ -7,6 +7,7 @@ using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Directory;
 using Marco.Pms.Model.ViewModels.Master;
 using Marco.Pms.Model.ViewModels.Projects;
+using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.EntityFrameworkCore;
@@ -18,15 +19,17 @@ namespace Marco.Pms.Services.Helpers
         private readonly ApplicationDbContext _context;
         private readonly ILoggingService _logger;
         private readonly UserHelper _userHelper;
+        private readonly PermissionServices _permissionServices;
         private readonly Guid directoryAdmin;
         private readonly Guid directoryManager;
         private readonly Guid directoryUser;
 
-        public DirectoryHelper(ApplicationDbContext context, ILoggingService logger, UserHelper userHelper)
+        public DirectoryHelper(ApplicationDbContext context, ILoggingService logger, UserHelper userHelper, PermissionServices permissionServices)
         {
             _context = context;
             _logger = logger;
             _userHelper = userHelper;
+            _permissionServices = permissionServices;
             directoryAdmin = Guid.Parse("4286a13b-bb40-4879-8c6d-18e9e393beda");
             directoryManager = Guid.Parse("62668630-13ce-4f52-a0f0-db38af2230c5");
             directoryUser = Guid.Parse("0f919170-92d4-4337-abd3-49b66fc871bb");
@@ -504,6 +507,8 @@ namespace Marco.Pms.Services.Helpers
 
 
                 var newContact = updateContact.ToContactFromUpdateContactDto(tenantId, contact);
+                newContact.UpdatedById = LoggedInEmployee.Id;
+                newContact.UpdatedAt = DateTime.UtcNow;
                 _context.Contacts.Update(newContact);
                 await _context.SaveChangesAsync();
 
@@ -893,6 +898,110 @@ namespace Marco.Pms.Services.Helpers
 
         // -------------------------------- Contact Notes  --------------------------------
 
+        /// <summary>
+        /// Retrieves a paginated list of contact notes based on user permissions.
+        /// </summary>
+        /// <param name="pageSize">The number of items per page.</param>
+        /// <param name="pageNumber">The current page number.</param>
+        /// <returns>An ApiResponse containing the paginated notes or an error message.</returns>
+        public async Task<ApiResponse<object>> GetListOFAllNotes(int pageSize, int pageNumber)
+        {
+            _logger.LogInfo("Attempting to fetch list of all notes. PageSize: {PageSize}, PageNumber: {PageNumber}", pageSize, pageNumber);
+
+            Guid tenantId = _userHelper.GetTenantId();
+            var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+            if (loggedInEmployee == null)
+            {
+                _logger.LogWarning("GetListOFAllNotes: LoggedInEmployee is null. Cannot proceed.");
+                return ApiResponse<object>.ErrorResponse("Unauthorized", "Employee not found.", 401);
+            }
+
+            // --- Permission Checks ---
+            var hasAdminPermission = await _permissionServices.HasPermission(directoryAdmin, loggedInEmployee.Id);
+            var hasManagerPermission = await _permissionServices.HasPermission(directoryManager, loggedInEmployee.Id);
+            var hasUserPermission = await _permissionServices.HasPermission(directoryUser, loggedInEmployee.Id);
+
+            IQueryable<ContactNote> notesQuery = _context.ContactNotes
+                                                    .Include(cn => cn.UpdatedBy)
+                                                    .Include(cn => cn.Createdby) // Assuming 'CreatedBy' (PascalCase)
+                                                    .Where(cn => cn.TenantId == tenantId)
+                                                    .AsQueryable(); // Start building the query
+
+            if (!hasAdminPermission && !(hasManagerPermission || hasUserPermission))
+            {
+                _logger.LogWarning("GetListOFAllNotes: User {EmployeeId} does not have required permissions to access notes for TenantId: {TenantId}", loggedInEmployee.Id, tenantId);
+                return ApiResponse<object>.ErrorResponse("Access Denied", "You don't have access to view notes.", 403);
+            }
+
+            if (!hasAdminPermission) // If not an admin, apply additional filtering
+            {
+                _logger.LogInfo("GetListOFAllNotes: User {EmployeeId} is not an admin. Applying manager/user specific filters.", loggedInEmployee.Id);
+                var assignedBucketIds = await _context.EmployeeBucketMappings
+                    .Where(eb => eb.EmployeeId == loggedInEmployee.Id)
+                    .Select(eb => eb.BucketId)
+                    .ToListAsync();
+
+                if (!assignedBucketIds.Any())
+                {
+                    _logger.LogInfo("GetListOFAllNotes: User {EmployeeId} has no assigned buckets. Returning empty list.", loggedInEmployee.Id);
+                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteVM>() }, "No notes found based on assigned buckets.", 200);
+                }
+
+                var contactIds = await _context.ContactBucketMappings
+                    .Where(cb => assignedBucketIds.Contains(cb.BucketId))
+                    .Select(cb => cb.ContactId)
+                    .ToListAsync();
+
+                if (!contactIds.Any())
+                {
+                    _logger.LogInfo("GetListOFAllNotes: No contacts found for assigned buckets for user {EmployeeId}. Returning empty list.", loggedInEmployee.Id);
+                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteVM>() }, "No notes found for associated contacts.", 200);
+                }
+
+                notesQuery = notesQuery.Where(cn => contactIds.Contains(cn.ContactId));
+            }
+
+            // --- Pagination Logic ---
+            // Ensure pageSize and pageNumber are valid
+            pageSize = pageSize < 1 ? 25 : pageSize; // Default to 25 if less than 1
+            pageNumber = pageNumber < 1 ? 1 : pageNumber; // Default to 1 if less than 1
+
+            // Get total count BEFORE applying Skip/Take for accurate pagination metadata
+            int totalRecords = await notesQuery.CountAsync();
+            int totalPages = (int)Math.Ceiling((double)totalRecords / pageSize);
+
+            int skip = (pageNumber - 1) * pageSize;
+
+            // --- Apply Ordering and Pagination in the database ---
+            List<ContactNote> notes = await notesQuery
+                .OrderByDescending(cn => (cn.UpdatedAt != null ? cn.UpdatedAt : cn.CreatedAt)) // Order by updated date or created date
+                .Skip(skip)
+                .Take(pageSize)
+                .ToListAsync();
+
+            _logger.LogInfo("GetListOFAllNotes: Fetched {Count} notes for page {PageNumber} of {TotalPages} total pages. Total records: {TotalRecords}.",
+                                    notes.Count, pageNumber, totalPages, totalRecords);
+
+            // --- Map to ViewModel (in-memory) ---
+            // This mapping is done in memory because ToBasicEmployeeVMFromEmployee() is likely a C# method
+            // that cannot be translated to SQL by Entity Framework.
+            List<ContactNoteVM> noteVMS = notes
+                .Select(cn => cn.ToContactNoteVMFromContactNote())
+                .ToList();
+
+            var response = new
+            {
+                CurrentPage = pageNumber,
+                PageSize = pageSize, // Include pageSize in response for client clarity
+                TotalPages = totalPages,
+                TotalRecords = totalRecords, // Add total records for client
+                Data = noteVMS
+            };
+
+            _logger.LogInfo("GetListOFAllNotes: Successfully retrieved notes and mapped to ViewModel for TenantId: {TenantId}.", tenantId);
+            return ApiResponse<object>.SuccessResponse(response, $"{noteVMS.Count} notes fetched successfully.", 200);
+        }
         public async Task<ApiResponse<object>> GetNoteListByContactId(Guid id, bool active)
         {
             Guid tenantId = _userHelper.GetTenantId();
@@ -903,32 +1012,25 @@ namespace Marco.Pms.Services.Helpers
                 List<ContactNote> notes = new List<ContactNote>();
                 if (active)
                 {
-                    notes = await _context.ContactNotes.Where(n => n.ContactId == contact.Id && n.IsActive && n.TenantId == tenantId).ToListAsync();
+                    notes = await _context.ContactNotes
+                        .Include(n => n.Createdby)
+                        .Include(n => n.UpdatedBy)
+                        .Where(n => n.ContactId == contact.Id && n.IsActive && n.TenantId == tenantId)
+                        .ToListAsync();
                 }
                 else
                 {
-                    notes = await _context.ContactNotes.Where(n => n.ContactId == contact.Id && n.TenantId == tenantId).ToListAsync();
+                    notes = await _context.ContactNotes
+                        .Include(n => n.Createdby)
+                        .Include(n => n.UpdatedBy)
+                        .Where(n => n.ContactId == contact.Id && n.TenantId == tenantId)
+                        .ToListAsync();
                 }
                 var noteIds = notes.Select(n => n.Id).ToList();
                 List<DirectoryUpdateLog>? updateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.RefereanceId)).ToListAsync();
-                List<ContactNoteVM>? noteVMs = new List<ContactNoteVM>();
-                foreach (var note in notes)
-                {
-                    ContactNoteVM noteVM = note.ToContactNoteVMFromContactNote();
-                    DirectoryUpdateLog? updateLog = updateLogs.Where(l => l.RefereanceId == note.Id).OrderByDescending(l => l.UpdateAt).FirstOrDefault();
-                    if (updateLog != null)
-                    {
-                        noteVM.UpdatedAt = updateLog.UpdateAt;
-                        noteVM.UpdatedBy = updateLog.Employee != null ? updateLog.Employee.ToBasicEmployeeVMFromEmployee() : null;
-                    }
-                    else
-                    {
-                        noteVM.UpdatedAt = note.CreatedAt;
-                        noteVM.UpdatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null;
-                    }
-                    noteVMs.Add(noteVM);
+                //List<ContactNoteVM>? noteVMs = new List<ContactNoteVM>();
+                List<ContactNoteVM>? noteVMs = notes.Select(n => n.ToContactNoteVMFromContactNote()).ToList();
 
-                }
                 _logger.LogInfo("{count} contact-notes record from contact {ContactId} fetched by Employee {EmployeeId}", noteVMs.Count, id, LoggedInEmployee.Id);
                 return ApiResponse<object>.SuccessResponse(noteVMs, $"{noteVMs.Count} contact-notes record fetched successfully", 200);
             }
@@ -970,6 +1072,8 @@ namespace Marco.Pms.Services.Helpers
                     if (contactNote != null)
                     {
                         contactNote.Note = noteDto.Note;
+                        contactNote.UpdatedById = LoggedInEmployee.Id;
+                        contactNote.UpdatedAt = DateTime.UtcNow;
 
                         _context.DirectoryUpdateLogs.Add(new DirectoryUpdateLog
                         {
@@ -1335,6 +1439,9 @@ namespace Marco.Pms.Services.Helpers
             _logger.LogWarning("Employee {EmployeeId} tries to delete bucket {BucketId} but not found in database", LoggedInEmployee.Id, id);
             return ApiResponse<object>.SuccessResponse(new { }, "Bucket deleted successfully", 200);
         }
+
+        // -------------------------------- Helper  --------------------------------
+
         private bool Compare(string sentence, string search)
         {
             sentence = sentence.Trim().ToLower();
-- 
2.43.0


From b94f4bdb631ffe695bcef189a624041beb42670a Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Tue, 24 Jun 2025 11:30:50 +0530
Subject: [PATCH 45/48] When task is approved stored approved tasks in reported
 task field not in completed task

---
 Marco.Pms.Model/Mapper/ActivitiesMapper.cs    |  4 ++--
 .../Controllers/TaskController.cs             | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
index 4083ccf..e2dc503 100644
--- a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
+++ b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
@@ -54,7 +54,7 @@ namespace Marco.Pms.Model.Mapper
                 ApprovedDate = taskAllocation.ApprovedDate,
                 PlannedTask = taskAllocation.PlannedTask,
                 CompletedTask = taskAllocation.CompletedTask,
-                NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.ReportedTask - taskAllocation.CompletedTask),
+                NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.CompletedTask - taskAllocation.ReportedTask),
                 Description = taskAllocation.Description,
                 AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(),
                 ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(),
@@ -114,7 +114,7 @@ namespace Marco.Pms.Model.Mapper
                 ReportedDate = taskAllocation.ReportedDate,
                 WorkStatus = taskAllocation.WorkStatus,
                 CompletedTask = taskAllocation.CompletedTask,
-                NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.ReportedTask - taskAllocation.CompletedTask),
+                NotApprovedTask = taskAllocation.ApprovedById == null ? taskAllocation.CompletedTask : (taskAllocation.CompletedTask - taskAllocation.ReportedTask),
                 AssignedBy = taskAllocation.Employee?.ToBasicEmployeeVMFromEmployee(),
                 ReportedBy = taskAllocation.ReportedBy?.ToBasicEmployeeVMFromEmployee(),
                 ApprovedBy = taskAllocation.ApprovedBy?.ToBasicEmployeeVMFromEmployee(),
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index ab34561..6b55c3f 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -165,7 +165,7 @@ namespace MarcoBMS.Services.Controllers
             taskAllocation.ReportedDate = reportTask.ReportedDate;
             taskAllocation.ReportedById = loggedInEmployee.Id;
             taskAllocation.CompletedTask = reportTask.CompletedTask;
-            taskAllocation.ReportedTask = reportTask.CompletedTask;
+            //taskAllocation.ReportedTask = reportTask.CompletedTask;
 
             var checkListMappings = new List<CheckListMappings>();
             var checkListVMs = new List<CheckListVM>();
@@ -692,21 +692,21 @@ namespace MarcoBMS.Services.Controllers
                     "Approved tasks cannot be greater than completed tasks", 400));
             }
 
-            // Update completed work in the associated work item, if it exists
-            if (taskAllocation.WorkItem != null && taskAllocation.CompletedTask != approveTask.ApprovedTask)
-            {
-                if (taskAllocation.CompletedTask > 0)
-                {
-                    taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
-                }
-                taskAllocation.WorkItem.CompletedWork += approveTask.ApprovedTask;
-            }
+            //// Update completed work in the associated work item, if it exists
+            //if (taskAllocation.WorkItem != null && taskAllocation.CompletedTask != approveTask.ApprovedTask)
+            //{
+            //    if (taskAllocation.CompletedTask > 0)
+            //    {
+            //        taskAllocation.WorkItem.CompletedWork -= taskAllocation.CompletedTask;
+            //    }
+            //    taskAllocation.WorkItem.CompletedWork += approveTask.ApprovedTask;
+            //}
 
             // Update task allocation details
             taskAllocation.ApprovedById = loggedInEmployee.Id;
             taskAllocation.ApprovedDate = DateTime.UtcNow;
             taskAllocation.WorkStatusId = approveTask.WorkStatus;
-            taskAllocation.CompletedTask = approveTask.ApprovedTask;
+            taskAllocation.ReportedTask = approveTask.ApprovedTask;
 
             // Add a comment (optional)
             var comment = new TaskComment
-- 
2.43.0


From e3ddcee8b388a062147be23428fb06a9948aaf26 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 23 Jun 2025 14:50:50 +0530
Subject: [PATCH 46/48] Implemented An API to get list of all notes

---
 ...ontacts_And_ContactNotes_Table.Designer.cs | 3280 +++++++++++++++++
 ...edBy_In_Contacts_And_ContactNotes_Table.cs |  101 +
 .../ApplicationDbContextModelSnapshot.cs      |   28 +
 Marco.Pms.Model/Directory/Contact.cs          |    6 +
 Marco.Pms.Model/Directory/ContactNote.cs      |    6 +
 Marco.Pms.Model/Mapper/DirectoryMapper.cs     |    2 +
 .../Controllers/DirectoryController.cs        |    7 +
 Marco.Pms.Services/Helpers/DirectoryHelper.cs |  147 +-
 8 files changed, 3557 insertions(+), 20 deletions(-)
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.Designer.cs
 create mode 100644 Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.cs

diff --git a/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.Designer.cs b/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.Designer.cs
new file mode 100644
index 0000000..11dc500
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.Designer.cs
@@ -0,0 +1,3280 @@
+// <auto-generated />
+using System;
+using Marco.Pms.DataAccess.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    [DbContext(typeof(ApplicationDbContext))]
+    [Migration("20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table")]
+    partial class Added_UpdatedBy_In_Contacts_And_ContactNotes_Table
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.12")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            //MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AssignedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AssignmentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<double>("CompletedTask")
+                        .HasColumnType("double");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<double>("PlannedTask")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime?>("ReportedDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkItemId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AssignedBy");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkItemId");
+
+                    b.ToTable("TaskAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("CommentDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CommentedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentedBy");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("TaskAllocationId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TaskMembers");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("ApprovedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AttendanceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("InTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsApproved")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("OutTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ProjectID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Attendes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("Activity")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("ActivityTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("AttendanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Comment")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("DocumentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Latitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Longitude")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("UpdatedBy")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdatedOn")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AttendanceId");
+
+                    b.HasIndex("DocumentId");
+
+                    b.HasIndex("EmployeeID");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedBy");
+
+                    b.ToTable("AttendanceLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MPIN")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MPINToken")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("MPINDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("ExpriesInSec")
+                        .HasColumnType("int");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("OTP")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UserId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("OTPDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime>("ExpiryDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<bool>("IsRevoked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsUsed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("RevokedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Token")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("RefreshTokens");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedByID")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreatedByID");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buckets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Address")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ContactCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Organization")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid?>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactCategoryId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("Contacts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactCategoryMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EmailAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.ToTable("ContactsEmails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Note")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid?>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("CreatedById");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("ContactNotes");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsPrimary")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Label")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    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")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ContactTagId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ContactId");
+
+                    b.HasIndex("ContactTagId");
+
+                    b.ToTable("ContactTagMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ContactTagMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("RefereanceId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("UpdateAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("UpdatedById")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UpdatedById");
+
+                    b.ToTable("DirectoryUpdateLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BucketId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BucketId");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.ToTable("EmployeeBucketMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Base64Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("BatchId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContentType")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<long>("FileSize")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("S3Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ThumbS3Key")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("UploadedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Documents");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AadharNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ApplicationUserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<DateTime?>("BirthDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("CurrentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmergencyPhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("FirstName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Gender")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("JoiningDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("LastName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MiddleName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PanNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PermanentAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<byte[]>("Photo")
+                        .HasColumnType("longblob");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ApplicationUserId");
+
+                    b.HasIndex("JobRoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Employees");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("RoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("RoleId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("EmployeeRoleMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeOnly>("EndTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<TimeOnly>("StartTime")
+                        .HasColumnType("time(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkShifts");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ActivityCheckList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsChecked")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsMandatory")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("ActivityCheckLists");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.CheckListMappings", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("CheckListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TaskAllocationId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CheckListMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FeatureId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FeatureId");
+
+                    b.ToTable("FeaturePermissions");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6ea44136-987e-44ba-9e5d-1cf8f5837ebc"),
+                            Description = "Access all information related to the project.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "View Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("172fc9b6-755b-4f62-ab26-55c34a330614"),
+                            Description = "Potentially edit the project name, description, start/end dates, or status.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("b94802ce-0689-4643-9e1d-11c86950c35b"),
+                            Description = "The \"Manage Team\" feature allows authorized users to organize project personnel by adding, removing, and assigning employee to projects.",
+                            FeatureId = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            IsEnabled = true,
+                            Name = "Manage Team"
+                        },
+                        new
+                        {
+                            Id = new Guid("c7b68e33-72f0-474f-bd96-77636427ecc8"),
+                            Description = "Grants a user comprehensive read-only access to all details concerning the project's underlying systems, technologies, resources, and configurations",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "View Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("f2aee20a-b754-4537-8166-f9507b44585b"),
+                            Description = "This allows them to create, modify, and manage all aspects of the supporting infrastructure.",
+                            FeatureId = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            IsEnabled = true,
+                            Name = "Manage Project Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9fcc5f87-25e3-4846-90ac-67a71ab92e3c"),
+                            Description = "Grants a user comprehensive read-only access to all details associated with tasks within a project. This includes task descriptions, statuses, assignees, due dates, dependencies, progress, history, and any related attachments or discussions.",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "View Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("08752f33-3b29-4816-b76b-ea8a968ed3c5"),
+                            Description = "This allows them to create new tasks, modify existing task attributes (description, status, assignee, due date, etc.),",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("6a32379b-8b3f-49a6-8c48-4b7ac1b55dc2"),
+                            Description = "Grants a user the ability to designate team members responsible for specific tasks and to update the completion status or provide progress updates for those tasks",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Assign/Report Progress"
+                        },
+                        new
+                        {
+                            Id = new Guid("db4e40c5-2ba9-4b6d-b8a6-a16a250ff99c"),
+                            Description = "Grants a user the authority to officially confirm the completion or acceptance of a task, often signifying that it meets the required standards or criteria",
+                            FeatureId = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            IsEnabled = true,
+                            Name = "Approve Task"
+                        },
+                        new
+                        {
+                            Id = new Guid("b82d2b7e-0d52-45f3-997b-c008ea460e7f"),
+                            Description = "Grants a user read-only access to details about the individuals within the system. This typically includes names, contact information, roles, departments, and potentially other relevant employee data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "View Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("a97d366a-c2bb-448d-be93-402bd2324566"),
+                            Description = "Grants a user the authority to create new employee profiles and modify existing employee details within the system. This typically includes adding or updating information such as names, contact details, roles, departments, skills, and potentially other personal or professional data",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Add/Edit Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("fbd213e0-0250-46f1-9f5f-4b2a1e6e76a3"),
+                            Description = "Grants a user the authority to manage employee application roles, enabling them to assign or revoke access privileges within the system.",
+                            FeatureId = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            IsEnabled = true,
+                            Name = "Assign Roles"
+                        },
+                        new
+                        {
+                            Id = new Guid("915e6bff-65f6-4e3f-aea8-3fd217d3ea9e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Team Attendance "
+                        },
+                        new
+                        {
+                            Id = new Guid("57802c4a-00aa-4a1f-a048-fd2f70dd44b6"),
+                            Description = "Grants a user the authority to approve requests from employees to adjust or correct their recorded attendance. This typically involves reviewing the reason for the regularization, verifying any supporting documentation, and then officially accepting the changes to the employee's attendance records",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Regularize Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("ccb0589f-712b-43de-92ed-5b6088e7dc4e"),
+                            Description = "Team Attendance refers to tracking and managing the attendance of all team members collectively, often monitored by a team lead or manager.",
+                            FeatureId = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            IsEnabled = true,
+                            Name = "Self Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ffbafe0-7ab0-48b1-bb50-c1bf76b65f9d"),
+                            Description = "Grants a user read-only access to foundational or reference data within the system. \"Masters\" typically refer to predefined lists, categories, or templates that are used throughout the application to standardize information and maintain consistency",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "View Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("588a8824-f924-4955-82d8-fc51956cf323"),
+                            Description = "Grants a user the authority to create, modify, and delete foundational or reference data within the system. These \"masters\" are typically the core lists, categories, and configurations that other data and functionalities rely upon, such as departments, job titles, product categories",
+                            FeatureId = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            IsEnabled = true,
+                            Name = "Manage Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("4286a13b-bb40-4879-8c6d-18e9e393beda"),
+                            Description = "Full control over all directories, including the ability to manage permissions for all directories in the system.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Admin"
+                        },
+                        new
+                        {
+                            Id = new Guid("62668630-13ce-4f52-a0f0-db38af2230c5"),
+                            Description = "Full control over directories they created or have been assigned. Can also manage permissions for those directories.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory Manager"
+                        },
+                        new
+                        {
+                            Id = new Guid("0f919170-92d4-4337-abd3-49b66fc871bb"),
+                            Description = "Full control over directories they created. Can view contacts in directories they either created or were assigned to. Can manage permissions only for directories they created.",
+                            FeatureId = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            IsEnabled = true,
+                            Name = "Directory User"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.Property<Guid>("ApplicationRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FeaturePermissionId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("ApplicationRoleId", "FeaturePermissionId");
+
+                    b.HasIndex("FeaturePermissionId");
+
+                    b.ToTable("RolePermissionMappings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DomainName")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("OnBoardingDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("IndustryId");
+
+                    b.ToTable("Tenants");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b3466e83-7e11-464c-b93a-daf047838b26"),
+                            ContactName = "Admin",
+                            ContactNumber = "123456789",
+                            Description = "",
+                            DomainName = "www.marcobms.org",
+                            IndustryId = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            IsActive = true,
+                            Name = "MarcoBMS",
+                            OnBoardingDate = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
+                            OragnizationSize = "100-200"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("CommentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("FileId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FileName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CommentId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketAttachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("AuthorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("MessageText")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentMessageId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("SentAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("TicketComments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("CreatedById")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("LinkedActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("LinkedProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("PriorityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("StatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TypeId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PriorityId");
+
+                    b.HasIndex("StatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("TypeId");
+
+                    b.ToTable("Tickets");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TagId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TicketId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TagId");
+
+                    b.HasIndex("TicketId");
+
+                    b.ToTable("TicketTags");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTypeMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTypeMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("c74e5480-2b71-483c-8f4a-1a9c69c32603"),
+                            Description = "An identified problem that affects the performance, reliability, or standards of a product or service",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("d1f55eab-9898-4e46-9f03-b263e33e5d38"),
+                            Description = "A support service that assists users with technical issues, requests, or inquiries.",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("MailListId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Recipient")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Schedule")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("MailListId");
+
+                    b.ToTable("MailDetails");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailLog", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EmailId")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("TimeStamp")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailLogs");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailingList", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Body")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Keywords")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Subject")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Title")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailingList");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ActivityName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("UnitOfMeasurement")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ActivityMasters");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("ModuleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ModuleId");
+
+                    b.ToTable("Features");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("53176ebf-c75d-42e5-839f-4508ffac3def"),
+                            Description = "Manage Project",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("9666de86-d7c7-4d3d-acaa-fcd6d6b81f3c"),
+                            Description = "Manage Infra",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Manage Infra"
+                        },
+                        new
+                        {
+                            Id = new Guid("9d4b5489-2079-40b9-bd77-6e1bf90bc19f"),
+                            Description = "Manage Tasks",
+                            IsActive = true,
+                            ModuleId = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Name = "Task Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("81ab8a87-8ccd-4015-a917-0627cee6a100"),
+                            Description = "Manage Employee",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Employee Management"
+                        },
+                        new
+                        {
+                            Id = new Guid("52c9cf54-1eb2-44d2-81bb-524cf29c0a94"),
+                            Description = "Attendance",
+                            IsActive = true,
+                            ModuleId = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Name = "Attendance"
+                        },
+                        new
+                        {
+                            Id = new Guid("be3b3afc-6ccf-4566-b9b6-aafcb65546be"),
+                            Description = "Global Masters",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Global Masters"
+                        },
+                        new
+                        {
+                            Id = new Guid("39e66f81-efc6-446c-95bd-46bff6cfb606"),
+                            Description = "Managing all directory related rights",
+                            IsActive = true,
+                            ModuleId = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Name = "Directory Management"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Industry", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Industries");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("15436ee3-a650-469e-bfc2-59993f7514bb"),
+                            Name = "Information Technology (IT) Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("0a63e657-2c5f-49b5-854b-42c978293154"),
+                            Name = "Manufacturing & Production"
+                        },
+                        new
+                        {
+                            Id = new Guid("bdc61e3b-69ea-4394-bab6-079ec135b5bd"),
+                            Name = "Energy & Resources"
+                        },
+                        new
+                        {
+                            Id = new Guid("5ca200ac-00d7-415e-a410-b948e27ac9d2"),
+                            Name = "Finance & Professional Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("d5621700-cd87-441f-8cdb-6051ddfc83b4"),
+                            Name = "Hospitals and Healthcare Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("23608891-657e-40f0-bbd4-2b0a2ec1a76f"),
+                            Name = "Social Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("a493f4e3-16b1-4411-be3c-6bf2987a3168"),
+                            Name = "Retail & Consumer Services"
+                        },
+                        new
+                        {
+                            Id = new Guid("e9d8ce92-9371-4ed9-9831-83c07f78edec"),
+                            Name = "Transportation & Logistics"
+                        },
+                        new
+                        {
+                            Id = new Guid("8a0d6134-2dbe-4e0a-b250-ff34cb7b9df0"),
+                            Name = "Education & Training"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Module", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Modules");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"),
+                            Description = "Project Module",
+                            Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02",
+                            Name = "Project"
+                        },
+                        new
+                        {
+                            Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"),
+                            Description = "Employee Module",
+                            Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637",
+                            Name = "Employee"
+                        },
+                        new
+                        {
+                            Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"),
+                            Description = "Masters Module",
+                            Key = "504ec132-e6a9-422f-8f85-050602cfce05",
+                            Name = "Masters"
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Status")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("StatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            Status = "Active",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("603e994b-a27f-4e5d-a251-f3d69b0498ba"),
+                            Status = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("ef1c356e-0fe0-42df-a5d3-8daee355492d"),
+                            Status = "On Hold",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("33deaef9-9af1-4f2a-b443-681ea0d04f81"),
+                            Status = "Completed",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketPriorityMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int>("Level")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketPriorityMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("188d29b3-10f3-42d0-9587-1a46ae7a0320"),
+                            ColorCode = "008000",
+                            IsDefault = true,
+                            Level = 1,
+                            Name = "Low",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("0919bc84-9f82-4ecf-98c7-962755dd9a97"),
+                            ColorCode = "FFFF00",
+                            IsDefault = true,
+                            Level = 2,
+                            Name = "Medium",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 3,
+                            Name = "High",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"),
+                            ColorCode = "#FFA500",
+                            IsDefault = true,
+                            Level = 4,
+                            Name = "Critical",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("44a7b91d-a0dd-45d1-8616-4d2f71e16401"),
+                            ColorCode = "#FF0000",
+                            IsDefault = true,
+                            Level = 5,
+                            Name = "Urgent",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketStatusMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketStatusMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("6b0c409b-3e80-4165-8b39-f3fcacb4c797"),
+                            ColorCode = "#FFCC99",
+                            Description = "This is a newly created issue.",
+                            IsDefault = true,
+                            Name = "New",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("6c5ac37d-5b7d-40f3-adec-2dabaa5cca86"),
+                            ColorCode = "#E6FF99",
+                            Description = "Assigned to employee or team of employees",
+                            IsDefault = true,
+                            Name = "Assigned",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("7f96bcd5-0c66-411b-8a1d-9d1a4785194e"),
+                            ColorCode = "#99E6FF",
+                            Description = "These issues are currently in progress",
+                            IsDefault = true,
+                            Name = "In Progress",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5c72b630-6923-4215-bf2c-b1622afd76e7"),
+                            ColorCode = "#6c757d",
+                            Description = "These issues are currently under review",
+                            IsDefault = true,
+                            Name = "In Review",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("8ff85685-a875-4f21-aa95-d99551315fcc"),
+                            ColorCode = "#B399FF",
+                            Description = "The following issues are resolved and closed",
+                            IsDefault = true,
+                            Name = "Done",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.TicketTagMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ColorCode")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsDefault")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("TicketTagMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("ef6c2a65-f61d-4537-9650-a7ab7f8d98db"),
+                            ColorCode = "#e59866",
+                            IsDefault = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("5a168569-8ad7-4422-8db6-51ef25caddeb"),
+                            ColorCode = "#85c1e9",
+                            IsDefault = true,
+                            Name = "Help Desk",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkCategoryMasters");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("86bb2cc8-f6b5-4fdd-bbee-c389c713a44b"),
+                            Description = "Created new task in a professional or creative context",
+                            IsSystem = true,
+                            Name = "Fresh Work",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("9ebfa19c-53b9-481b-b863-c25d2f843201"),
+                            Description = "Revising, modifying, or correcting a task to improve its quality or fix issues",
+                            IsSystem = true,
+                            Name = "Rework",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        },
+                        new
+                        {
+                            Id = new Guid("11a79929-1d07-42dc-9e98-82d0d2f4a240"),
+                            Description = "Any defect, deviation, or non-conformance in a task that fails to meet established standards or customer expectations.",
+                            IsSystem = true,
+                            Name = "Quality Issue",
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Buildings");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("BuildingId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("FloorName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("BuildingId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Floor");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProjectAddress")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("ProjectStatusId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ShortName")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("StartDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProjectStatusId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("Projects");
+
+                    b.HasData(
+                        new
+                        {
+                            Id = new Guid("85bf587b-7ca9-4685-b77c-d817f5847e85"),
+                            ContactPerson = "Project 1 Contact Person",
+                            EndDate = new DateTime(2026, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            Name = "Project 1",
+                            ProjectAddress = "Project 1 Address",
+                            ProjectStatusId = new Guid("b74da4c2-d07e-46f2-9919-e75e49b12731"),
+                            StartDate = new DateTime(2025, 4, 20, 10, 11, 17, 588, DateTimeKind.Unspecified),
+                            TenantId = new Guid("b3466e83-7e11-464c-b93a-daf047838b26")
+                        });
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("AllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("EmployeeId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("JobRoleId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ProjectId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("ReAllocationDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EmployeeId");
+
+                    b.HasIndex("ProjectId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ProjectAllocations");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("AreaName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("FloorId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("FloorId");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("WorkAreas");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("ActivityId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<double>("CompletedWork")
+                        .HasColumnType("double");
+
+                    b.Property<double>("PlannedWork")
+                        .HasColumnType("double");
+
+                    b.Property<DateTime>("TaskDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid>("WorkAreaId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<Guid?>("WorkCategoryId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ActivityId");
+
+                    b.HasIndex("TenantId");
+
+                    b.HasIndex("WorkAreaId");
+
+                    b.HasIndex("WorkCategoryId");
+
+                    b.ToTable("WorkItems");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("IsSystem")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Role")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("ApplicationRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("TenantId");
+
+                    b.ToTable("JobRoles");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Utilities.Inquiries", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("About")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContactPerson")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid>("IndustryId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("OragnizationSize")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("OrganizatioinName")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Inquiries");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("RoleId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
+                {
+                    b.Property<string>("Id")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Discriminator")
+                        .IsRequired()
+                        .HasMaxLength(21)
+                        .HasColumnType("varchar(21)");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasDiscriminator().HasValue("IdentityUser");
+
+                    b.UseTphMappingStrategy();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UserId")
+                        .IsRequired()
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("RoleId")
+                        .HasColumnType("varchar(255)");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.Property<string>("UserId")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.ApplicationUser", b =>
+                {
+                    b.HasBaseType("Microsoft.AspNetCore.Identity.IdentityUser");
+
+                    b.Property<bool>("IsActive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool?>("IsRootUser")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid>("TenantId")
+                        .HasColumnType("char(36)");
+
+                    b.HasDiscriminator().HasValue("ApplicationUser");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("AssignedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkItem", "WorkItem")
+                        .WithMany()
+                        .HasForeignKey("WorkItemId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkItem");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("CommentedBy")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Activities.TaskMembers", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Activities.TaskAllocation", "TaskAllocation")
+                        .WithMany()
+                        .HasForeignKey("TaskAllocationId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("TaskAllocation");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.Attendance", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Approver")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Approver");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.AttendanceModule.AttendanceLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.AttendanceModule.Attendance", "Attendance")
+                        .WithMany()
+                        .HasForeignKey("AttendanceId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.DocumentManager.Document", "Document")
+                        .WithMany()
+                        .HasForeignKey("DocumentId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedByEmployee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedBy");
+
+                    b.Navigation("Attendance");
+
+                    b.Navigation("Document");
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedByEmployee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Authentication.RefreshToken", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Bucket", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedByID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.Contact", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.ContactCategoryMaster", "ContactCategory")
+                        .WithMany()
+                        .HasForeignKey("ContactCategoryId");
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedBy")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById");
+
+                    b.Navigation("ContactCategory");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedBy");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactEmail", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactNote", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Createdby")
+                        .WithMany()
+                        .HasForeignKey("CreatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedBy")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById");
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("Createdby");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedBy");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Contact", "Contact")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    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")
+                        .WithMany()
+                        .HasForeignKey("ContactId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Directory.ContactTagMaster", "ContactTag")
+                        .WithMany()
+                        .HasForeignKey("ContactTagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Contact");
+
+                    b.Navigation("ContactTag");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.DirectoryUpdateLog", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Directory.EmployeeBucketMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Directory.Bucket", "Bucket")
+                        .WithMany()
+                        .HasForeignKey("BucketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Bucket");
+
+                    b.Navigation("Employee");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.Employee", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.ApplicationUser", "ApplicationUser")
+                        .WithMany()
+                        .HasForeignKey("ApplicationUserId");
+
+                    b.HasOne("Marco.Pms.Model.Roles.JobRole", "JobRole")
+                        .WithMany()
+                        .HasForeignKey("JobRoleId");
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ApplicationUser");
+
+                    b.Navigation("JobRole");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.EmployeeRoleMapping", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", "Role")
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Employee");
+
+                    b.Navigation("Role");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.FeaturePermission", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Feature", "Feature")
+                        .WithMany("FeaturePermissions")
+                        .HasForeignKey("FeatureId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Feature");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.RolePermissionMappings", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Roles.ApplicationRole", null)
+                        .WithMany()
+                        .HasForeignKey("ApplicationRoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.FeaturePermission", null)
+                        .WithMany()
+                        .HasForeignKey("FeaturePermissionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Entitlements.Tenant", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Industry", "Industry")
+                        .WithMany()
+                        .HasForeignKey("IndustryId");
+
+                    b.Navigation("Industry");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketAttachment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Forum.TicketComment", "TicketComment")
+                        .WithMany("Attachments")
+                        .HasForeignKey("CommentId");
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Ticket");
+
+                    b.Navigation("TicketComment");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketForum", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketPriorityMaster", "Priority")
+                        .WithMany()
+                        .HasForeignKey("PriorityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.TicketStatusMaster", "TicketStatusMaster")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketTypeMaster", "TicketTypeMaster")
+                        .WithMany()
+                        .HasForeignKey("TypeId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Priority");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("TicketStatusMaster");
+
+                    b.Navigation("TicketTypeMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketTag", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.TicketTagMaster", "Tag")
+                        .WithMany()
+                        .HasForeignKey("TagId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Forum.TicketForum", "Ticket")
+                        .WithMany()
+                        .HasForeignKey("TicketId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tag");
+
+                    b.Navigation("Ticket");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Mail.MailDetails", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Mail.MailingList", "MailBody")
+                        .WithMany()
+                        .HasForeignKey("MailListId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("MailBody");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.Module", "Module")
+                        .WithMany()
+                        .HasForeignKey("ModuleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Module");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Floor", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Building", "Building")
+                        .WithMany()
+                        .HasForeignKey("BuildingId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Building");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.Project", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.StatusMaster", "ProjectStatus")
+                        .WithMany()
+                        .HasForeignKey("ProjectStatusId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ProjectStatus");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.ProjectAllocation", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "Employee")
+                        .WithMany()
+                        .HasForeignKey("EmployeeId")
+                        .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("Employee");
+
+                    b.Navigation("Project");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkArea", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Projects.Floor", "Floor")
+                        .WithMany()
+                        .HasForeignKey("FloorId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Floor");
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Projects.WorkItem", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Master.ActivityMaster", "ActivityMaster")
+                        .WithMany()
+                        .HasForeignKey("ActivityId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Projects.WorkArea", "WorkArea")
+                        .WithMany()
+                        .HasForeignKey("WorkAreaId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Marco.Pms.Model.Master.WorkCategoryMaster", "WorkCategoryMaster")
+                        .WithMany()
+                        .HasForeignKey("WorkCategoryId");
+
+                    b.Navigation("ActivityMaster");
+
+                    b.Navigation("Tenant");
+
+                    b.Navigation("WorkArea");
+
+                    b.Navigation("WorkCategoryMaster");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", null)
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b =>
+                {
+                    b.HasOne("Marco.Pms.Model.Entitlements.Tenant", "Tenant")
+                        .WithMany()
+                        .HasForeignKey("TenantId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Tenant");
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
+                {
+                    b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b =>
+                {
+                    b.Navigation("Attachments");
+                });
+
+            modelBuilder.Entity("Marco.Pms.Model.Master.Feature", b =>
+                {
+                    b.Navigation("FeaturePermissions");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.cs b/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.cs
new file mode 100644
index 0000000..0ec34c3
--- /dev/null
+++ b/Marco.Pms.DataAccess/Migrations/20250623075527_Added_UpdatedBy_In_Contacts_And_ContactNotes_Table.cs
@@ -0,0 +1,101 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Marco.Pms.DataAccess.Migrations
+{
+    /// <inheritdoc />
+    public partial class Added_UpdatedBy_In_Contacts_And_ContactNotes_Table : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "Contacts",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "UpdatedById",
+                table: "Contacts",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "UpdatedAt",
+                table: "ContactNotes",
+                type: "datetime(6)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "UpdatedById",
+                table: "ContactNotes",
+                type: "char(36)",
+                nullable: true,
+                collation: "ascii_general_ci");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Contacts_UpdatedById",
+                table: "Contacts",
+                column: "UpdatedById");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ContactNotes_UpdatedById",
+                table: "ContactNotes",
+                column: "UpdatedById");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ContactNotes_Employees_UpdatedById",
+                table: "ContactNotes",
+                column: "UpdatedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Contacts_Employees_UpdatedById",
+                table: "Contacts",
+                column: "UpdatedById",
+                principalTable: "Employees",
+                principalColumn: "Id");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_ContactNotes_Employees_UpdatedById",
+                table: "ContactNotes");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Contacts_Employees_UpdatedById",
+                table: "Contacts");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Contacts_UpdatedById",
+                table: "Contacts");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ContactNotes_UpdatedById",
+                table: "ContactNotes");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                table: "Contacts");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedById",
+                table: "Contacts");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedAt",
+                table: "ContactNotes");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedById",
+                table: "ContactNotes");
+        }
+    }
+}
diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
index cb07f1e..c57af7a 100644
--- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
+++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs
@@ -434,6 +434,12 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<Guid>("TenantId")
                         .HasColumnType("char(36)");
 
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid?>("UpdatedById")
+                        .HasColumnType("char(36)");
+
                     b.HasKey("Id");
 
                     b.HasIndex("ContactCategoryId");
@@ -442,6 +448,8 @@ namespace Marco.Pms.DataAccess.Migrations
 
                     b.HasIndex("TenantId");
 
+                    b.HasIndex("UpdatedById");
+
                     b.ToTable("Contacts");
                 });
 
@@ -545,6 +553,12 @@ namespace Marco.Pms.DataAccess.Migrations
                     b.Property<Guid>("TenantId")
                         .HasColumnType("char(36)");
 
+                    b.Property<DateTime?>("UpdatedAt")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid?>("UpdatedById")
+                        .HasColumnType("char(36)");
+
                     b.HasKey("Id");
 
                     b.HasIndex("ContactId");
@@ -553,6 +567,8 @@ namespace Marco.Pms.DataAccess.Migrations
 
                     b.HasIndex("TenantId");
 
+                    b.HasIndex("UpdatedById");
+
                     b.ToTable("ContactNotes");
                 });
 
@@ -2742,11 +2758,17 @@ namespace Marco.Pms.DataAccess.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedBy")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById");
+
                     b.Navigation("ContactCategory");
 
                     b.Navigation("CreatedBy");
 
                     b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedBy");
                 });
 
             modelBuilder.Entity("Marco.Pms.Model.Directory.ContactBucketMapping", b =>
@@ -2810,11 +2832,17 @@ namespace Marco.Pms.DataAccess.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("Marco.Pms.Model.Employees.Employee", "UpdatedBy")
+                        .WithMany()
+                        .HasForeignKey("UpdatedById");
+
                     b.Navigation("Contact");
 
                     b.Navigation("Createdby");
 
                     b.Navigation("Tenant");
+
+                    b.Navigation("UpdatedBy");
                 });
 
             modelBuilder.Entity("Marco.Pms.Model.Directory.ContactPhone", b =>
diff --git a/Marco.Pms.Model/Directory/Contact.cs b/Marco.Pms.Model/Directory/Contact.cs
index ecdd622..fe82711 100644
--- a/Marco.Pms.Model/Directory/Contact.cs
+++ b/Marco.Pms.Model/Directory/Contact.cs
@@ -20,6 +20,11 @@ namespace Marco.Pms.Model.Directory
         [ValidateNever]
         [ForeignKey("CreatedById")]
         public Employee? CreatedBy { get; set; }
+        public Guid? UpdatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("UpdatedById")]
+        public Employee? UpdatedBy { get; set; }
 
         [DisplayName("ContactCategoryId")]
         public Guid? ContactCategoryId { get; set; }
@@ -27,5 +32,6 @@ namespace Marco.Pms.Model.Directory
         [ForeignKey(nameof(ContactCategoryId))]
         public ContactCategoryMaster? ContactCategory { get; set; }
         public DateTime CreatedAt { get; set; }
+        public DateTime? UpdatedAt { get; set; }
     }
 }
diff --git a/Marco.Pms.Model/Directory/ContactNote.cs b/Marco.Pms.Model/Directory/ContactNote.cs
index e203f1d..57e21e9 100644
--- a/Marco.Pms.Model/Directory/ContactNote.cs
+++ b/Marco.Pms.Model/Directory/ContactNote.cs
@@ -14,7 +14,13 @@ namespace Marco.Pms.Model.Directory
         [ValidateNever]
         [ForeignKey("CreatedById")]
         public Employee? Createdby { get; set; }
+        public Guid? UpdatedById { get; set; }
+
+        [ValidateNever]
+        [ForeignKey("UpdatedById")]
+        public Employee? UpdatedBy { get; set; }
         public DateTime CreatedAt { get; set; } = DateTime.UtcNow;
+        public DateTime? UpdatedAt { get; set; }
         public Guid ContactId { get; set; }
 
         [ValidateNever]
diff --git a/Marco.Pms.Model/Mapper/DirectoryMapper.cs b/Marco.Pms.Model/Mapper/DirectoryMapper.cs
index 381c4b0..faf0539 100644
--- a/Marco.Pms.Model/Mapper/DirectoryMapper.cs
+++ b/Marco.Pms.Model/Mapper/DirectoryMapper.cs
@@ -234,7 +234,9 @@ namespace Marco.Pms.Model.Mapper
                 Note = note.Note,
                 ContactId = note.ContactId,
                 CreatedAt = note.CreatedAt,
+                UpdatedAt = note.UpdatedAt,
                 CreatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null,
+                UpdatedBy = note.UpdatedBy != null ? note.UpdatedBy.ToBasicEmployeeVMFromEmployee() : null,
                 IsActive = note.IsActive
             };
         }
diff --git a/Marco.Pms.Services/Controllers/DirectoryController.cs b/Marco.Pms.Services/Controllers/DirectoryController.cs
index 2bf22ea..0555868 100644
--- a/Marco.Pms.Services/Controllers/DirectoryController.cs
+++ b/Marco.Pms.Services/Controllers/DirectoryController.cs
@@ -158,6 +158,13 @@ namespace Marco.Pms.Services.Controllers
 
         // -------------------------------- Contact Notes  --------------------------------
 
+        [HttpGet("notes")]
+        public async Task<IActionResult> GetListOFAllNotes([FromQuery] int? pageSize, [FromQuery] int pageNumber)
+        {
+            var response = await _directoryHelper.GetListOFAllNotes(pageSize ?? 25, pageNumber);
+            return StatusCode(response.StatusCode, response);
+        }
+
         [HttpPost("note")]
         public async Task<IActionResult> CreateContactNote([FromBody] CreateContactNoteDto noteDto)
         {
diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
index d14e44c..2d06785 100644
--- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs
+++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
@@ -7,6 +7,7 @@ using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Directory;
 using Marco.Pms.Model.ViewModels.Master;
 using Marco.Pms.Model.ViewModels.Projects;
+using Marco.Pms.Services.Service;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.EntityFrameworkCore;
@@ -18,15 +19,17 @@ namespace Marco.Pms.Services.Helpers
         private readonly ApplicationDbContext _context;
         private readonly ILoggingService _logger;
         private readonly UserHelper _userHelper;
+        private readonly PermissionServices _permissionServices;
         private readonly Guid directoryAdmin;
         private readonly Guid directoryManager;
         private readonly Guid directoryUser;
 
-        public DirectoryHelper(ApplicationDbContext context, ILoggingService logger, UserHelper userHelper)
+        public DirectoryHelper(ApplicationDbContext context, ILoggingService logger, UserHelper userHelper, PermissionServices permissionServices)
         {
             _context = context;
             _logger = logger;
             _userHelper = userHelper;
+            _permissionServices = permissionServices;
             directoryAdmin = Guid.Parse("4286a13b-bb40-4879-8c6d-18e9e393beda");
             directoryManager = Guid.Parse("62668630-13ce-4f52-a0f0-db38af2230c5");
             directoryUser = Guid.Parse("0f919170-92d4-4337-abd3-49b66fc871bb");
@@ -504,6 +507,8 @@ namespace Marco.Pms.Services.Helpers
 
 
                 var newContact = updateContact.ToContactFromUpdateContactDto(tenantId, contact);
+                newContact.UpdatedById = LoggedInEmployee.Id;
+                newContact.UpdatedAt = DateTime.UtcNow;
                 _context.Contacts.Update(newContact);
                 await _context.SaveChangesAsync();
 
@@ -893,6 +898,110 @@ namespace Marco.Pms.Services.Helpers
 
         // -------------------------------- Contact Notes  --------------------------------
 
+        /// <summary>
+        /// Retrieves a paginated list of contact notes based on user permissions.
+        /// </summary>
+        /// <param name="pageSize">The number of items per page.</param>
+        /// <param name="pageNumber">The current page number.</param>
+        /// <returns>An ApiResponse containing the paginated notes or an error message.</returns>
+        public async Task<ApiResponse<object>> GetListOFAllNotes(int pageSize, int pageNumber)
+        {
+            _logger.LogInfo("Attempting to fetch list of all notes. PageSize: {PageSize}, PageNumber: {PageNumber}", pageSize, pageNumber);
+
+            Guid tenantId = _userHelper.GetTenantId();
+            var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+
+            if (loggedInEmployee == null)
+            {
+                _logger.LogWarning("GetListOFAllNotes: LoggedInEmployee is null. Cannot proceed.");
+                return ApiResponse<object>.ErrorResponse("Unauthorized", "Employee not found.", 401);
+            }
+
+            // --- Permission Checks ---
+            var hasAdminPermission = await _permissionServices.HasPermission(directoryAdmin, loggedInEmployee.Id);
+            var hasManagerPermission = await _permissionServices.HasPermission(directoryManager, loggedInEmployee.Id);
+            var hasUserPermission = await _permissionServices.HasPermission(directoryUser, loggedInEmployee.Id);
+
+            IQueryable<ContactNote> notesQuery = _context.ContactNotes
+                                                    .Include(cn => cn.UpdatedBy)
+                                                    .Include(cn => cn.Createdby) // Assuming 'CreatedBy' (PascalCase)
+                                                    .Where(cn => cn.TenantId == tenantId)
+                                                    .AsQueryable(); // Start building the query
+
+            if (!hasAdminPermission && !(hasManagerPermission || hasUserPermission))
+            {
+                _logger.LogWarning("GetListOFAllNotes: User {EmployeeId} does not have required permissions to access notes for TenantId: {TenantId}", loggedInEmployee.Id, tenantId);
+                return ApiResponse<object>.ErrorResponse("Access Denied", "You don't have access to view notes.", 403);
+            }
+
+            if (!hasAdminPermission) // If not an admin, apply additional filtering
+            {
+                _logger.LogInfo("GetListOFAllNotes: User {EmployeeId} is not an admin. Applying manager/user specific filters.", loggedInEmployee.Id);
+                var assignedBucketIds = await _context.EmployeeBucketMappings
+                    .Where(eb => eb.EmployeeId == loggedInEmployee.Id)
+                    .Select(eb => eb.BucketId)
+                    .ToListAsync();
+
+                if (!assignedBucketIds.Any())
+                {
+                    _logger.LogInfo("GetListOFAllNotes: User {EmployeeId} has no assigned buckets. Returning empty list.", loggedInEmployee.Id);
+                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteVM>() }, "No notes found based on assigned buckets.", 200);
+                }
+
+                var contactIds = await _context.ContactBucketMappings
+                    .Where(cb => assignedBucketIds.Contains(cb.BucketId))
+                    .Select(cb => cb.ContactId)
+                    .ToListAsync();
+
+                if (!contactIds.Any())
+                {
+                    _logger.LogInfo("GetListOFAllNotes: No contacts found for assigned buckets for user {EmployeeId}. Returning empty list.", loggedInEmployee.Id);
+                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteVM>() }, "No notes found for associated contacts.", 200);
+                }
+
+                notesQuery = notesQuery.Where(cn => contactIds.Contains(cn.ContactId));
+            }
+
+            // --- Pagination Logic ---
+            // Ensure pageSize and pageNumber are valid
+            pageSize = pageSize < 1 ? 25 : pageSize; // Default to 25 if less than 1
+            pageNumber = pageNumber < 1 ? 1 : pageNumber; // Default to 1 if less than 1
+
+            // Get total count BEFORE applying Skip/Take for accurate pagination metadata
+            int totalRecords = await notesQuery.CountAsync();
+            int totalPages = (int)Math.Ceiling((double)totalRecords / pageSize);
+
+            int skip = (pageNumber - 1) * pageSize;
+
+            // --- Apply Ordering and Pagination in the database ---
+            List<ContactNote> notes = await notesQuery
+                .OrderByDescending(cn => (cn.UpdatedAt != null ? cn.UpdatedAt : cn.CreatedAt)) // Order by updated date or created date
+                .Skip(skip)
+                .Take(pageSize)
+                .ToListAsync();
+
+            _logger.LogInfo("GetListOFAllNotes: Fetched {Count} notes for page {PageNumber} of {TotalPages} total pages. Total records: {TotalRecords}.",
+                                    notes.Count, pageNumber, totalPages, totalRecords);
+
+            // --- Map to ViewModel (in-memory) ---
+            // This mapping is done in memory because ToBasicEmployeeVMFromEmployee() is likely a C# method
+            // that cannot be translated to SQL by Entity Framework.
+            List<ContactNoteVM> noteVMS = notes
+                .Select(cn => cn.ToContactNoteVMFromContactNote())
+                .ToList();
+
+            var response = new
+            {
+                CurrentPage = pageNumber,
+                PageSize = pageSize, // Include pageSize in response for client clarity
+                TotalPages = totalPages,
+                TotalRecords = totalRecords, // Add total records for client
+                Data = noteVMS
+            };
+
+            _logger.LogInfo("GetListOFAllNotes: Successfully retrieved notes and mapped to ViewModel for TenantId: {TenantId}.", tenantId);
+            return ApiResponse<object>.SuccessResponse(response, $"{noteVMS.Count} notes fetched successfully.", 200);
+        }
         public async Task<ApiResponse<object>> GetNoteListByContactId(Guid id, bool active)
         {
             Guid tenantId = _userHelper.GetTenantId();
@@ -903,32 +1012,25 @@ namespace Marco.Pms.Services.Helpers
                 List<ContactNote> notes = new List<ContactNote>();
                 if (active)
                 {
-                    notes = await _context.ContactNotes.Include(n => n.Createdby).Where(n => n.ContactId == contact.Id && n.IsActive && n.TenantId == tenantId).ToListAsync();
+                    notes = await _context.ContactNotes
+                        .Include(n => n.Createdby)
+                        .Include(n => n.UpdatedBy)
+                        .Where(n => n.ContactId == contact.Id && n.IsActive && n.TenantId == tenantId)
+                        .ToListAsync();
                 }
                 else
                 {
-                    notes = await _context.ContactNotes.Include(n => n.Createdby).Where(n => n.ContactId == contact.Id && n.TenantId == tenantId).ToListAsync();
+                    notes = await _context.ContactNotes
+                        .Include(n => n.Createdby)
+                        .Include(n => n.UpdatedBy)
+                        .Where(n => n.ContactId == contact.Id && n.TenantId == tenantId)
+                        .ToListAsync();
                 }
                 var noteIds = notes.Select(n => n.Id).ToList();
                 List<DirectoryUpdateLog>? updateLogs = await _context.DirectoryUpdateLogs.Include(l => l.Employee).Where(l => noteIds.Contains(l.RefereanceId)).ToListAsync();
-                List<ContactNoteVM>? noteVMs = new List<ContactNoteVM>();
-                foreach (var note in notes)
-                {
-                    ContactNoteVM noteVM = note.ToContactNoteVMFromContactNote();
-                    DirectoryUpdateLog? updateLog = updateLogs.Where(l => l.RefereanceId == note.Id).OrderByDescending(l => l.UpdateAt).FirstOrDefault();
-                    if (updateLog != null)
-                    {
-                        noteVM.UpdatedAt = updateLog.UpdateAt;
-                        noteVM.UpdatedBy = updateLog.Employee != null ? updateLog.Employee.ToBasicEmployeeVMFromEmployee() : null;
-                    }
-                    else
-                    {
-                        noteVM.UpdatedAt = note.CreatedAt;
-                        noteVM.UpdatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null;
-                    }
-                    noteVMs.Add(noteVM);
+                //List<ContactNoteVM>? noteVMs = new List<ContactNoteVM>();
+                List<ContactNoteVM>? noteVMs = notes.Select(n => n.ToContactNoteVMFromContactNote()).ToList();
 
-                }
                 _logger.LogInfo("{count} contact-notes record from contact {ContactId} fetched by Employee {EmployeeId}", noteVMs.Count, id, LoggedInEmployee.Id);
                 return ApiResponse<object>.SuccessResponse(noteVMs, $"{noteVMs.Count} contact-notes record fetched successfully", 200);
             }
@@ -970,6 +1072,8 @@ namespace Marco.Pms.Services.Helpers
                     if (contactNote != null)
                     {
                         contactNote.Note = noteDto.Note;
+                        contactNote.UpdatedById = LoggedInEmployee.Id;
+                        contactNote.UpdatedAt = DateTime.UtcNow;
 
                         _context.DirectoryUpdateLogs.Add(new DirectoryUpdateLog
                         {
@@ -1335,6 +1439,9 @@ namespace Marco.Pms.Services.Helpers
             _logger.LogWarning("Employee {EmployeeId} tries to delete bucket {BucketId} but not found in database", LoggedInEmployee.Id, id);
             return ApiResponse<object>.SuccessResponse(new { }, "Bucket deleted successfully", 200);
         }
+
+        // -------------------------------- Helper  --------------------------------
+
         private bool Compare(string sentence, string search)
         {
             sentence = sentence.Trim().ToLower();
-- 
2.43.0


From 9149c4e546b11c2cfb5e0362c147468556c32a4d Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 27 Jun 2025 10:58:29 +0530
Subject: [PATCH 47/48] Filtered conatct notes by projects and added contact
 name and organization name in list VM

---
 Marco.Pms.Model/Mapper/DirectoryMapper.cs     | 18 ++++++-
 .../ViewModels/Directory/ContactNoteListVM.cs | 18 +++++++
 .../Controllers/DirectoryController.cs        |  6 +--
 Marco.Pms.Services/Helpers/DirectoryHelper.cs | 49 +++++++++++++++----
 .../Service/StartupDataSeeder.cs              | 10 ++--
 5 files changed, 83 insertions(+), 18 deletions(-)
 create mode 100644 Marco.Pms.Model/ViewModels/Directory/ContactNoteListVM.cs

diff --git a/Marco.Pms.Model/Mapper/DirectoryMapper.cs b/Marco.Pms.Model/Mapper/DirectoryMapper.cs
index faf0539..9f7d2dc 100644
--- a/Marco.Pms.Model/Mapper/DirectoryMapper.cs
+++ b/Marco.Pms.Model/Mapper/DirectoryMapper.cs
@@ -240,5 +240,21 @@ namespace Marco.Pms.Model.Mapper
                 IsActive = note.IsActive
             };
         }
+        public static ContactNoteListVM ToContactNoteListVMFromContactNote(this ContactNote note)
+        {
+            return new ContactNoteListVM
+            {
+                Id = note.Id,
+                Note = note.Note,
+                ContactName = note.Contact?.Name,
+                OrganizationName = note.Contact?.Organization,
+                ContactId = note.ContactId,
+                CreatedAt = note.CreatedAt,
+                UpdatedAt = note.UpdatedAt,
+                CreatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null,
+                UpdatedBy = note.UpdatedBy != null ? note.UpdatedBy.ToBasicEmployeeVMFromEmployee() : null,
+                IsActive = note.IsActive
+            };
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/Marco.Pms.Model/ViewModels/Directory/ContactNoteListVM.cs b/Marco.Pms.Model/ViewModels/Directory/ContactNoteListVM.cs
new file mode 100644
index 0000000..68451ed
--- /dev/null
+++ b/Marco.Pms.Model/ViewModels/Directory/ContactNoteListVM.cs
@@ -0,0 +1,18 @@
+using Marco.Pms.Model.ViewModels.Activities;
+
+namespace Marco.Pms.Model.ViewModels.Directory
+{
+    public class ContactNoteListVM
+    {
+        public Guid Id { get; set; }
+        public string? Note { get; set; }
+        public string? ContactName { get; set; }
+        public string? OrganizationName { get; set; }
+        public DateTime CreatedAt { get; set; }
+        public BasicEmployeeVM? CreatedBy { get; set; }
+        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/Controllers/DirectoryController.cs b/Marco.Pms.Services/Controllers/DirectoryController.cs
index 0555868..4a0e41e 100644
--- a/Marco.Pms.Services/Controllers/DirectoryController.cs
+++ b/Marco.Pms.Services/Controllers/DirectoryController.cs
@@ -159,9 +159,9 @@ namespace Marco.Pms.Services.Controllers
         // -------------------------------- Contact Notes  --------------------------------
 
         [HttpGet("notes")]
-        public async Task<IActionResult> GetListOFAllNotes([FromQuery] int? pageSize, [FromQuery] int pageNumber)
+        public async Task<IActionResult> GetListOFAllNotes([FromQuery] Guid? projectId, [FromQuery] int? pageSize, [FromQuery] int pageNumber)
         {
-            var response = await _directoryHelper.GetListOFAllNotes(pageSize ?? 25, pageNumber);
+            var response = await _directoryHelper.GetListOFAllNotes(projectId, pageSize ?? 25, pageNumber);
             return StatusCode(response.StatusCode, response);
         }
 
@@ -345,4 +345,4 @@ namespace Marco.Pms.Services.Controllers
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
index 2d06785..301c708 100644
--- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs
+++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
@@ -904,12 +904,13 @@ namespace Marco.Pms.Services.Helpers
         /// <param name="pageSize">The number of items per page.</param>
         /// <param name="pageNumber">The current page number.</param>
         /// <returns>An ApiResponse containing the paginated notes or an error message.</returns>
-        public async Task<ApiResponse<object>> GetListOFAllNotes(int pageSize, int pageNumber)
+        public async Task<ApiResponse<object>> GetListOFAllNotes(Guid? projectId, int pageSize, int pageNumber)
         {
             _logger.LogInfo("Attempting to fetch list of all notes. PageSize: {PageSize}, PageNumber: {PageNumber}", pageSize, pageNumber);
 
             Guid tenantId = _userHelper.GetTenantId();
             var loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            List<Guid>? projectContactIds = null;
 
             if (loggedInEmployee == null)
             {
@@ -925,6 +926,7 @@ namespace Marco.Pms.Services.Helpers
             IQueryable<ContactNote> notesQuery = _context.ContactNotes
                                                     .Include(cn => cn.UpdatedBy)
                                                     .Include(cn => cn.Createdby) // Assuming 'CreatedBy' (PascalCase)
+                                                    .Include(cn => cn.Contact)
                                                     .Where(cn => cn.TenantId == tenantId)
                                                     .AsQueryable(); // Start building the query
 
@@ -933,7 +935,13 @@ namespace Marco.Pms.Services.Helpers
                 _logger.LogWarning("GetListOFAllNotes: User {EmployeeId} does not have required permissions to access notes for TenantId: {TenantId}", loggedInEmployee.Id, tenantId);
                 return ApiResponse<object>.ErrorResponse("Access Denied", "You don't have access to view notes.", 403);
             }
-
+            if (projectId != null)
+            {
+                projectContactIds = await _context.ContactProjectMappings
+                    .Where(pc => pc.ProjectId == projectId)
+                    .Select(pc => pc.ContactId)
+                    .ToListAsync();
+            }
             if (!hasAdminPermission) // If not an admin, apply additional filtering
             {
                 _logger.LogInfo("GetListOFAllNotes: User {EmployeeId} is not an admin. Applying manager/user specific filters.", loggedInEmployee.Id);
@@ -945,22 +953,41 @@ namespace Marco.Pms.Services.Helpers
                 if (!assignedBucketIds.Any())
                 {
                     _logger.LogInfo("GetListOFAllNotes: User {EmployeeId} has no assigned buckets. Returning empty list.", loggedInEmployee.Id);
-                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteVM>() }, "No notes found based on assigned buckets.", 200);
+                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteListVM>() }, "No notes found based on assigned buckets.", 200);
                 }
 
-                var contactIds = await _context.ContactBucketMappings
+                List<Guid>? contactIds = null;
+
+                if (projectContactIds == null)
+                {
+                    contactIds = await _context.ContactBucketMappings
                     .Where(cb => assignedBucketIds.Contains(cb.BucketId))
                     .Select(cb => cb.ContactId)
                     .ToListAsync();
+                }
+                else
+                {
+                    contactIds = await _context.ContactBucketMappings
+                    .Where(cb => assignedBucketIds.Contains(cb.BucketId) && projectContactIds.Contains(cb.ContactId))
+                    .Select(cb => cb.ContactId)
+                    .ToListAsync();
+                }
 
                 if (!contactIds.Any())
                 {
                     _logger.LogInfo("GetListOFAllNotes: No contacts found for assigned buckets for user {EmployeeId}. Returning empty list.", loggedInEmployee.Id);
-                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteVM>() }, "No notes found for associated contacts.", 200);
+                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteListVM>() }, "No notes found for associated contacts.", 200);
                 }
 
                 notesQuery = notesQuery.Where(cn => contactIds.Contains(cn.ContactId));
             }
+            else
+            {
+                if (projectContactIds != null)
+                {
+                    notesQuery = notesQuery.Where(cn => projectContactIds.Contains(cn.ContactId));
+                }
+            }
 
             // --- Pagination Logic ---
             // Ensure pageSize and pageNumber are valid
@@ -986,8 +1013,9 @@ namespace Marco.Pms.Services.Helpers
             // --- Map to ViewModel (in-memory) ---
             // This mapping is done in memory because ToBasicEmployeeVMFromEmployee() is likely a C# method
             // that cannot be translated to SQL by Entity Framework.
-            List<ContactNoteVM> noteVMS = notes
-                .Select(cn => cn.ToContactNoteVMFromContactNote())
+
+            List<ContactNoteListVM> noteVMS = notes
+                .Select(cn => cn.ToContactNoteListVMFromContactNote())
                 .ToList();
 
             var response = new
@@ -1068,7 +1096,7 @@ namespace Marco.Pms.Services.Helpers
                 Contact? contact = await _context.Contacts.FirstOrDefaultAsync(c => c.Id == noteDto.ContactId && c.IsActive && c.TenantId == tenantId);
                 if (contact != null)
                 {
-                    ContactNote? contactNote = await _context.ContactNotes.FirstOrDefaultAsync(n => n.Id == noteDto.Id && n.ContactId == contact.Id && n.IsActive);
+                    ContactNote? contactNote = await _context.ContactNotes.Include(cn => cn.Createdby).FirstOrDefaultAsync(n => n.Id == noteDto.Id && n.ContactId == contact.Id && n.IsActive);
                     if (contactNote != null)
                     {
                         contactNote.Note = noteDto.Note;
@@ -1108,6 +1136,9 @@ namespace Marco.Pms.Services.Helpers
             if (note != null)
             {
                 note.IsActive = active;
+                note.UpdatedById = LoggedInEmployee.Id;
+                note.UpdatedAt = DateTime.UtcNow;
+
                 _context.DirectoryUpdateLogs.Add(new DirectoryUpdateLog
                 {
                     RefereanceId = id,
@@ -1452,4 +1483,4 @@ namespace Marco.Pms.Services.Helpers
             return result;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/Marco.Pms.Services/Service/StartupDataSeeder.cs b/Marco.Pms.Services/Service/StartupDataSeeder.cs
index a3e04f9..10d6f71 100644
--- a/Marco.Pms.Services/Service/StartupDataSeeder.cs
+++ b/Marco.Pms.Services/Service/StartupDataSeeder.cs
@@ -98,23 +98,23 @@ namespace Marco.Pms.Services.Service
                 IsSystem = true,
                 JoiningDate = Convert.ToDateTime("2000-04-20 10:11:17.588000"),
             };
-            if ((!await dbContext.Employees.Where(e => e.FirstName == "Admin").AnyAsync()) && (jobRole != null ? jobRole.Id : Guid.Empty) != Guid.Empty)
+            if ((!await dbContext.Employees.Where(e => e.Email == "admin@marcoaiot.com").AnyAsync()) && jobRole?.Id != Guid.Empty)
             {
                 await dbContext.Employees.AddAsync(employee);
             }
             else
             {
-                employee = await dbContext.Employees.Where(e => e.FirstName == "Admin").FirstOrDefaultAsync();
+                employee = await dbContext.Employees.Where(e => e.Email == "admin@marcoaiot.com").FirstOrDefaultAsync();
             }
             await dbContext.SaveChangesAsync();
             if (!await dbContext.EmployeeRoleMappings.AnyAsync())
             {
                 await dbContext.EmployeeRoleMappings.AddAsync(new EmployeeRoleMapping
                 {
-                    EmployeeId = employee != null ? employee.Id : Guid.Empty,
+                    EmployeeId = employee?.Id ?? Guid.Empty,
                     IsEnabled = true,
                     TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26"),
-                    RoleId = role != null ? role.Id : Guid.Empty
+                    RoleId = role?.Id ?? Guid.Empty
                 });
             }
             if (!await dbContext.RolePermissionMappings.AnyAsync())
@@ -136,4 +136,4 @@ namespace Marco.Pms.Services.Service
 
         public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
     }
-}
+}
\ No newline at end of file
-- 
2.43.0


From 2128e630d5cbbb03f89ba4d98744fd215591fa6f Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Fri, 27 Jun 2025 11:50:51 +0530
Subject: [PATCH 48/48] Added conatct name nd organization name in all contact
 note VMs

---
 Marco.Pms.Model/Mapper/DirectoryMapper.cs      | 14 --------------
 .../ViewModels/Directory/ContactNoteListVM.cs  | 18 ------------------
 .../ViewModels/Directory/ContactNoteVM.cs      |  2 ++
 Marco.Pms.Services/Helpers/DirectoryHelper.cs  | 10 +++++-----
 4 files changed, 7 insertions(+), 37 deletions(-)
 delete mode 100644 Marco.Pms.Model/ViewModels/Directory/ContactNoteListVM.cs

diff --git a/Marco.Pms.Model/Mapper/DirectoryMapper.cs b/Marco.Pms.Model/Mapper/DirectoryMapper.cs
index 9f7d2dc..b175cb7 100644
--- a/Marco.Pms.Model/Mapper/DirectoryMapper.cs
+++ b/Marco.Pms.Model/Mapper/DirectoryMapper.cs
@@ -229,20 +229,6 @@ namespace Marco.Pms.Model.Mapper
         public static ContactNoteVM ToContactNoteVMFromContactNote(this ContactNote note)
         {
             return new ContactNoteVM
-            {
-                Id = note.Id,
-                Note = note.Note,
-                ContactId = note.ContactId,
-                CreatedAt = note.CreatedAt,
-                UpdatedAt = note.UpdatedAt,
-                CreatedBy = note.Createdby != null ? note.Createdby.ToBasicEmployeeVMFromEmployee() : null,
-                UpdatedBy = note.UpdatedBy != null ? note.UpdatedBy.ToBasicEmployeeVMFromEmployee() : null,
-                IsActive = note.IsActive
-            };
-        }
-        public static ContactNoteListVM ToContactNoteListVMFromContactNote(this ContactNote note)
-        {
-            return new ContactNoteListVM
             {
                 Id = note.Id,
                 Note = note.Note,
diff --git a/Marco.Pms.Model/ViewModels/Directory/ContactNoteListVM.cs b/Marco.Pms.Model/ViewModels/Directory/ContactNoteListVM.cs
deleted file mode 100644
index 68451ed..0000000
--- a/Marco.Pms.Model/ViewModels/Directory/ContactNoteListVM.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using Marco.Pms.Model.ViewModels.Activities;
-
-namespace Marco.Pms.Model.ViewModels.Directory
-{
-    public class ContactNoteListVM
-    {
-        public Guid Id { get; set; }
-        public string? Note { get; set; }
-        public string? ContactName { get; set; }
-        public string? OrganizationName { get; set; }
-        public DateTime CreatedAt { get; set; }
-        public BasicEmployeeVM? CreatedBy { get; set; }
-        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.Model/ViewModels/Directory/ContactNoteVM.cs b/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs
index c00b0de..198fa85 100644
--- a/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs
+++ b/Marco.Pms.Model/ViewModels/Directory/ContactNoteVM.cs
@@ -6,6 +6,8 @@ namespace Marco.Pms.Model.ViewModels.Directory
     {
         public Guid Id { get; set; }
         public string Note { get; set; } = string.Empty;
+        public string? ContactName { get; set; }
+        public string? OrganizationName { get; set; }
         public DateTime CreatedAt { get; set; }
         public BasicEmployeeVM? CreatedBy { get; set; }
         public DateTime? UpdatedAt { get; set; }
diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
index 301c708..bafa36f 100644
--- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs
+++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
@@ -953,7 +953,7 @@ namespace Marco.Pms.Services.Helpers
                 if (!assignedBucketIds.Any())
                 {
                     _logger.LogInfo("GetListOFAllNotes: User {EmployeeId} has no assigned buckets. Returning empty list.", loggedInEmployee.Id);
-                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteListVM>() }, "No notes found based on assigned buckets.", 200);
+                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteVM>() }, "No notes found based on assigned buckets.", 200);
                 }
 
                 List<Guid>? contactIds = null;
@@ -976,7 +976,7 @@ namespace Marco.Pms.Services.Helpers
                 if (!contactIds.Any())
                 {
                     _logger.LogInfo("GetListOFAllNotes: No contacts found for assigned buckets for user {EmployeeId}. Returning empty list.", loggedInEmployee.Id);
-                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteListVM>() }, "No notes found for associated contacts.", 200);
+                    return ApiResponse<object>.SuccessResponse(new { CurrentPage = pageNumber, TotalPages = 0, Data = new List<ContactNoteVM>() }, "No notes found for associated contacts.", 200);
                 }
 
                 notesQuery = notesQuery.Where(cn => contactIds.Contains(cn.ContactId));
@@ -1014,8 +1014,8 @@ namespace Marco.Pms.Services.Helpers
             // This mapping is done in memory because ToBasicEmployeeVMFromEmployee() is likely a C# method
             // that cannot be translated to SQL by Entity Framework.
 
-            List<ContactNoteListVM> noteVMS = notes
-                .Select(cn => cn.ToContactNoteListVMFromContactNote())
+            List<ContactNoteVM> noteVMS = notes
+                .Select(cn => cn.ToContactNoteVMFromContactNote())
                 .ToList();
 
             var response = new
@@ -1096,7 +1096,7 @@ namespace Marco.Pms.Services.Helpers
                 Contact? contact = await _context.Contacts.FirstOrDefaultAsync(c => c.Id == noteDto.ContactId && c.IsActive && c.TenantId == tenantId);
                 if (contact != null)
                 {
-                    ContactNote? contactNote = await _context.ContactNotes.Include(cn => cn.Createdby).FirstOrDefaultAsync(n => n.Id == noteDto.Id && n.ContactId == contact.Id && n.IsActive);
+                    ContactNote? contactNote = await _context.ContactNotes.Include(cn => cn.Createdby).Include(cn => cn.Contact).FirstOrDefaultAsync(n => n.Id == noteDto.Id && n.ContactId == contact.Id && n.IsActive);
                     if (contactNote != null)
                     {
                         contactNote.Note = noteDto.Note;
-- 
2.43.0