Merge pull request #103 from opencb/TASK-7214

Port patch 5.4.0 -> 6.0.0
opencb · Feb 17, 2025 · 36f0e51 · 36f0e51
2 parents b2a79c7 + cb6d7e4
commit 36f0e51
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/.github/workflows/pull-request-approved.yml b/.github/workflows/pull-request-approved.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   calculate-xetabase-branch:
+    if: github.event.review.state == 'approved'
     name: Calculate Xetabase branch
     runs-on: ubuntu-22.04
     outputs:

diff --git a/...tastore-mongodb/src/main/java/org/opencb/commons/datastore/mongodb/MongoDBCollection.java b/...tastore-mongodb/src/main/java/org/opencb/commons/datastore/mongodb/MongoDBCollection.java
@@ -322,13 +322,22 @@ public <T> List<DataResult<T>> privateFind(List<? extends Bson> queries, Bson pr
         return queryResultList;
     }
 
+    public DataResult<Document> aggregate(ClientSession clientSession, List<? extends Bson> operations,
+                                          QueryOptions options) {
+        return aggregate(clientSession, operations, null, options);
+    }
+
     public DataResult<Document> aggregate(List<? extends Bson> operations, QueryOptions options) {
         return aggregate(operations, null, options);
     }
 
     public <T> DataResult<T> aggregate(List<? extends Bson> operations, ComplexTypeConverter<T, Document> converter,
                                        QueryOptions options) {
+        return aggregate(null, operations, converter, options);
+    }
 
+    public <T> DataResult<T> aggregate(ClientSession clientSession, List<? extends Bson> operations,
+                                       ComplexTypeConverter<T, Document> converter, QueryOptions options) {
         long start = startQuery();
         DataResult<T> queryResult;
         List<T> list = new LinkedList<>();