diff --git a/api/src/Kurs.Platform.Application.Contracts/Demo/DemoDto.cs b/api/src/Kurs.Platform.Application.Contracts/Demo/DemoDto.cs index 6ed07e42..2bcbe519 100644 --- a/api/src/Kurs.Platform.Application.Contracts/Demo/DemoDto.cs +++ b/api/src/Kurs.Platform.Application.Contracts/Demo/DemoDto.cs @@ -5,6 +5,7 @@ namespace Kurs.Platform.Demos; public class DemoDto : FullAuditedEntityDto { + public Guid? TenantId { get; set; } public string OrganizationName { get; set; } public string FullName { get; set; } public string Email { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/BlogCategory.cs b/api/src/Kurs.Platform.Domain/Entities/BlogCategory.cs index 9ee9ddbf..dc17fdb6 100644 --- a/api/src/Kurs.Platform.Domain/Entities/BlogCategory.cs +++ b/api/src/Kurs.Platform.Domain/Entities/BlogCategory.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Entities; -public class BlogCategory : FullAuditedEntity +public class BlogCategory : FullAuditedEntity, IMultiTenant { public Guid? TenantId { get; set; } public string Name { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/BlogPost.cs b/api/src/Kurs.Platform.Domain/Entities/BlogPost.cs index ab5c5a26..c2e4f7f5 100644 --- a/api/src/Kurs.Platform.Domain/Entities/BlogPost.cs +++ b/api/src/Kurs.Platform.Domain/Entities/BlogPost.cs @@ -1,9 +1,10 @@ using System; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Entities; -public class BlogPost : FullAuditedAggregateRoot +public class BlogPost : FullAuditedAggregateRoot, IMultiTenant { public Guid? TenantId { get; set; } public string Title { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Demo.cs b/api/src/Kurs.Platform.Domain/Entities/Demo.cs index b2605142..87853b17 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Demo.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Demo.cs @@ -1,23 +1,19 @@ using System; using System.ComponentModel.DataAnnotations; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Entities; -public class Demo : FullAuditedEntity +public class Demo : FullAuditedEntity, IMultiTenant { - [Required] + public Guid? TenantId { get; set; } public string OrganizationName { get; set; } - [Required] public string FullName { get; set; } - [Required] public string Email { get; set; } - [Required] public string Phone { get; set; } - [Required] public string Address { get; set; } public int NumberOfBranches { get; set; } public int NumberOfUsers { get; set; } - [Required] public string Message { get; set; } } diff --git a/api/src/Kurs.Platform.Domain/Entities/Service.cs b/api/src/Kurs.Platform.Domain/Entities/Service.cs index be6e3040..2eb83c3a 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Service.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Service.cs @@ -1,11 +1,12 @@ using System; -using Volo.Abp.Domain.Entities; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Entities; -public class Service : FullAuditedAggregateRoot +public class Service : FullAuditedAggregateRoot, IMultiTenant { + public Guid? TenantId { get; set; } public string? Icon { get; set; } public string Title { get; set; } public string? Description { get; set; } diff --git a/api/src/Kurs.Platform.Domain/Entities/Uom.cs b/api/src/Kurs.Platform.Domain/Entities/Uom.cs index 7c8db887..70d0854e 100644 --- a/api/src/Kurs.Platform.Domain/Entities/Uom.cs +++ b/api/src/Kurs.Platform.Domain/Entities/Uom.cs @@ -1,5 +1,4 @@ using System; -using System.ComponentModel.DataAnnotations; using Volo.Abp.Domain.Entities.Auditing; namespace Kurs.Platform.Entities; diff --git a/api/src/Kurs.Platform.Domain/Orders/Order.cs b/api/src/Kurs.Platform.Domain/Orders/Order.cs index a4cc9f12..fab501ef 100644 --- a/api/src/Kurs.Platform.Domain/Orders/Order.cs +++ b/api/src/Kurs.Platform.Domain/Orders/Order.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.MultiTenancy; namespace Kurs.Platform.Orders; -public class Order : FullAuditedAggregateRoot +public class Order : FullAuditedAggregateRoot, IMultiTenant { public Guid? TenantId { get; set; } public string InstitutionName { get; set; } diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820091253_Service.Designer.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820120349_Service.Designer.cs similarity index 99% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820091253_Service.Designer.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820120349_Service.Designer.cs index 1f95636a..a2667233 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820091253_Service.Designer.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820120349_Service.Designer.cs @@ -13,7 +13,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Kurs.Platform.Migrations { [DbContext(typeof(PlatformDbContext))] - [Migration("20250820091253_Service")] + [Migration("20250820120349_Service")] partial class Service { /// @@ -1079,7 +1079,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(128)"); b.Property("TenantId") - .HasColumnType("uniqueidentifier"); + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); b.HasKey("Id"); @@ -1179,7 +1180,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(512)"); b.Property("TenantId") - .HasColumnType("uniqueidentifier"); + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); b.Property("Title") .IsRequired() @@ -2118,6 +2120,10 @@ namespace Kurs.Platform.Migrations .HasMaxLength(20) .HasColumnType("nvarchar(20)"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.ToTable("PDemo", (string)null); @@ -3507,6 +3513,10 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.Property("Title") .IsRequired() .HasMaxLength(128) @@ -3999,7 +4009,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(max)"); b.Property("TenantId") - .HasColumnType("uniqueidentifier"); + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); b.Property("Total") .HasPrecision(18, 2) diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820091253_Service.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820120349_Service.cs similarity index 85% rename from api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820091253_Service.cs rename to api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820120349_Service.cs index 01285bfc..efc1e0c0 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820091253_Service.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/20250820120349_Service.cs @@ -11,11 +11,18 @@ namespace Kurs.Platform.Migrations /// protected override void Up(MigrationBuilder migrationBuilder) { + migrationBuilder.AddColumn( + name: "TenantId", + table: "PDemo", + type: "uniqueidentifier", + nullable: true); + migrationBuilder.CreateTable( name: "PService", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), + TenantId = table.Column(type: "uniqueidentifier", nullable: true), Icon = table.Column(type: "nvarchar(64)", maxLength: 64, nullable: true), Title = table.Column(type: "nvarchar(128)", maxLength: 128, nullable: false), Description = table.Column(type: "nvarchar(512)", maxLength: 512, nullable: true), @@ -42,6 +49,10 @@ namespace Kurs.Platform.Migrations { migrationBuilder.DropTable( name: "PService"); + + migrationBuilder.DropColumn( + name: "TenantId", + table: "PDemo"); } } } diff --git a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs index c80aa349..085b6dc4 100644 --- a/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs +++ b/api/src/Kurs.Platform.EntityFrameworkCore/Migrations/PlatformDbContextModelSnapshot.cs @@ -1076,7 +1076,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(128)"); b.Property("TenantId") - .HasColumnType("uniqueidentifier"); + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); b.HasKey("Id"); @@ -1176,7 +1177,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(512)"); b.Property("TenantId") - .HasColumnType("uniqueidentifier"); + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); b.Property("Title") .IsRequired() @@ -2115,6 +2117,10 @@ namespace Kurs.Platform.Migrations .HasMaxLength(20) .HasColumnType("nvarchar(20)"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.HasKey("Id"); b.ToTable("PDemo", (string)null); @@ -3504,6 +3510,10 @@ namespace Kurs.Platform.Migrations .HasColumnType("uniqueidentifier") .HasColumnName("LastModifierId"); + b.Property("TenantId") + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); + b.Property("Title") .IsRequired() .HasMaxLength(128) @@ -3996,7 +4006,8 @@ namespace Kurs.Platform.Migrations .HasColumnType("nvarchar(max)"); b.Property("TenantId") - .HasColumnType("uniqueidentifier"); + .HasColumnType("uniqueidentifier") + .HasColumnName("TenantId"); b.Property("Total") .HasPrecision(18, 2) diff --git a/ui/src/proxy/demo/models.ts b/ui/src/proxy/demo/models.ts index abb796b6..77b7c98a 100644 --- a/ui/src/proxy/demo/models.ts +++ b/ui/src/proxy/demo/models.ts @@ -1,11 +1,12 @@ export interface DemoDto { - id: string; // Guid karşılığı string - organizationName: string; - fullName: string; - email: string; - phone: string; - address: string; - numberOfBranches: number; - numberOfUsers: number; - message: string; -} \ No newline at end of file + id: string + tenantId?: string + organizationName: string + fullName: string + email: string + phone: string + address: string + numberOfBranches: number + numberOfUsers: number + message: string +} diff --git a/ui/src/proxy/services/models.ts b/ui/src/proxy/services/models.ts index f4913db0..af80ca11 100644 --- a/ui/src/proxy/services/models.ts +++ b/ui/src/proxy/services/models.ts @@ -1,6 +1,7 @@ export type ItemType = 'service' | 'support' export interface Service { + tenantId?: string icon?: string title: string description?: string @@ -9,6 +10,7 @@ export interface Service { } export interface ServiceDto { + tenantId?: string icon?: string title: string description?: string