⚙️refactor: Cleaned up overloads for Add, Update & Upsert

lukaferlez · Apr 3, 2024 · 2520060 · 2520060
1 parent 0533f58
commit 2520060
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 35 deletions.
diff --git a/src/Simpleverse.Repository.Db/Entity.cs b/src/Simpleverse.Repository.Db/Entity.cs
@@ -334,7 +334,7 @@ protected virtual void Join(QueryBuilder<TModel> builder, TFilter filter) { }
 		#endregion
 	}
 
-	public class Entity<T> : IAddDb<T>, IUpdateDb<T>, IDeleteDb<T>, IAggregateDb
+	public class Entity<T> : IAddDb<T>, IUpdateDb<T>, IDeleteDb<T>, IAggregateDb, IUpsertDb<T>
 		where T : class
 	{
 		protected DbRepository Repository { get; }
@@ -359,12 +359,15 @@ public virtual Task<T> GetAsync(IDbConnection connection, dynamic id, IDbTransac
 
 		#region Add
 
-		public async Task<int> AddAsync(T model)
+		public async Task<int> AddAsync(
+			T model,
+			Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null
+		)
 		{
-			return await Repository.ExecuteAsync((conn, tran) => AddAsync(conn, model, transaction: tran));
+			return await Repository.ExecuteAsync(
+				(conn, tran) => AddAsync(conn, new[] { model }, outputMap: outputMap, transaction: tran)
+			);
 		}
-		public virtual Task<int> AddAsync(IDbConnection connection, T model, IDbTransaction transaction = null)
-			=> connection.InsertAsync(model, transaction: transaction);
 
 		public async Task<int> AddAsync(
 			IEnumerable<T> models,
@@ -398,13 +401,15 @@ public virtual Task<int> AddAsync(
 
 		#region Update
 
-		public async Task<bool> UpdateAsync(T model)
+		public async Task<int> UpdateAsync(
+			T model,
+			Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null
+		)
 		{
-			return await Repository.ExecuteAsync((conn, tran) => UpdateAsync(conn, model, transaction: tran));
+			return await Repository.ExecuteAsync(
+				(conn, tran) => UpdateAsync(conn, new[] { model }, outputMap: outputMap, transaction: tran)
+			);
 		}
-		public virtual Task<bool> UpdateAsync(IDbConnection connection, T model, IDbTransaction transaction = null)
-			=> connection.UpdateAsync(model, transaction: transaction);
-
 		public async Task<int> UpdateAsync(
 			IEnumerable<T> models,
 			Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null
@@ -438,20 +443,15 @@ public virtual async Task<int> UpdateAsync(
 
 		#region Upsert
 
-		public async Task<int> UpsertAsync(T model)
+		public async Task<int> UpsertAsync(
+			T model,
+			Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null
+		)
 		{
 			return await Repository.ExecuteAsync(
-				(conn, tran) => UpsertAsync(conn, model, transaction: tran)
+				(conn, tran) => UpsertAsync(conn, new[] { model }, outputMap: outputMap, transaction: tran)
 			);
 		}
-		public virtual Task<int> UpsertAsync(IDbConnection connection, T model, IDbTransaction transaction = null)
-		{
-			if (!(Repository is SqlRepository))
-				throw new NotSupportedException("Upsert is not supported on non-SQL repository connections.");
-
-			return connection.UpsertAsync(model, outputMap: OutputMapper.MapOnce, transaction: transaction);
-		}
-
 		public async Task<int> UpsertAsync(
 			IEnumerable<T> models,
 			Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null
@@ -471,7 +471,7 @@ public virtual Task<int> UpsertAsync(
 			if (!(Repository is SqlRepository))
 				throw new NotSupportedException("Upsert is not supported on non-SQL repository connections.");
 
-			return connection.UpsertBulkAsync(models, transaction: transaction);
+			return connection.UpsertBulkAsync(models, transaction: transaction, outputMap: outputMap);
 		}
 
 		#endregion

diff --git a/src/Simpleverse.Repository.Db/Operations/IAddDb.cs b/src/Simpleverse.Repository.Db/Operations/IAddDb.cs
@@ -10,7 +10,6 @@ namespace Simpleverse.Repository.Db.Operations
 	public interface IAddDb<T> : IAdd<T>
 		where T : class
 	{
-		Task<int> AddAsync(IDbConnection connection, T model, IDbTransaction transaction = null);
 		Task<int> AddAsync(
 			IDbConnection connection,
 			IEnumerable<T> models,

diff --git a/src/Simpleverse.Repository.Db/Operations/IUpdateDb.cs b/src/Simpleverse.Repository.Db/Operations/IUpdateDb.cs
@@ -10,8 +10,12 @@ namespace Simpleverse.Repository.Db.Operations
 	public interface IUpdateDb<T> : IUpdate<T>
 		where T : class
 	{
-		Task<bool> UpdateAsync(IDbConnection connection, T model, IDbTransaction transaction = null);
-		Task<int> UpdateAsync(IDbConnection connection, IEnumerable<T> models, Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null, IDbTransaction transaction = null);
+		Task<int> UpdateAsync(
+			IDbConnection connection,
+			IEnumerable<T> models,
+			Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null,
+			IDbTransaction transaction = null
+		);
 	}
 
 	public interface IUpdateDb<TUpdate, TFilter, TOptions> : IUpdate<TUpdate, TFilter, TOptions>

diff --git a/src/Simpleverse.Repository.Db/Operations/IUpsertDb.cs b/src/Simpleverse.Repository.Db/Operations/IUpsertDb.cs
@@ -7,10 +7,9 @@
 
 namespace Simpleverse.Repository.Db.Operations
 {
-	public interface IUpsertDb<T> : IAddDb<T>, IUpdateDb<T>, IUpsert<T>
+	public interface IUpsertDb<T> : IUpsert<T>
 		where T : class
 	{
-		Task<int> UpsertAsync(IDbConnection connection, T model, IDbTransaction transaction = null);
 		Task<int> UpsertAsync(IDbConnection connection, IEnumerable<T> models, Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null, IDbTransaction transaction = null);
 	}
 }
diff --git a/src/Simpleverse.Repository.Db/Simpleverse.Repository.Db.csproj b/src/Simpleverse.Repository.Db/Simpleverse.Repository.Db.csproj
@@ -13,10 +13,10 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>Dapper, Bulk, Merge, Upsert, Delete, Insert, Update, Repository</PackageTags>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <Version>2.0.31</Version>
+    <Version>2.0.32</Version>
     <Description>High performance operation for MS SQL Server built for Dapper ORM. Including bulk operations Insert, Update, Delete, Get as well as Upsert both single and bulk.</Description>
-    <AssemblyVersion>2.0.31</AssemblyVersion>
-    <FileVersion>2.0.31</FileVersion>
+    <AssemblyVersion>2.0.32</AssemblyVersion>
+    <FileVersion>2.0.32</FileVersion>
     <RepositoryUrl>https://github.com/lukaferlez/Simpleverse.Repository</RepositoryUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <EmbedAllSources>true</EmbedAllSources>

diff --git a/src/Simpleverse.Repository/Operations/IAdd.cs b/src/Simpleverse.Repository/Operations/IAdd.cs
@@ -8,7 +8,7 @@ namespace Simpleverse.Repository.Operations
 	public interface IAdd<T>
 		where T : class
 	{
-		Task<int> AddAsync(T model);
+		Task<int> AddAsync(T model, Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null);
 		Task<int> AddAsync(IEnumerable<T> models, Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null);
 	}
 }
diff --git a/src/Simpleverse.Repository/Operations/IUpdate.cs b/src/Simpleverse.Repository/Operations/IUpdate.cs
@@ -8,7 +8,7 @@ namespace Simpleverse.Repository.Operations
 	public interface IUpdate<T>
 		where T : class
 	{
-		Task<bool> UpdateAsync(T model);
+		Task<int> UpdateAsync(T model, Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null);
 		Task<int> UpdateAsync(IEnumerable<T> models, Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null);
 	}
 

diff --git a/src/Simpleverse.Repository/Operations/IUpsert.cs b/src/Simpleverse.Repository/Operations/IUpsert.cs
@@ -8,7 +8,7 @@ namespace Simpleverse.Repository.Operations
 	public interface IUpsert<T> : IAdd<T>, IUpdate<T>
 		where T : class
 	{
-		Task<int> UpsertAsync(T model);
+		Task<int> UpsertAsync(T model, Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null);
 		Task<int> UpsertAsync(IEnumerable<T> models, Action<IEnumerable<T>, IEnumerable<T>, IEnumerable<PropertyInfo>, IEnumerable<PropertyInfo>> outputMap = null);
 	}
 }
diff --git a/src/Simpleverse.Repository/Simpleverse.Repository.csproj b/src/Simpleverse.Repository/Simpleverse.Repository.csproj
@@ -13,10 +13,10 @@
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageTags>Repository</PackageTags>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <Version>1.0.8</Version>
+    <Version>1.0.9</Version>
     <Description>Base repository elements.</Description>
-    <AssemblyVersion>1.0.8</AssemblyVersion>
-    <FileVersion>1.0.8</FileVersion>
+    <AssemblyVersion>1.0.9</AssemblyVersion>
+    <FileVersion>1.0.9</FileVersion>
     <RepositoryUrl>https://github.com/lukaferlez/Simpleverse.Repository</RepositoryUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <!-- Optional: Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->