From ed9067a9570c0990263b8d67b4b4d1365eecd7ba Mon Sep 17 00:00:00 2001
From: dingsongjie <sergeding105@gmail.com>
Date: Fri, 26 Jan 2024 08:54:23 +0800
Subject: [PATCH] mongodb busiCall allow commit trans by user (#74)

* mongodb busiCall allow commit trans by user

* Extract duplicate code logic to MongoCallCore

* Optimize code

* fix busiCall
---
 src/DtmMongoBarrier/MongoBranchBarrier.cs | 40 +++++++++++++++--------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/DtmMongoBarrier/MongoBranchBarrier.cs b/src/DtmMongoBarrier/MongoBranchBarrier.cs
index 57f78c7..c7926d1 100644
--- a/src/DtmMongoBarrier/MongoBranchBarrier.cs
+++ b/src/DtmMongoBarrier/MongoBranchBarrier.cs
@@ -11,6 +11,17 @@ namespace DtmMongoBarrier
     public static class MongoBranchBarrier
     {
         public static async Task MongoCall(this BranchBarrier bb, IMongoClient mc, Func<IClientSessionHandle, Task> busiCall)
+        {
+            Func<IClientSessionHandle, Task<bool>> innerCall = async session =>
+            {
+                await busiCall.Invoke(session);
+
+                return true;
+            };
+            await MongoCall(bb, mc, innerCall);
+        }
+
+        public static async Task MongoCall(this BranchBarrier bb, IMongoClient mc, Func<IClientSessionHandle, Task<bool>> busiCall)
         {
             bb.BarrierID = bb.BarrierID + 1;
             var bid = bb.BarrierID.ToString().PadLeft(2, '0');
@@ -41,14 +52,16 @@ public static async Task MongoCall(this BranchBarrier bb, IMongoClient mc, Func<
 
                 if (isNullCompensation || isDuplicateOrPend)
                 {
-                    bb?.Logger?.LogInformation("mongo Will not exec busiCall, isNullCompensation={isNullCompensation}, isDuplicateOrPend={isDuplicateOrPend}", isNullCompensation, isDuplicateOrPend);                    
+                    bb?.Logger?.LogInformation("mongo Will not exec busiCall, isNullCompensation={isNullCompensation}, isDuplicateOrPend={isDuplicateOrPend}", isNullCompensation, isDuplicateOrPend);
                     await session.CommitTransactionAsync();
                     return;
                 }
+                var autoCommit = await busiCall.Invoke(session);
 
-                await busiCall.Invoke(session);
-
-                await session.CommitTransactionAsync();
+                if (autoCommit)
+                {
+                    await session.CommitTransactionAsync();
+                }
             }
             catch (Exception ex)
             {
@@ -59,20 +72,19 @@ public static async Task MongoCall(this BranchBarrier bb, IMongoClient mc, Func<
                 throw;
             }
         }
-
         public static async Task<string> MongoQueryPrepared(this BranchBarrier bb, IMongoClient mc)
         {
             var session = await mc.StartSessionAsync();
 
             try
             {
-                 await MongoInsertBarrier(
-                     bb,
-                     session,
-                     Constant.Barrier.MSG_BRANCHID,
-                     Constant.TYPE_MSG,
-                     Constant.Barrier.MSG_BARRIER_ID,
-                     Constant.Barrier.MSG_BARRIER_REASON);
+                await MongoInsertBarrier(
+                    bb,
+                    session,
+                    Constant.Barrier.MSG_BRANCHID,
+                    Constant.TYPE_MSG,
+                    Constant.Barrier.MSG_BARRIER_ID,
+                    Constant.Barrier.MSG_BARRIER_REASON);
             }
             catch (Exception ex)
             {
@@ -81,7 +93,7 @@ await MongoInsertBarrier(
             }
 
             var reason = string.Empty;
-           
+
             try
             {
                 var barrier = session.Client.GetDatabase(bb.DtmOptions.BarrierMongoDbName)
@@ -155,7 +167,7 @@ await barrier.InsertOneAsync(new DtmBarrierDocument
         }
 
         private static FilterDefinition<DtmBarrierDocument> BuildFilters(string gid, string branchId, string op, string barrierId)
-        { 
+        {
             return new FilterDefinitionBuilder<DtmBarrierDocument>().And(
                     Builders<DtmBarrierDocument>.Filter.Eq(x => x.GId, gid),
                     Builders<DtmBarrierDocument>.Filter.Eq(x => x.BranchId, branchId),