Type entities and revisions to paging

Yuck · Dec 29, 2020 · a76968a · a76968a
1 parent 7a4de67
commit a76968a
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 24 deletions.
diff --git a/src/YuckQi.Domain.Services/Abstract/ITypeEntityService.cs b/src/YuckQi.Domain.Services/Abstract/ITypeEntityService.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
-using YuckQi.Domain.Application.Queries.Results;
-using YuckQi.Domain.Entities.Types;
+using YuckQi.Domain.Entities.Types.Abstract;
 using YuckQi.Domain.Services.Models;
 using YuckQi.Domain.Validation;
+using YuckQi.Domain.ValueObjects;
 
 namespace YuckQi.Domain.Services.Abstract
 {

diff --git a/src/YuckQi.Domain.Services/Models/TypeSearchCriteria.cs b/src/YuckQi.Domain.Services/Models/TypeSearchCriteria.cs
@@ -1,4 +1,4 @@
-using YuckQi.Domain.Application.Abstract;
+using YuckQi.Domain.ValueObjects.Abstract;
 
 namespace YuckQi.Domain.Services.Models
 {

diff --git a/src/YuckQi.Domain.Services/YuckQi.Domain.Services.csproj b/src/YuckQi.Domain.Services/YuckQi.Domain.Services.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>0.3.1</Version>
+    <Version>0.4.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
 

diff --git a/src/YuckQi.Domain.Validation/YuckQi.Domain.Validation.csproj b/src/YuckQi.Domain.Validation/YuckQi.Domain.Validation.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>0.3.1</Version>
+    <Version>0.4.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
 

diff --git a/src/YuckQi.Domain/Entities/Types/Abstract/ITypeEntity.cs b/src/YuckQi.Domain/Entities/Types/Abstract/ITypeEntity.cs
@@ -0,0 +1,11 @@
+using System;
+using YuckQi.Domain.Entities.Abstract;
+
+namespace YuckQi.Domain.Entities.Types.Abstract
+{
+    public interface ITypeEntity<TKey> : IEntity<TKey> where TKey : struct
+    {
+        Guid Identifier { get; set; }
+        string Name { get; set; }
+    }
+}
diff --git a/src/YuckQi.Domain/Entities/Types/Abstract/TypeEntityBase.cs b/src/YuckQi.Domain/Entities/Types/Abstract/TypeEntityBase.cs
@@ -0,0 +1,12 @@
+using System;
+using YuckQi.Domain.Entities.Abstract;
+
+namespace YuckQi.Domain.Entities.Types.Abstract
+{
+    public abstract class TypeEntityBase<TKey> : EntityBase<TKey>, ITypeEntity<TKey> where TKey : struct
+    {
+        public Guid Identifier { get; set; }
+        public string Name { get; set; }
+        public string ShortName { get; set; }
+    }
+}
diff --git a/src/YuckQi.Domain/Entities/Types/TypeEntityBase.cs b/src/YuckQi.Domain/Entities/Types/TypeEntityBase.cs
diff --git a/...ckQi.Domain/Application/Abstract/IPage.cs → ...kQi.Domain/ValueObjects/Abstract/IPage.cs b/...ckQi.Domain/Application/Abstract/IPage.cs → ...kQi.Domain/ValueObjects/Abstract/IPage.cs
@@ -1,4 +1,4 @@
-namespace YuckQi.Domain.Application.Abstract
+namespace YuckQi.Domain.ValueObjects.Abstract
 {
     public interface IPage
     {

diff --git a/...omain/Application/Queries/Results/Page.cs → src/YuckQi.Domain/ValueObjects/Page.cs b/...omain/Application/Queries/Results/Page.cs → src/YuckQi.Domain/ValueObjects/Page.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
-using YuckQi.Domain.Application.Abstract;
+using YuckQi.Domain.ValueObjects.Abstract;
 
-namespace YuckQi.Domain.Application.Queries.Results
+namespace YuckQi.Domain.ValueObjects
 {
-    public class Page : IPage
+    public readonly struct Page : IPage
     {
         #region Properties
 
@@ -15,30 +15,34 @@ public class Page : IPage
 
         #region Constructors
 
-        public Page(int number, int size)
+        public Page(int page, int size)
         {
-            PageNumber = number;
+            PageNumber = page;
             PageSize = size;
         }
 
         #endregion
     }
 
-    public class Page<T> : Page where T : class
+    public readonly struct Page<T> : IPage where T : class
     {
         #region Properties
 
         public IReadOnlyCollection<T> Items { get; }
+        public int PageNumber { get; }
+        public int PageSize { get; }
         public int TotalCount { get; }
 
         #endregion
 
 
         #region Constructors
 
-        public Page(IReadOnlyCollection<T> items, int total, int number, int size) : base(number, size)
+        public Page(IReadOnlyCollection<T> items, int total, int page, int size)
         {
             Items = items ?? new List<T>();
+            PageNumber = page;
+            PageSize = size;
             TotalCount = total;
         }
 

diff --git a/src/YuckQi.Domain/YuckQi.Domain.csproj b/src/YuckQi.Domain/YuckQi.Domain.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
-    <Version>0.3.1</Version>
+    <Version>0.4.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>