Filled out the services and controllers further.

Most endpoints are usable now.

README.md

@@ -1,3 +1,10 @@
 # Code
 
-This folder contains the source code for the sample solution.
+This folder contains the source code for the sample solution.
+
+## Branching Strategy
+
+The "master" branch has the solution itself, and the stubs for the test assemblies.
+The "Mx" branches each demonstrate the different test data generation strategies.
+
+When changes are made to the store solution, they should be made in master and then merged to the other branches so that each strategy branch is running against the same basic solution.

Solution.props

@@ -1,5 +1,4 @@
-<!-- Add the following line, uncommented, to each csproj file, just inside the Project node. -->
-<!-- <Import Project="..\Solution.props" /> -->
+<!-- Add a line to each csproj file, just under the first   -->
 
 <Project>
   <PropertyGroup>

Store.Common/Contracts/PagingOptions.cs

@@ -0,0 +1,14 @@
+namespace Store.Common.Contracts
+{
+    public class PagingOptions
+    {
+        private int _take;
+        public int Skip { get; set; }
+
+        public int Take
+        {
+            get => _take == 0 ? 10 : _take;
+            set => _take = value;
+        }
+    }
+}

Store.Common/Store.Common.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\Solution.props" /> 
+  <Import Project="..\Solution.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
@@ -12,7 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Contracts\" />
     <Folder Include="Extensions\" />
   </ItemGroup>
 

Store.Domain/.Framework/Model.cs

@@ -15,7 +15,8 @@ public abstract class Model : IModel
         public bool IsNew => Id.Equals(0);
 
         /// <summary>The primary key / identity column.</summary>
-        [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        [Key]
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         public int Id { get; set; }
     }
 }

Store.Domain/.Framework/Repository.cs

@@ -4,6 +4,7 @@
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Store.Common.Contracts;
 using Store.Domain.Models;
 
 namespace Store.Domain.Framework
@@ -27,6 +28,8 @@ public interface IRepository<T> : IRepository where T : IModel
 
         Task<T> GetAsync(int userId, int id);
 
+        Task<List<T>> GetAsync(int userId, PagingOptions pagingOptions);
+
         Task SaveChangesAsync(int userId);
 
         Task<T> SingleOrDefaultAsync(int userId, Expression<Func<T, bool>> predicate = null);
@@ -94,20 +97,6 @@ public virtual Task<bool> AnyAsync(Expression<Func<T, bool>> predicate = null)
             return result;
         }
 
-        public virtual Task<int> CountAsync(Expression<Func<T, bool>> predicate = null)
-        {
-            IQueryable<T> query = StoreContext.Set<T>();
-
-            if (typeof(T) is ISoftDeleteable)
-            {
-                query = query.Where(x => !((ISoftDeleteable)x).DeletedUtc.HasValue);
-            }
-
-            var result = query.CountAsync(predicate);
-
-            return result;
-        }
-
         public virtual async Task DeleteAsync(int userId, T model)
         {
             if (_isSoftDeleteable)
@@ -138,6 +127,16 @@ public virtual Task<T> GetAsync(int userId, int id)
             return results;
         }
 
+        public async Task<List<T>> GetAsync(int userId, PagingOptions pagingOptions)
+        {
+            var results = await GetQuery(userId)
+                .Skip(pagingOptions.Skip)
+                .Take(pagingOptions.Take)
+                .ToListAsync();
+
+            return results;
+        }
+
         public virtual Task SaveChangesAsync(int userId)
         {
             var result = StoreContext.SaveChangesAsync(userId);
@@ -152,6 +151,20 @@ public virtual async Task<T> SingleOrDefaultAsync(int userId, Expression<Func<T,
             return result;
         }
 
+        public virtual Task<int> CountAsync(Expression<Func<T, bool>> predicate = null)
+        {
+            IQueryable<T> query = StoreContext.Set<T>();
+
+            if (typeof(T) is ISoftDeleteable)
+            {
+                query = query.Where(x => !((ISoftDeleteable)x).DeletedUtc.HasValue);
+            }
+
+            var result = query.CountAsync(predicate);
+
+            return result;
+        }
+
         protected virtual IQueryable<T> GetBaseQuery(int userId, Expression<Func<T, bool>> predicate = null)
         {
             IQueryable<T> query = StoreContext.Set<T>();