Merge pull request #49 from codepb/app-service-improvements

App service improvements

Author: codepb

logo/logo.png

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentQueries" Version="1.1.1" />
+    <PackageReference Include="FluentQueries" Version="1.3.2" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
 

samples/library/DDDToolkit.Samples.Library.Domain/DDDToolkit.Samples.Library.Domain.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentQueries" Version="1.1.1" />
+    <PackageReference Include="FluentQueries" Version="1.3.2" />
     <PackageReference Include="Microsoft.AspNetCore.All" />
   </ItemGroup>
 

samples/library/DDDToolkit.Samples.Library.UI.Web/DDDToolkit.Samples.Library.UI.Web.csproj

@@ -1,4 +1,9 @@
-using DDDToolkit.ApplicationLayer.Transactions;
+using DDDToolkit.ApplicationLayer.Repositories;
+using DDDToolkit.ApplicationLayer.Transactions;
+using DDDToolkit.Core.Interfaces;
+using FluentQueries;
+using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 
 namespace DDDToolkit.ApplicationLayer
@@ -16,6 +21,36 @@ protected Task<ITransaction> BeginTransaction()
         {
             return _unitOfWork.BeginTransaction();
         }
+        protected Task<IReadOnlyCollection<T>> Query<T, TId>(IQuery<T> query, QueryOptions queryOptions = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class, IAggregateRoot<TId>
+        {
+            return ReadableRepository<T, TId>().Query(query, queryOptions, cancellationToken);
+        }
+
+        protected Task<T> FirstOrDefault<T, TId>(IQuery<T> query, string[] onlyIncludePaths = null, CancellationToken cancellationToken = default(CancellationToken)) where T : class, IAggregateRoot<TId>
+        {
+            return ReadableRepository<T, TId>().FirstOrDefault(query, onlyIncludePaths, cancellationToken);
+        }
+
+        protected Task Add<T, TId>(T entity) where T : class, IAggregateRoot<TId>
+        {
+            return WritableRepository<T, TId>().Add(entity);
+        }
+
+        protected Task Update<T, TId>(T entity) where T : class, IAggregateRoot<TId>
+        {
+            return WritableRepository<T, TId>().Update(entity);
+        }
+
+        protected Task Remove<T, TId>(TId id) where T : class, IAggregateRoot<TId>
+        {
+            return WritableRepository<T, TId>().Remove(id);
+        }
+
+        protected IRepository<T, TId> Repository<T, TId>() where T : class, IAggregateRoot<TId> => _unitOfWork.Repository<T, TId>();
+
+        protected IReadableRepository<T, TId> ReadableRepository<T, TId>() where T : class, IAggregateRoot<TId> => _unitOfWork.ReadableRepository<T, TId>();
+
+        protected IWritableRepository<T, TId> WritableRepository<T, TId>() where T : class, IAggregateRoot<TId> => _unitOfWork.WritableRepository<T, TId>();
 
         protected Task SaveChanges()
         {

src/DDDToolkit.ApplicationLayer/ApplicationService.cs

@@ -12,16 +12,16 @@
     <RepositoryUrl>https://github.com/codepb/DDDToolkit</RepositoryUrl>
     <PackageTags>DDD, Domain Driven Design, Application Layer</PackageTags>
     <PackageIconUrl>https://raw.githubusercontent.com/codepb/DDDToolkit/master/logo/logo.png</PackageIconUrl>
-    <Version>2.0.0</Version>
+    <Version>2.1.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\LICENSE" Pack="true" PackagePath=""/>
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentQueries" Version="1.1.1" />
+    <PackageReference Include="FluentQueries" Version="1.3.2" />
   </ItemGroup>
 
   <ItemGroup>

src/DDDToolkit.ApplicationLayer/DDDToolkit.ApplicationLayer.csproj

@@ -1,8 +1,25 @@
 using DDDToolkit.Core.Interfaces;
-using System.Collections.Generic;
 
 namespace DDDToolkit.Core
 {
+    /// <summary>
+    /// <para>
+    /// A semantic difference from <see cref="IEntity{T}"/>, the
+    /// aggregate root represents an entity that is resposible for
+    /// handling all interactions with the aggregate.
+    /// </para>
+    /// <para>
+    /// Behaviour is identical to <see cref="IEntity{T}"/>, and
+    /// equality is defined by the two aggregate roots being of the
+    /// same type, with Ids that are equal.
+    /// </para>
+    /// <para>
+    /// In addition to the behaviour of <see cref="IEntity{T}"/>, the
+    /// aggregate root should be used by repositories, services, etc to
+    /// help control the points of interactions with entities.
+    /// </para>
+    /// </summary>
+    /// <typeparam name="T">The type of the Id for the Aggregate Root.</typeparam>
     public abstract class AggregateRoot<T> : Entity<T>, IAggregateRoot<T>
     {    
     }

src/DDDToolkit.ApplicationLayer/ReadableApplicationService.cs

@@ -13,11 +13,15 @@
     <RepositoryUrl>https://github.com/codepb/DDDToolkit</RepositoryUrl>
     <PackageTags>DDD, Domain Driven Design, Entity, Aggregate</PackageTags>
     <PackageIconUrl>https://raw.githubusercontent.com/codepb/DDDToolkit/master/logo/logo.png</PackageIconUrl>
-    <Version>2.0.0</Version>
+    <Version>2.1.0</Version>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <DocumentationFile>C:\Users\paulj\source\repos\DDDToolkit\src\DDDToolkit.Core\DDDToolkit.Core.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\LICENSE" Pack="true" PackagePath=""/>
+    <None Include="..\..\LICENSE" Pack="true" PackagePath="" />
   </ItemGroup>
 
   <ItemGroup>