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

Added default entries for the tenant in master tables depending upon its plan

Browse Source
This commit is contained in:
ashutosh.nehete 2025-08-16 16:59:36 +05:30
parent 3d6926864d
commit d8870b8140
6 changed files with 430 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -301,7 +301,8 @@ namespace Marco.Pms.DataAccess.Data
Level = 2, Level = 2,
IsDefault = true, IsDefault = true,
TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
}, new TicketPriorityMaster },
new TicketPriorityMaster
{ {
Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"), Id = new Guid("a13b7e59-16fd-4665-b5cf-a97399e8445a"),
Name = "High", Name = "High",
@ -309,7 +310,8 @@ namespace Marco.Pms.DataAccess.Data
Level = 3, Level = 3,
IsDefault = true, IsDefault = true,
TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
}, new TicketPriorityMaster },
new TicketPriorityMaster
{ {
Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"), Id = new Guid("f340fbc3-c9fd-46aa-b063-0093418830e4"),
Name = "Critical", Name = "Critical",
@ -346,6 +348,7 @@ namespace Marco.Pms.DataAccess.Data
TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26") TenantId = Guid.Parse("b3466e83-7e11-464c-b93a-daf047838b26")
} }
); );
modelBuilder.Entity<WorkCategoryMaster>().HasData( modelBuilder.Entity<WorkCategoryMaster>().HasData(
new WorkCategoryMaster new WorkCategoryMaster
{ {

1
Marco.Pms.Model/ViewModels/Tenant/SubscriptionPlanDetailsVM.cs
View File

@ -10,6 +10,7 @@ namespace Marco.Pms.Model.ViewModels.Tenant
public string? PlanName { get; set; } public string? PlanName { get; set; }
public string? Description { get; set; } public string? Description { get; set; }
public double Price { get; set; } public double Price { get; set; }
public double MaxUsers { get; set; }
public PLAN_FREQUENCY Frequency { get; set; } public PLAN_FREQUENCY Frequency { get; set; }
public DateTime StartDate { get; set; } public DateTime StartDate { get; set; }
public DateTime EndDate { get; set; } public DateTime EndDate { get; set; }

1
Marco.Pms.Model/ViewModels/Tenant/TenantDetailsVM.cs
View File

@ -23,6 +23,7 @@ namespace Marco.Pms.Model.ViewModels.Tenant
public string Reference { get; set; } = string.Empty; public string Reference { get; set; } = string.Empty;
public bool IsActive { get; set; } = true; public bool IsActive { get; set; } = true;
public bool IsSuperTenant { get; set; } = false; public bool IsSuperTenant { get; set; } = false;
public int SeatsAvailable { get; set; }
public int ActiveEmployees { get; set; } public int ActiveEmployees { get; set; }
public int InActiveEmployees { get; set; } public int InActiveEmployees { get; set; }
public int? ActiveProjects { get; set; } public int? ActiveProjects { get; set; }

86
Marco.Pms.Services/Controllers/TenantController.cs
View File

@ -338,7 +338,7 @@ namespace Marco.Pms.Services.Controllers
response.OnHoldProjects = projects.Count(p => p.ProjectStatusId == projectOnHoldStatus); response.OnHoldProjects = projects.Count(p => p.ProjectStatusId == projectOnHoldStatus);
response.InActiveProjects = projects.Count(p => p.ProjectStatusId == projectInActiveStatus); response.InActiveProjects = projects.Count(p => p.ProjectStatusId == projectInActiveStatus);
response.CompletedProjects = projects.Count(p => p.ProjectStatusId == projectCompletedStatus); response.CompletedProjects = projects.Count(p => p.ProjectStatusId == projectCompletedStatus);
response.SeatsAvailable = (int)(currentPlan?.MaxUsers ?? 1) - activeEmployeesCount;
response.ExpiryDate = expiryDate; response.ExpiryDate = expiryDate;
response.NextBillingDate = nextBillingDate; response.NextBillingDate = nextBillingDate;
response.CreatedBy = createdBy; response.CreatedBy = createdBy;
@ -1013,6 +1013,25 @@ namespace Marco.Pms.Services.Controllers
_logger.LogInfo("Removed {Count} role permission mappings for role {RoleId}", deleteMappings.Count, roleId); _logger.LogInfo("Removed {Count} role permission mappings for role {RoleId}", deleteMappings.Count, roleId);
} }
var _masteData = scope.ServiceProvider.GetRequiredService<MasterDataService>();
if (features.Modules?.ProjectManagement?.Enabled ?? false)
{
var workCategoryMaster = _masteData.GetWorkCategoriesData(tenant.Id);
var workStatusMaster = _masteData.GetWorkStatusesData(tenant.Id);
_context.WorkCategoryMasters.AddRange(workCategoryMaster);
_context.WorkStatusMasters.AddRange(workStatusMaster);
}
if (features.Modules?.Expense?.Enabled ?? false)
{
var expensesTypeMaster = _masteData.GetExpensesTypeesData(tenant.Id);
var paymentModeMatser = _masteData.GetPaymentModesData(tenant.Id);
_context.ExpensesTypeMaster.AddRange(expensesTypeMaster);
_context.PaymentModeMatser.AddRange(paymentModeMatser);
}
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
await transaction.CommitAsync(); await transaction.CommitAsync();
@ -1138,6 +1157,8 @@ namespace Marco.Pms.Services.Controllers
UpdatedAt = DateTime.UtcNow UpdatedAt = DateTime.UtcNow
}, "SubscriptionPlanModificationLog"); }, "SubscriptionPlanModificationLog");
return Ok(ApiResponse<object>.SuccessResponse(currentSubscription, "Subscription renewed/extended", 200)); return Ok(ApiResponse<object>.SuccessResponse(currentSubscription, "Subscription renewed/extended", 200));
} }
@ -1285,6 +1306,69 @@ namespace Marco.Pms.Services.Controllers
_logger.LogInfo("Permissions revoked: {Count} for Role={RoleId}", mappingsToRemove.Count, rootRoleId); _logger.LogInfo("Permissions revoked: {Count} for Role={RoleId}", mappingsToRemove.Count, rootRoleId);
} }
var _masteData = scope.ServiceProvider.GetRequiredService<MasterDataService>();
if (features.Modules?.ProjectManagement?.Enabled ?? false)
{
var workCategoryMaster = _masteData.GetWorkCategoriesData(tenant.Id);
var workStatusMaster = _masteData.GetWorkStatusesData(tenant.Id);
var workCategoryTask = Task.Run(async () =>
{
await using var _context = await _dbContextFactory.CreateDbContextAsync();
return await _context.WorkCategoryMasters.AnyAsync(wc => wc.IsSystem && wc.TenantId == tenant.Id);
});
var workStatusTask = Task.Run(async () =>
{
await using var _context = await _dbContextFactory.CreateDbContextAsync();
return await _context.WorkStatusMasters.AnyAsync(ws => ws.IsSystem && ws.TenantId == tenant.Id);
});
await Task.WhenAll(workCategoryTask, workStatusTask);
var workCategoryExist = workCategoryTask.Result;
var workStatusExist = workStatusTask.Result;
if (!workCategoryExist)
{
context.WorkCategoryMasters.AddRange(workCategoryMaster);
}
if (!workStatusExist)
{
context.WorkStatusMasters.AddRange(workStatusMaster);
}
}
if (features.Modules?.Expense?.Enabled ?? false)
{
var expensesTypeMaster = _masteData.GetExpensesTypeesData(tenant.Id);
var paymentModeMatser = _masteData.GetPaymentModesData(tenant.Id);
var expensesTypeTask = Task.Run(async () =>
{
await using var _context = await _dbContextFactory.CreateDbContextAsync();
var expensesTypeNames = expensesTypeMaster.Select(et => et.Name).ToList();
return await _context.ExpensesTypeMaster.AnyAsync(et => expensesTypeNames.Contains(et.Name) && et.TenantId == tenant.Id);
});
var paymentModeTask = Task.Run(async () =>
{
await using var _context = await _dbContextFactory.CreateDbContextAsync();
var paymentModeNames = paymentModeMatser.Select(py => py.Name).ToList();
return await _context.PaymentModeMatser.AnyAsync(py => paymentModeNames.Contains(py.Name) && py.TenantId == tenant.Id);
});
await Task.WhenAll(expensesTypeTask, paymentModeTask);
var expensesTypeExist = expensesTypeTask.Result;
var paymentModeExist = paymentModeTask.Result;
if (!expensesTypeExist)
{
context.ExpensesTypeMaster.AddRange(expensesTypeMaster);
}
if (!paymentModeExist)
{
context.PaymentModeMatser.AddRange(paymentModeMatser);
}
}
await context.SaveChangesAsync(); await context.SaveChangesAsync();
await transaction.CommitAsync(); await transaction.CommitAsync();

1
Marco.Pms.Services/Program.cs
View File

@ -172,6 +172,7 @@ builder.Services.AddTransient<S3UploadService>();
#region Customs Services #region Customs Services
builder.Services.AddScoped<RefreshTokenService>(); builder.Services.AddScoped<RefreshTokenService>();
builder.Services.AddScoped<PermissionServices>(); builder.Services.AddScoped<PermissionServices>();
builder.Services.AddScoped<MasterDataService>();
builder.Services.AddScoped<ISignalRService, SignalRService>(); builder.Services.AddScoped<ISignalRService, SignalRService>();
builder.Services.AddScoped<IProjectServices, ProjectServices>(); builder.Services.AddScoped<IProjectServices, ProjectServices>();
builder.Services.AddScoped<IExpensesService, ExpensesService>(); builder.Services.AddScoped<IExpensesService, ExpensesService>();

337
Marco.Pms.Services/Service/MasterDataService.cs Normal file
View File

@ -0,0 +1,337 @@
using Marco.Pms.Model.Forum;
using Marco.Pms.Model.Master;
namespace Marco.Pms.Services.Service
{
public class MasterDataService
{
public List<TicketStatusMaster> GetTicketStatusesData(Guid tenantId)
{
return new List<TicketStatusMaster>
{
new TicketStatusMaster
{
Id = Guid.NewGuid(),
Name = "New",
Description = "This is a newly created issue.",
ColorCode = "#FFCC99",
IsDefault = true,
TenantId = tenantId
},
new TicketStatusMaster
{
Id = Guid.NewGuid(),
Name = "Assigned",
Description = "Assigned to employee or team of employees",
ColorCode = "#E6FF99",
IsDefault = true,
TenantId = tenantId
},
new TicketStatusMaster
{
Id = Guid.NewGuid(),
Name = "In Progress",
Description = "These issues are currently in progress",
ColorCode = "#99E6FF",
IsDefault = true,
TenantId = tenantId
},
new TicketStatusMaster
{
Id = Guid.NewGuid(),
Name = "In Review",
Description = "These issues are currently under review",
ColorCode = "#8592a3",
IsDefault = true,
TenantId = tenantId
},
new TicketStatusMaster
{
Id = Guid.NewGuid(),
Name = "Done",
Description = "The following issues are resolved and closed",
ColorCode = "#B399FF",
IsDefault = true,
TenantId = tenantId
}
};
}
public List<TicketTypeMaster> GetTicketTypesData(Guid tenantId)
{
return new List<TicketTypeMaster>
{
new TicketTypeMaster
{
Id = Guid.NewGuid(),
Name = "Quality Issue",
Description = "An identified problem that affects the performance, reliability, or standards of a product or service",
IsDefault = true,
TenantId = tenantId
},
new TicketTypeMaster
{
Id = Guid.NewGuid(),
Name = "Help Desk",
Description = "A support service that assists users with technical issues, requests, or inquiries.",
IsDefault = true,
TenantId = tenantId
}
};
}
public List<TicketPriorityMaster> GetTicketPrioritysData(Guid tenantId)
{
return new List<TicketPriorityMaster>
{
new TicketPriorityMaster
{
Id = Guid.NewGuid(),
Name = "Low",
ColorCode = "008000",
Level = 1,
IsDefault = true,
TenantId = tenantId
},
new TicketPriorityMaster
{
Id = Guid.NewGuid(),
Name = "Medium",
ColorCode = "FFFF00",
Level = 2,
IsDefault = true,
TenantId = tenantId
},
new TicketPriorityMaster
{
Id = Guid.NewGuid(),
Name = "High",
ColorCode = "#FFA500",
Level = 3,
IsDefault = true,
TenantId = tenantId
},
new TicketPriorityMaster
{
Id = Guid.NewGuid(),
Name = "Critical",
ColorCode = "#FFA500",
Level = 4,
IsDefault = true,
TenantId = tenantId
},
new TicketPriorityMaster
{
Id = Guid.NewGuid(),
Name = "Urgent",
ColorCode = "#FF0000",
Level = 5,
IsDefault = true,
TenantId = tenantId
}
};
}
public List<TicketTagMaster> GetTicketTagsData(Guid tenantId)
{
return new List<TicketTagMaster>
{
new TicketTagMaster
{
Id = Guid.NewGuid(),
Name = "Quality Issue",
ColorCode = "#e59866",
IsDefault = true,
TenantId = tenantId
},
new TicketTagMaster
{
Id = Guid.NewGuid(),
Name = "Help Desk",
ColorCode = "#85c1e9",
IsDefault = true,
TenantId = tenantId
}
};
}
public List<WorkCategoryMaster> GetWorkCategoriesData(Guid tenantId)
{
return new List<WorkCategoryMaster>
{
new WorkCategoryMaster
{
Id = Guid.NewGuid(),
Name = "Fresh Work",
Description = "Created new task in a professional or creative context",
IsSystem = true,
TenantId = tenantId
},
new WorkCategoryMaster
{
Id = Guid.NewGuid(),
Name = "Rework",
Description = "Revising, modifying, or correcting a task to improve its quality or fix issues",
IsSystem = true,
TenantId = tenantId
},
new WorkCategoryMaster
{
Id = Guid.NewGuid(),
Name = "Quality Issue",
Description = "Any defect, deviation, or non-conformance in a task that fails to meet established standards or customer expectations.",
IsSystem = true,
TenantId = tenantId
}
};
}
public List<WorkStatusMaster> GetWorkStatusesData(Guid tenantId)
{
return new List<WorkStatusMaster>
{
new WorkStatusMaster
{
Id = Guid.NewGuid(),
Name = "Approve",
Description = "Confirm the tasks are actually finished as reported",
IsSystem = true,
TenantId = tenantId
},
new WorkStatusMaster
{
Id = Guid.NewGuid(),
Name = "Partially Approve",
Description = "Not all tasks are actually finished as reported",
IsSystem = true,
TenantId = tenantId
},
new WorkStatusMaster
{
Id = Guid.NewGuid(),
Name = "NCR",
Description = "Tasks are not finished as reported or have any issues in al the tasks",
IsSystem = true,
TenantId = tenantId
}
};
}
public List<ExpensesTypeMaster> GetExpensesTypeesData(Guid tenantId)
{
return new List<ExpensesTypeMaster>
{
new ExpensesTypeMaster
{
Id = Guid.NewGuid(),
Name = "Procurement",
Description = "Materials, equipment and supplies purchased for site operations.",
NoOfPersonsRequired = false,
IsActive = true,
TenantId = tenantId
},
new ExpensesTypeMaster
{
Id = Guid.NewGuid(),
Name = "Transport",
Description = "Vehicle fuel, logistics services and delivery of goods or personnel.",
NoOfPersonsRequired = false,
IsActive = true,
TenantId = tenantId
},
new ExpensesTypeMaster
{
Id = Guid.NewGuid(),
Name = "Travelling",
Description = "Delivery of personnel.",
NoOfPersonsRequired = true,
IsActive = true,
TenantId = tenantId
},
new ExpensesTypeMaster
{
Id = Guid.NewGuid(),
Name = "Mobilization",
Description = "Site setup costs including equipment deployment and temporary infrastructure.",
NoOfPersonsRequired = false,
IsActive = true,
TenantId = tenantId
},
new ExpensesTypeMaster
{
Id = Guid.NewGuid(),
Name = "Employee Welfare",
Description = " Worker amenities like snacks, meals, safety gear, accommodation, medical support etc.",
NoOfPersonsRequired = true,
IsActive = true,
TenantId = tenantId
},
new ExpensesTypeMaster
{
Id = Guid.NewGuid(),
Name = "Maintenance & Utilities",
Description = "Machinery servicing, electricity, water, and temporary office needs.",
NoOfPersonsRequired = false,
IsActive = true,
TenantId = tenantId
},
new ExpensesTypeMaster
{
Id = Guid.NewGuid(),
Name = "Vendor/Supplier Payments",
Description = "Scheduled payments for external services or goods.",
NoOfPersonsRequired = false,
IsActive = true,
TenantId = tenantId
},
new ExpensesTypeMaster
{
Id = Guid.NewGuid(),
Name = "Compliance & Safety",
Description = "Government fees, insurance, inspections and safety-related expenditures.",
NoOfPersonsRequired = false,
IsActive = true,
TenantId = tenantId
}
};
}
public List<PaymentModeMatser> GetPaymentModesData(Guid tenantId)
{
return new List<PaymentModeMatser>
{
new PaymentModeMatser
{
Id = Guid.NewGuid(),
Name = "Cash",
Description = "Physical currency; still used for small or informal transactions.",
IsActive = true,
TenantId = tenantId
},
new PaymentModeMatser
{
Id = Guid.NewGuid(),
Name = "Cheque",
Description = "Paper-based payment order; less common now due to processing delays and fraud risks.",
IsActive = true,
TenantId = tenantId
},
new PaymentModeMatser
{
Id = Guid.NewGuid(),
Name = "NetBanking",
Description = "Online banking portals used to transfer funds directly between accounts",
IsActive = true,
TenantId = tenantId
},
new PaymentModeMatser
{
Id = Guid.NewGuid(),
Name = "UPI",
Description = "Real-time bank-to-bank transfer using mobile apps; widely used for peer-to-peer and merchant payments.",
IsActive = true,
TenantId = tenantId
}
};
}
public List<object> GetData(Guid tenantId)
{
return new List<object>
{
};
}
}
}