From ac0843ffe7807899b37fb222718f1212e5f76819 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Mon, 11 Aug 2025 11:05:21 +0530 Subject: [PATCH] Solved migration error occured while rebasing --- .../Data/ApplicationDbContext.cs | 20 - ...61007_Added_Subscription_Related_Tables.cs | 38 +- .../ApplicationDbContextModelSnapshot.cs | 347 +++++++----------- Marco.Pms.Model/TenantModels/Tenant.cs | 2 +- Marco.Pms.Model/Utilities/TenantRelation.cs | 2 +- .../Controllers/TenantController.cs | 1 - .../MappingProfiles/MappingProfile.cs | 1 - Marco.Pms.Services/Service/ProjectServices.cs | 2 +- 8 files changed, 140 insertions(+), 273 deletions(-) diff --git a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs index f9695d1..37b8c1c 100644 --- a/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs +++ b/Marco.Pms.DataAccess/Data/ApplicationDbContext.cs @@ -11,7 +11,6 @@ using Marco.Pms.Model.Mail; using Marco.Pms.Model.Master; using Marco.Pms.Model.Projects; using Marco.Pms.Model.Roles; -using Marco.Pms.Model.TenantModel; using Marco.Pms.Model.TenantModels; using Marco.Pms.Model.Utilities; using Microsoft.AspNetCore.Http; @@ -718,25 +717,6 @@ namespace Marco.Pms.DataAccess.Data } ); - modelBuilder.Entity().HasData(new Module - { - Id = new Guid("bf59fd88-b57a-4d67-bf01-3780f385896b"), - Name = "Project", - Description = "Project Module", - Key = "b04da7e9-0406-409c-ac7f-b97256e6ea02" - }, new Module - { - Id = new Guid("2a231490-bcb1-4bdd-91f1-f25fb7f25b23"), - Name = "Employee", - Description = "Employee Module", - Key = "0971c7fb-6ce1-458a-ae3f-8d3205893637" - }, new Module - { - Id = new Guid("c43db8c7-ab73-47f4-9d3b-f83e81357924"), - Name = "Masters", - Description = "Masters Module", - Key = "504ec132-e6a9-422f-8f85-050602cfce05" - }); modelBuilder.Entity().HasData( new SubscriptionStatus { diff --git a/Marco.Pms.DataAccess/Migrations/20250804061007_Added_Subscription_Related_Tables.cs b/Marco.Pms.DataAccess/Migrations/20250804061007_Added_Subscription_Related_Tables.cs index 5de2a37..73e2ee4 100644 --- a/Marco.Pms.DataAccess/Migrations/20250804061007_Added_Subscription_Related_Tables.cs +++ b/Marco.Pms.DataAccess/Migrations/20250804061007_Added_Subscription_Related_Tables.cs @@ -1,5 +1,4 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable @@ -13,25 +12,6 @@ namespace Marco.Pms.DataAccess.Migrations /// protected override void Up(MigrationBuilder migrationBuilder) { - migrationBuilder.CreateTable( - name: "CurrencyMaster", - columns: table => new - { - Id = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), - CurrencyCode = table.Column(type: "longtext", nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"), - CurrencyName = table.Column(type: "longtext", nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"), - Symbol = table.Column(type: "longtext", nullable: false) - .Annotation("MySql:CharSet", "utf8mb4"), - IsActive = table.Column(type: "tinyint(1)", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_CurrencyMaster", x => x.Id); - }) - .Annotation("MySql:CharSet", "utf8mb4"); - migrationBuilder.CreateTable( name: "SubscriptionStatus", columns: table => new @@ -154,20 +134,6 @@ namespace Marco.Pms.DataAccess.Migrations }) .Annotation("MySql:CharSet", "utf8mb4"); - migrationBuilder.InsertData( - table: "CurrencyMaster", - columns: new[] { "Id", "CurrencyCode", "CurrencyName", "IsActive", "Symbol" }, - values: new object[,] - { - { new Guid("297e237a-56d3-48f6-b39d-ec3991dea8bf"), "JPY", "Japanese Yen", true, "¥" }, - { new Guid("2f672568-a67b-4961-acb2-a8c7834e1762"), "USD", "US Dollar", true, "$" }, - { new Guid("3e456237-ef06-4ea1-a261-188c9b0c6df6"), "GBP", "Pound Sterling", true, "£" }, - { new Guid("4d1155bb-1448-4d97-a732-96c92eb99c45"), "EUR", "Euro", true, "€" }, - { new Guid("78e96e4a-7ce0-4164-ae3a-c833ad45ec2c"), "INR", "Indian Rupee", true, "₹" }, - { new Guid("b960166a-f7e9-49e3-bb4b-28511f126c08"), "CNY", "Chinese Yuan (Renminbi)", true, "¥" }, - { new Guid("efe9b4f6-64d6-446e-a42d-1c7aaf6dd70d"), "RUB", "Russian Ruble", true, "₽" } - }); - migrationBuilder.InsertData( table: "SubscriptionStatus", columns: new[] { "Id", "Name" }, @@ -236,8 +202,6 @@ namespace Marco.Pms.DataAccess.Migrations migrationBuilder.DropTable( name: "SubscriptionStatus"); - migrationBuilder.DropTable( - name: "CurrencyMaster"); } } } diff --git a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs index 41db417..ac6dd3f 100644 --- a/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs +++ b/Marco.Pms.DataAccess/Migrations/ApplicationDbContextModelSnapshot.cs @@ -1235,61 +1235,6 @@ namespace Marco.Pms.DataAccess.Migrations b.ToTable("RolePermissionMappings"); }); - modelBuilder.Entity("Marco.Pms.Model.TenantModel.Tenant", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("char(36)"); - - b.Property("ContactName") - .HasColumnType("longtext"); - - b.Property("ContactNumber") - .HasColumnType("longtext"); - - b.Property("Description") - .HasColumnType("longtext"); - - b.Property("DomainName") - .HasColumnType("longtext"); - - b.Property("IndustryId") - .HasColumnType("char(36)"); - - b.Property("IsActive") - .HasColumnType("tinyint(1)"); - - b.Property("Name") - .HasColumnType("longtext"); - - b.Property("OnBoardingDate") - .HasColumnType("datetime(6)"); - - b.Property("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.Expenses.BillAttachments", b => { b.Property("Id") @@ -3151,7 +3096,87 @@ namespace Marco.Pms.DataAccess.Migrations b.ToTable("JobRoles"); }); - modelBuilder.Entity("Marco.Pms.Model.TenantModel.Tenant", b => + modelBuilder.Entity("Marco.Pms.Model.TenantModels.SubscriptionPlan", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property("Description") + .IsRequired() + .HasColumnType("longtext"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("PlanName") + .IsRequired() + .HasColumnType("longtext"); + + b.HasKey("Id"); + + b.ToTable("SubscriptionPlans"); + }); + + modelBuilder.Entity("Marco.Pms.Model.TenantModels.SubscriptionPlanDetails", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("char(36)"); + + b.Property("CreateAt") + .HasColumnType("datetime(6)"); + + b.Property("CreatedById") + .HasColumnType("char(36)"); + + b.Property("CurrencyId") + .HasColumnType("char(36)"); + + b.Property("FeaturesId") + .HasColumnType("char(36)"); + + b.Property("Frequency") + .HasColumnType("int"); + + b.Property("IsActive") + .HasColumnType("tinyint(1)"); + + b.Property("MaxStorage") + .HasColumnType("double"); + + b.Property("MaxUser") + .HasColumnType("double"); + + b.Property("PlanId") + .HasColumnType("char(36)"); + + b.Property("Price") + .HasColumnType("double"); + + b.Property("TrialDays") + .HasColumnType("int"); + + b.Property("UpdateAt") + .HasColumnType("datetime(6)"); + + b.Property("UpdatedById") + .HasColumnType("char(36)"); + + b.HasKey("Id"); + + b.HasIndex("CreatedById"); + + b.HasIndex("CurrencyId"); + + b.HasIndex("PlanId"); + + b.HasIndex("UpdatedById"); + + b.ToTable("SubscriptionPlanDetails"); + }); + + modelBuilder.Entity("Marco.Pms.Model.TenantModels.Tenant", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -3247,86 +3272,6 @@ namespace Marco.Pms.DataAccess.Migrations }); }); - modelBuilder.Entity("Marco.Pms.Model.TenantModels.SubscriptionPlan", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("char(36)"); - - b.Property("Description") - .IsRequired() - .HasColumnType("longtext"); - - b.Property("IsActive") - .HasColumnType("tinyint(1)"); - - b.Property("PlanName") - .IsRequired() - .HasColumnType("longtext"); - - b.HasKey("Id"); - - b.ToTable("SubscriptionPlans"); - }); - - modelBuilder.Entity("Marco.Pms.Model.TenantModels.SubscriptionPlanDetails", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("char(36)"); - - b.Property("CreateAt") - .HasColumnType("datetime(6)"); - - b.Property("CreatedById") - .HasColumnType("char(36)"); - - b.Property("CurrencyId") - .HasColumnType("char(36)"); - - b.Property("FeaturesId") - .HasColumnType("char(36)"); - - b.Property("Frequency") - .HasColumnType("int"); - - b.Property("IsActive") - .HasColumnType("tinyint(1)"); - - b.Property("MaxStorage") - .HasColumnType("double"); - - b.Property("MaxUser") - .HasColumnType("double"); - - b.Property("PlanId") - .HasColumnType("char(36)"); - - b.Property("Price") - .HasColumnType("double"); - - b.Property("TrialDays") - .HasColumnType("int"); - - b.Property("UpdateAt") - .HasColumnType("datetime(6)"); - - b.Property("UpdatedById") - .HasColumnType("char(36)"); - - b.HasKey("Id"); - - b.HasIndex("CreatedById"); - - b.HasIndex("CurrencyId"); - - b.HasIndex("PlanId"); - - b.HasIndex("UpdatedById"); - - b.ToTable("SubscriptionPlanDetails"); - }); - modelBuilder.Entity("Marco.Pms.Model.TenantModels.TenantSubscriptions", b => { b.Property("Id") @@ -3667,7 +3612,7 @@ namespace Marco.Pms.DataAccess.Migrations .WithMany() .HasForeignKey("ReportedById"); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3710,7 +3655,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3737,7 +3682,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3758,7 +3703,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3787,7 +3732,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3810,7 +3755,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Authentication.MPINDetails", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3821,7 +3766,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Authentication.OTPDetails", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3848,7 +3793,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3871,7 +3816,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3911,7 +3856,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Directory.ContactCategoryMaster", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3945,7 +3890,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -3989,7 +3934,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4023,7 +3968,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Directory.ContactTagMaster", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4064,7 +4009,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.DocumentManager.Document", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4089,7 +4034,7 @@ namespace Marco.Pms.DataAccess.Migrations .WithMany() .HasForeignKey("JobRoleId"); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4116,7 +4061,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4131,7 +4076,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Employees.WorkShift", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4166,15 +4111,6 @@ namespace Marco.Pms.DataAccess.Migrations .IsRequired(); }); - modelBuilder.Entity("Marco.Pms.Model.TenantModel.Tenant", b => - { - b.HasOne("Marco.Pms.Model.Master.Industry", "Industry") - .WithMany() - .HasForeignKey("IndustryId"); - - b.Navigation("Industry"); - }); - modelBuilder.Entity("Marco.Pms.Model.Expenses.BillAttachments", b => { b.HasOne("Marco.Pms.Model.DocumentManager.Document", "Document") @@ -4189,7 +4125,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4210,7 +4146,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4279,7 +4215,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4314,7 +4250,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4339,7 +4275,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4409,7 +4345,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Forum.TicketComment", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4432,7 +4368,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4485,7 +4421,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Master.ActivityMaster", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4496,7 +4432,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Master.ExpensesTypeMaster", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4518,18 +4454,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Master.PaymentModeMatser", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") - .WithMany() - .HasForeignKey("TenantId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Tenant"); - }); - - modelBuilder.Entity("Marco.Pms.Model.Master.StatusMaster", b => - { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4540,7 +4465,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Master.WorkCategoryMaster", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4551,7 +4476,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Master.WorkStatusMaster", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4562,7 +4487,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Projects.Building", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4579,7 +4504,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4598,7 +4523,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4623,7 +4548,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4644,7 +4569,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4663,7 +4588,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4690,7 +4615,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Roles.ApplicationRole", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", null) + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", null) .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4699,7 +4624,7 @@ namespace Marco.Pms.DataAccess.Migrations modelBuilder.Entity("Marco.Pms.Model.Roles.JobRole", b => { - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) @@ -4708,23 +4633,6 @@ namespace Marco.Pms.DataAccess.Migrations b.Navigation("Tenant"); }); - modelBuilder.Entity("Marco.Pms.Model.TenantModel.Tenant", b => - { - b.HasOne("Marco.Pms.Model.Master.Industry", "Industry") - .WithMany() - .HasForeignKey("IndustryId"); - - b.HasOne("Marco.Pms.Model.Master.TenantStatus", "TenantStatus") - .WithMany() - .HasForeignKey("TenantStatusId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Industry"); - - b.Navigation("TenantStatus"); - }); - modelBuilder.Entity("Marco.Pms.Model.TenantModels.SubscriptionPlanDetails", b => { b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy") @@ -4758,6 +4666,23 @@ namespace Marco.Pms.DataAccess.Migrations b.Navigation("UpdatedBy"); }); + modelBuilder.Entity("Marco.Pms.Model.TenantModels.Tenant", b => + { + b.HasOne("Marco.Pms.Model.Master.Industry", "Industry") + .WithMany() + .HasForeignKey("IndustryId"); + + b.HasOne("Marco.Pms.Model.Master.TenantStatus", "TenantStatus") + .WithMany() + .HasForeignKey("TenantStatusId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Industry"); + + b.Navigation("TenantStatus"); + }); + modelBuilder.Entity("Marco.Pms.Model.TenantModels.TenantSubscriptions", b => { b.HasOne("Marco.Pms.Model.Employees.Employee", "CreatedBy") @@ -4784,7 +4709,7 @@ namespace Marco.Pms.DataAccess.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.HasOne("Marco.Pms.Model.TenantModel.Tenant", "Tenant") + b.HasOne("Marco.Pms.Model.TenantModels.Tenant", "Tenant") .WithMany() .HasForeignKey("TenantId") .OnDelete(DeleteBehavior.Cascade) diff --git a/Marco.Pms.Model/TenantModels/Tenant.cs b/Marco.Pms.Model/TenantModels/Tenant.cs index d8b1567..8cb3640 100644 --- a/Marco.Pms.Model/TenantModels/Tenant.cs +++ b/Marco.Pms.Model/TenantModels/Tenant.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using System.ComponentModel.DataAnnotations.Schema; -namespace Marco.Pms.Model.TenantModel +namespace Marco.Pms.Model.TenantModels { public class Tenant { diff --git a/Marco.Pms.Model/Utilities/TenantRelation.cs b/Marco.Pms.Model/Utilities/TenantRelation.cs index 76e6974..eed9917 100644 --- a/Marco.Pms.Model/Utilities/TenantRelation.cs +++ b/Marco.Pms.Model/Utilities/TenantRelation.cs @@ -1,4 +1,4 @@ -using Marco.Pms.Model.TenantModel; +using Marco.Pms.Model.TenantModels; using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; using System.ComponentModel.DataAnnotations.Schema; diff --git a/Marco.Pms.Services/Controllers/TenantController.cs b/Marco.Pms.Services/Controllers/TenantController.cs index ad1b874..e6a23e9 100644 --- a/Marco.Pms.Services/Controllers/TenantController.cs +++ b/Marco.Pms.Services/Controllers/TenantController.cs @@ -6,7 +6,6 @@ using Marco.Pms.Model.Employees; using Marco.Pms.Model.Entitlements; using Marco.Pms.Model.Projects; using Marco.Pms.Model.Roles; -using Marco.Pms.Model.TenantModel; using Marco.Pms.Model.TenantModels; using Marco.Pms.Model.TenantModels.MongoDBModel; using Marco.Pms.Model.Utilities; diff --git a/Marco.Pms.Services/MappingProfiles/MappingProfile.cs b/Marco.Pms.Services/MappingProfiles/MappingProfile.cs index 1503de1..4a40536 100644 --- a/Marco.Pms.Services/MappingProfiles/MappingProfile.cs +++ b/Marco.Pms.Services/MappingProfiles/MappingProfile.cs @@ -12,7 +12,6 @@ using Marco.Pms.Model.MongoDBModels.Expenses; using Marco.Pms.Model.MongoDBModels.Masters; using Marco.Pms.Model.MongoDBModels.Project; using Marco.Pms.Model.Projects; -using Marco.Pms.Model.TenantModel; using Marco.Pms.Model.TenantModels; using Marco.Pms.Model.TenantModels.MongoDBModel; using Marco.Pms.Model.ViewModels.Activities; diff --git a/Marco.Pms.Services/Service/ProjectServices.cs b/Marco.Pms.Services/Service/ProjectServices.cs index 3117674..9f09654 100644 --- a/Marco.Pms.Services/Service/ProjectServices.cs +++ b/Marco.Pms.Services/Service/ProjectServices.cs @@ -7,7 +7,7 @@ using Marco.Pms.Model.Employees; using Marco.Pms.Model.Entitlements; using Marco.Pms.Model.MongoDBModels.Project; using Marco.Pms.Model.Projects; -using Marco.Pms.Model.TenantModel; +using Marco.Pms.Model.TenantModels; using Marco.Pms.Model.Utilities; using Marco.Pms.Model.ViewModels.Employee; using Marco.Pms.Model.ViewModels.Projects;