Added Simple Disconnect to use on defer call

GabrielHCataldo · Jan 15, 2024 · 6da4e8e · 6da4e8e
1 parent b118ca2
commit 6da4e8e
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ MongoDB Template
 <!--suppress ALL -->
 <img align="right" src="gopher-mongo.png" alt="">
 
-[![Project status](https://img.shields.io/badge/version-v1.0.3-vividgreen.svg)](https://github.com/GabrielHCataldo/go-mongo-template/releases/tag/v1.0.3)
+[![Project status](https://img.shields.io/badge/version-v1.0.4-vividgreen.svg)](https://github.com/GabrielHCataldo/go-mongo-template/releases/tag/v1.0.4)
 [![Go Report Card](https://goreportcard.com/badge/github.com/GabrielHCataldo/go-mongo-template)](https://goreportcard.com/report/github.com/GabrielHCataldo/go-mongo-template)
 [![Coverage Status](https://coveralls.io/repos/GabrielHCataldo/go-mongo-template/badge.svg?branch=main&service=github)](https://coveralls.io/github/GabrielHCataldo/go-mongo?branch=main)
 [![Open Source Helpers](https://www.codetriage.com/gabrielhcataldo/go-mongo-template/badges/users.svg)](https://www.codetriage.com/gabrielhcataldo/go-mongo)
@@ -107,7 +107,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     testDocument := test{
         Random:    rand.Int(),
         Name:      "Foo Bar",
@@ -157,7 +157,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     testDocuments := []*test{
         {
             Random:    rand.Int(),
@@ -218,7 +218,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     filter := bson.M{"_id": bson.M{"$exists": true}}
     update := bson.M{"$set": bson.M{"name": "Foo Bar Updated"}}
     updateResult, err := mongoTemplate.UpdateOne(ctx, filter, update, test{})
@@ -258,7 +258,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     objectId, _ := primitive.ObjectIDFromHex("6585f3a8bf2af8ad9bcab912")
     update := bson.M{"$set": bson.M{"name": "Foo Bar Updated"}}
     updateResult, err := mongoTemplate.UpdateOneById(ctx, objectId, update, test{})
@@ -299,7 +299,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     filter := bson.M{"_id": bson.M{"$exists": true}}
     update := bson.M{"$set": bson.M{"name": "Foo Bar Updated"}}
     updateResult, err := mongoTemplate.UpdateOne(ctx, filter, update, test{})
@@ -344,7 +344,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     filter := bson.M{"_id": bson.M{"$exists": true}}
     replacement := test{
         Random:    rand.Int(),
@@ -395,7 +395,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     filter := bson.M{"_id": bson.M{"$exists": true}}
     deleteResult, err := mongoTemplate.DeleteOne(ctx, filter, test{})
     if err != nil {
@@ -434,7 +434,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     objectId, _ := primitive.ObjectIDFromHex("6585f3a8bf2af8ad9bcab912")
     deleteResult, err := mongoTemplate.DeleteOneById(ctx, objectId, test{})
     if err != nil {
@@ -473,7 +473,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     filter := bson.M{"_id": bson.M{"$exists": true}}
     deleteResult, err := mongoTemplate.DeleteMany(ctx, filter, test{})
     if err != nil {
@@ -514,7 +514,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     //dest need a pointer
     var dest []test
     err = mongoTemplate.FindAll(ctx, &dest)
@@ -554,7 +554,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     filter := bson.M{"_id": bson.M{"$exists": true}}
     pageOutput, err := mongoTemplate.FindPageable(ctx, filter, mongo.PageInput{
         Page:     0,
@@ -597,7 +597,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     objectId, _ := primitive.ObjectIDFromHex("6585db26633e225cbeadf553")
     //dest need a pointer
     var dest test
@@ -641,7 +641,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     objectId, _ := primitive.ObjectIDFromHex("6585f5b8fd8fa97d562419f7")
     exists, err := mongoTemplate.ExistsById(ctx, objectId, test{})
     if err != nil {
@@ -680,7 +680,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     filter := bson.M{"_id": bson.M{"$exists": true}}
     exists, err := mongoTemplate.Exists(ctx, filter, test{})
     if err != nil {
@@ -723,7 +723,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     countResult, err := mongoTemplate.EstimatedDocumentCount(ctx, test{})
     if err != nil {
         logger.Error("error estimated document count:", err)
@@ -761,7 +761,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     filter := bson.M{"_id": bson.M{"$exists": true}}
     countResult, err := mongoTemplate.CountDocuments(ctx, filter, test{})
     if err != nil {
@@ -805,7 +805,7 @@ func main() {
         logger.Error("error to init mongo template:", err)
         return
     }
-    defer mongoTemplate.Disconnect(ctx)
+    defer mongoTemplate.SimpleDisconnect(ctx)
     pipeline := mongo.Pipeline{bson.D{{"$match", bson.D{
         {"operationType", bson.M{"$in": []string{"insert", "update", "delete", "replace"}}},
     }}}}

diff --git a/_example/count/main.go b/_example/count/main.go
@@ -34,7 +34,7 @@ func estimatedDocumentCount() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	countResult, err := mongoTemplate.EstimatedDocumentCount(ctx, test{})
 	if err != nil {
 		logger.Error("error estimated document count:", err)
@@ -51,7 +51,7 @@ func countDocuments() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	filter := bson.M{"_id": bson.M{"$exists": true}}
 	countResult, err := mongoTemplate.CountDocuments(ctx, filter, test{})
 	if err != nil {

diff --git a/_example/delete/main.go b/_example/delete/main.go
@@ -35,7 +35,7 @@ func deleteOne() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	filter := bson.M{"_id": bson.M{"$exists": true}}
 	deleteResult, err := mongoTemplate.DeleteOne(ctx, filter, test{})
 	if err != nil {
@@ -53,7 +53,7 @@ func deleteOneById() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	objectId, _ := primitive.ObjectIDFromHex("6585f3a8bf2af8ad9bcab912")
 	deleteResult, err := mongoTemplate.DeleteOneById(ctx, objectId, test{})
 	if err != nil {
@@ -71,7 +71,7 @@ func deleteMany() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	filter := bson.M{"_id": bson.M{"$exists": true}}
 	deleteResult, err := mongoTemplate.DeleteMany(ctx, filter, test{})
 	if err != nil {

diff --git a/_example/exists/main.go b/_example/exists/main.go
@@ -34,7 +34,7 @@ func exists() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	filter := bson.M{"_id": bson.M{"$exists": true}}
 	existsResult, err := mongoTemplate.Exists(ctx, filter, test{})
 	if err != nil {
@@ -52,7 +52,7 @@ func existsById() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	objectId, _ := primitive.ObjectIDFromHex("6585f5b8fd8fa97d562419f7")
 	existsResult, err := mongoTemplate.ExistsById(ctx, objectId, test{})
 	if err != nil {

diff --git a/_example/find/main.go b/_example/find/main.go
@@ -37,7 +37,7 @@ func findOne() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	filter := bson.M{"_id": bson.M{"$exists": true}}
 	var dest test
 	err = mongoTemplate.FindOne(ctx, filter, &dest)
@@ -56,7 +56,7 @@ func findOneById() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	objectId, _ := primitive.ObjectIDFromHex("6585db26633e225cbeadf553")
 	//dest need a pointer
 	var dest test
@@ -76,7 +76,7 @@ func find() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	filter := bson.M{"_id": bson.M{"$exists": true}}
 	//dest need a pointer
 	var dest []test
@@ -96,7 +96,7 @@ func findPageable() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	filter := bson.M{"_id": bson.M{"$exists": true}}
 	pageOutput, err := mongoTemplate.FindPageable(ctx, filter, mongo.PageInput{
 		Page:     0,
@@ -119,7 +119,7 @@ func findAll() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	var dest []test
 	err = mongoTemplate.FindAll(ctx, &dest)
 	if err != nil {

diff --git a/_example/insert/main.go b/_example/insert/main.go
@@ -36,7 +36,7 @@ func insertOne() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	testDocument := test{
 		Random:    rand.Int(),
 		Name:      "Foo Bar",
@@ -62,7 +62,7 @@ func insertMany() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	testDocuments := []*test{
 		{
 			Random:    rand.Int(),
@@ -98,7 +98,7 @@ func insertOneManualCloseSession() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	testDocument := test{
 		Random:    rand.Int(),
 		Name:      "Foo Bar",

diff --git a/_example/replace/main.go b/_example/replace/main.go
@@ -35,7 +35,7 @@ func replaceOne() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	filter := bson.M{"_id": bson.M{"$exists": true}}
 	replacement := test{
 		Random:    rand.Int(),
@@ -61,7 +61,7 @@ func replaceOneById() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	objectId, _ := primitive.ObjectIDFromHex("6585db26633e225cbeadf553")
 	replacement := test{
 		Random:    rand.Int(),

diff --git a/_example/update/main.go b/_example/update/main.go
@@ -35,7 +35,7 @@ func updateOne() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	filter := bson.M{"_id": bson.M{"$exists": true}}
 	update := bson.M{"$set": bson.M{"name": "Foo Bar Updated"}}
 	updateResult, err := mongoTemplate.UpdateOne(ctx, filter, update, test{})
@@ -54,7 +54,7 @@ func updateOneById() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	objectId, _ := primitive.ObjectIDFromHex("6585f3a8bf2af8ad9bcab911")
 	update := bson.M{"$set": bson.M{"name": "Foo Bar Updated"}}
 	updateResult, err := mongoTemplate.UpdateOneById(ctx, objectId, update, test{})
@@ -73,7 +73,7 @@ func updateMany() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	filter := bson.M{"_id": bson.M{"$exists": true}}
 	update := bson.M{"$set": bson.M{"name": "Foo Bar Updated"}}
 	updateResult, err := mongoTemplate.UpdateOne(ctx, filter, update, test{})

diff --git a/_example/watch/main.go b/_example/watch/main.go
@@ -24,7 +24,7 @@ func watch() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	pipeline := mongo.Pipeline{bson.D{{"$match", bson.D{
 		{"operationType", bson.M{"$in": []string{"insert", "update", "delete", "replace"}}},
 	}}}}
@@ -52,7 +52,7 @@ func watchHandler() {
 		logger.Error("error to init mongo template:", err)
 		return
 	}
-	defer mongoTemplate.Disconnect(ctx)
+	defer mongoTemplate.SimpleDisconnect(ctx)
 	pipeline := mongo.Pipeline{bson.D{{"$match", bson.D{
 		{"operationType", bson.M{"$in": []string{"insert", "update", "delete", "replace"}}},
 	}}}}

diff --git a/mongo/main_test.go b/mongo/main_test.go
@@ -1880,6 +1880,7 @@ func initOptionInsertMany() option.InsertMany {
 
 func initOptionDelete() option.Delete {
 	return option.NewDelete().
+		SetDisableAutoRollbackSession(true).
 		SetForceRecreateSession(true).
 		SetDisableAutoCloseSession(false).
 		SetComment("comment delete golang unit test").