Browse Source

Make Tenant full audited.

pull/947/head
Halil ibrahim Kalkan 8 years ago
parent
commit
6182ed5e52
  1. 2
      modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConnectionStringConsts.cs
  2. 13
      modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs
  3. 14
      modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantConnectionString.cs
  4. 2
      modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementDbContextModelCreatingExtensions.cs

2
modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/TenantConnectionStringConsts.cs

@ -2,7 +2,7 @@
{ {
public static class TenantConnectionStringConsts public static class TenantConnectionStringConsts
{ {
public const int MaxNameLength = 128; public const int MaxNameLength = 64;
public const int MaxValueLength = 1024; public const int MaxValueLength = 1024;
} }

13
modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/Tenant.cs

@ -2,12 +2,11 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using JetBrains.Annotations; using JetBrains.Annotations;
using Volo.Abp.Data; using Volo.Abp.Domain.Entities.Auditing;
using Volo.Abp.Domain.Entities;
namespace Volo.Abp.TenantManagement namespace Volo.Abp.TenantManagement
{ {
public class Tenant : AggregateRoot<Guid> public class Tenant : FullAuditedAggregateRoot<Guid>
{ {
public virtual string Name { get; protected set; } public virtual string Name { get; protected set; }
@ -20,10 +19,8 @@ namespace Volo.Abp.TenantManagement
protected internal Tenant(Guid id, [NotNull] string name) protected internal Tenant(Guid id, [NotNull] string name)
{ {
Check.NotNull(name, nameof(name));
Id = id; Id = id;
Name = name; SetName(name);
ConnectionStrings = new List<TenantConnectionString>(); ConnectionStrings = new List<TenantConnectionString>();
ExtraProperties = new Dictionary<string, object>(); ExtraProperties = new Dictionary<string, object>();
@ -43,9 +40,7 @@ namespace Volo.Abp.TenantManagement
internal void SetName([NotNull] string name) internal void SetName([NotNull] string name)
{ {
Check.NotNull(name, nameof(name)); Name = Check.NotNullOrWhiteSpace(name, nameof(name), TenantConsts.MaxNameLength);
Name = name;
} }
} }
} }

14
modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo/Abp/TenantManagement/TenantConnectionString.cs

@ -19,17 +19,19 @@ namespace Volo.Abp.TenantManagement
public TenantConnectionString(Guid tenantId, [NotNull] string name, [NotNull] string value) public TenantConnectionString(Guid tenantId, [NotNull] string name, [NotNull] string value)
{ {
Check.NotNull(name, nameof(name));
Check.NotNull(value, nameof(value));
TenantId = tenantId; TenantId = tenantId;
Name = name; Name = Check.NotNullOrWhiteSpace(name, nameof(name), TenantConnectionStringConsts.MaxNameLength);
Value = value; SetValue(value);
}
public virtual void SetValue([NotNull] string value)
{
Value = Check.NotNullOrWhiteSpace(value, nameof(value), TenantConnectionStringConsts.MaxValueLength);
} }
public override object[] GetKeys() public override object[] GetKeys()
{ {
return new object[] { TenantId, Name, Value }; return new object[] { TenantId, Name };
} }
} }
} }

2
modules/tenant-management/src/Volo.Abp.TenantManagement.EntityFrameworkCore/Volo/Abp/TenantManagement/EntityFrameworkCore/AbpTenantManagementDbContextModelCreatingExtensions.cs

@ -22,7 +22,9 @@ namespace Volo.Abp.TenantManagement.EntityFrameworkCore
{ {
b.ToTable(tablePrefix + "Tenants", schema); b.ToTable(tablePrefix + "Tenants", schema);
b.ConfigureFullAudited();
b.ConfigureExtraProperties(); b.ConfigureExtraProperties();
b.ConfigureConcurrencyStamp();
b.Property(t => t.Name).IsRequired().HasMaxLength(TenantConsts.MaxNameLength); b.Property(t => t.Name).IsRequired().HasMaxLength(TenantConsts.MaxNameLength);

Loading…
Cancel
Save