Skip to content

Commit

Permalink
Renamed 'key' to 'identifier'
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuck committed May 28, 2022
1 parent c4b493e commit 1998bd8
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions src/YuckQi.Domain.Services/Abstract/ITypeEntityService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

namespace YuckQi.Domain.Services.Abstract;

public interface ITypeEntityService<TTypeEntity, in TKey> where TTypeEntity : IEntity<TKey>, IType where TKey : struct
public interface ITypeEntityService<TTypeEntity, in TIdentifier> where TTypeEntity : IEntity<TIdentifier>, IType where TIdentifier : struct
{
Task<Result<TTypeEntity>> CreateAsync(TTypeEntity entity);
Task<Result<TTypeEntity>> GetAsync(Guid identifier);
Task<Result<TTypeEntity>> GetAsync(TKey key);
Task<Result<TTypeEntity>> GetAsync(TIdentifier identifier);
Task<Result<TTypeEntity>> ModifyAsync(TTypeEntity entity);
Task<Result<IPage<TTypeEntity>>> SearchAsync(TypeSearchCriteria criteria = null);
}
2 changes: 1 addition & 1 deletion src/YuckQi.Domain.Services/YuckQi.Domain.Services.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Kevin J Lambert</Authors>
<Version>6.0.0</Version>
<Version>6.0.1</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Description>A .NET library for bootstrapping a domain services project.</Description>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/YuckQi.Domain.Validation/Result.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ public Result(T payload, IReadOnlyCollection<ResultDetail> detail = null) : base

#region Public Methods

public static Result<T> ConstraintViolation<TKey>(TKey key, String message = null) where TKey : struct => new(ResultDetail.ConstraintViolation<T, TKey>(key, message));
public static Result<T> ConstraintViolation<TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new(ResultDetail.ConstraintViolation<T, TIdentifier>(identifier, message));

public Boolean HasResultCode(ResultCode resultCode) => Detail.Any(t => t.Code == resultCode);

public static Result<T> NotFound<TKey>(TKey key, String message = null) where TKey : struct => new(ResultDetail.NotFound<T, TKey>(key, message));
public static Result<T> NotFound<TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new(ResultDetail.NotFound<T, TIdentifier>(identifier, message));

#endregion
}
4 changes: 2 additions & 2 deletions src/YuckQi.Domain.Validation/ResultDetail.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public class ResultDetail

#region Constants

public static ResultDetail ConstraintViolation<T, TKey>(TKey key, String message = null) where TKey : struct => new(ResultCode.ConstraintViolation, ResultMessage.ConstraintConflict<T, TKey>(key, message));
public static ResultDetail NotFound<T, TKey>(TKey key, String message = null) where TKey : struct => new(ResultCode.NotFound, ResultMessage.NotFound<T, TKey>(key, message));
public static ResultDetail ConstraintViolation<T, TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new(ResultCode.ConstraintViolation, ResultMessage.ConstraintConflict<T, TIdentifier>(identifier, message));
public static ResultDetail NotFound<T, TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new(ResultCode.NotFound, ResultMessage.NotFound<T, TIdentifier>(identifier, message));

#endregion

Expand Down
4 changes: 2 additions & 2 deletions src/YuckQi.Domain.Validation/ResultMessage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public ResultMessage(String id, String text = null)

#region Public Methods

public static ResultMessage ConstraintConflict<T, TKey>(TKey key, String message = null) where TKey : struct => new($"{ResultCode.ConstraintViolation.GetHashCode()}", message ?? $"'{typeof(T).Name}' '{key}' already exists.");
public static ResultMessage NotFound<T, TKey>(TKey key, String message = null) where TKey : struct => new($"{ResultCode.NotFound.GetHashCode()}", message ?? $"'{typeof(T).Name}' '{key}' could not be found.");
public static ResultMessage ConstraintConflict<T, TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new($"{ResultCode.ConstraintViolation.GetHashCode()}", message ?? $"'{typeof(T).Name}' '{identifier}' already exists.");
public static ResultMessage NotFound<T, TIdentifier>(TIdentifier identifier, String message = null) where TIdentifier : struct => new($"{ResultCode.NotFound.GetHashCode()}", message ?? $"'{typeof(T).Name}' '{identifier}' could not be found.");

#endregion
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Kevin J Lambert</Authors>
<Version>6.0.0</Version>
<Version>6.0.1</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Description>A .NET library providing domain validation fundamentals.</Description>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/YuckQi.Domain/Entities/Abstract/EntityBase.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace YuckQi.Domain.Entities.Abstract;

public abstract class EntityBase<TKey> : IEntity<TKey> where TKey : struct
public abstract class EntityBase<TIdentifier> : IEntity<TIdentifier> where TIdentifier : struct
{
public TKey Key { get; set; }
public TIdentifier Identifier { get; set; }
}
4 changes: 2 additions & 2 deletions src/YuckQi.Domain/Entities/Abstract/IEntity.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace YuckQi.Domain.Entities.Abstract;

public interface IEntity<TKey> where TKey : struct
public interface IEntity<TIdentifier> where TIdentifier : struct
{
TKey Key { get; set; }
TIdentifier Identifier { get; set; }
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

namespace YuckQi.Domain.Entities.MultiTenant.Abstract;

public interface IMultiTenantEntity<TKey, TTenantKey> : IEntity<TKey> where TKey : struct where TTenantKey : struct
public interface IMultiTenantEntity<TIdentifier, TTenantIdentifier> : IEntity<TIdentifier> where TIdentifier : struct where TTenantIdentifier : struct
{
TTenantKey TenantId { get; set; }
TTenantIdentifier TenantIdentifier { get; set; }

Boolean IsValidTenant(TTenantKey? tenantId);
Boolean IsValidTenant(TTenantIdentifier? tenantIdentifier);
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

namespace YuckQi.Domain.Entities.MultiTenant.Abstract;

public abstract class MultiTenantEntityBase<TKey, TTenantKey> : EntityBase<TKey>, IMultiTenantEntity<TKey, TTenantKey> where TKey : struct where TTenantKey : struct
public abstract class MultiTenantEntityBase<TIdentifier, TTenantIdentifier> : EntityBase<TIdentifier>, IMultiTenantEntity<TIdentifier, TTenantIdentifier> where TIdentifier : struct where TTenantIdentifier : struct
{
public TTenantKey TenantId { get; set; }
public TTenantIdentifier TenantIdentifier { get; set; }

public Boolean IsValidTenant(TTenantKey? tenantId) => TenantId.Equals(tenantId);
public Boolean IsValidTenant(TTenantIdentifier? tenantIdentifier) => TenantIdentifier.Equals(tenantIdentifier);
}
2 changes: 1 addition & 1 deletion src/YuckQi.Domain/YuckQi.Domain.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Kevin J Lambert</Authors>
<Version>6.0.0</Version>
<Version>6.0.1</Version>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<Description>A .NET library for bootstrapping a domain model project.</Description>
</PropertyGroup>
Expand Down

0 comments on commit 1998bd8

Please sign in to comment.