From 93c4cf31a80b80610b9b688b7dc12549dc0d66cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Thu, 8 Jun 2023 16:24:15 +0200 Subject: [PATCH] v0.0.153 --- goextVersion.go | 4 ++-- wmo/queryDelete.go | 11 ++++++++++- wmo/queryUpdate.go | 8 ++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/goextVersion.go b/goextVersion.go index 2dc704d..b33145f 100644 --- a/goextVersion.go +++ b/goextVersion.go @@ -1,5 +1,5 @@ package goext -const GoextVersion = "0.0.152" +const GoextVersion = "0.0.153" -const GoextVersionTimestamp = "2023-06-08T16:17:01+0200" +const GoextVersionTimestamp = "2023-06-08T16:24:15+0200" diff --git a/wmo/queryDelete.go b/wmo/queryDelete.go index d4ba699..e202bf3 100644 --- a/wmo/queryDelete.go +++ b/wmo/queryDelete.go @@ -6,7 +6,7 @@ import ( "go.mongodb.org/mongo-driver/mongo" ) -func (c *Coll[TData]) DeleteOne(ctx context.Context, id EntityID) error { +func (c *Coll[TData]) DeleteOnebyID(ctx context.Context, id EntityID) error { _, err := c.coll.DeleteOne(ctx, bson.M{"_id": id}) if err != nil { return err @@ -15,6 +15,15 @@ func (c *Coll[TData]) DeleteOne(ctx context.Context, id EntityID) error { return nil } +func (c *Coll[TData]) DeleteOne(ctx context.Context, filterQuery bson.M) error { + _, err := c.coll.DeleteOne(ctx, filterQuery) + if err != nil { + return err + } + + return nil +} + func (c *Coll[TData]) DeleteMany(ctx context.Context, filterQuery bson.M) (*mongo.DeleteResult, error) { res, err := c.coll.DeleteMany(ctx, filterQuery) if err != nil { diff --git a/wmo/queryUpdate.go b/wmo/queryUpdate.go index be1614d..6226ff8 100644 --- a/wmo/queryUpdate.go +++ b/wmo/queryUpdate.go @@ -45,8 +45,8 @@ func (c *Coll[TData]) UpdateMany(ctx context.Context, filterQuery bson.M, update return res, nil } -func (c *Coll[TData]) ReplaceOne(ctx context.Context, id EntityID, value TData) error { - _, err := c.coll.UpdateOne(ctx, bson.M{"_id": id}, bson.M{"$set": value}) +func (c *Coll[TData]) ReplaceOne(ctx context.Context, filterQuery bson.M, value TData) error { + _, err := c.coll.UpdateOne(ctx, filterQuery, bson.M{"$set": value}) if err != nil { return err } @@ -54,10 +54,10 @@ func (c *Coll[TData]) ReplaceOne(ctx context.Context, id EntityID, value TData) return nil } -func (c *Coll[TData]) FindOneAndReplace(ctx context.Context, id EntityID, value TData) (TData, error) { +func (c *Coll[TData]) FindOneAndReplace(ctx context.Context, filterQuery bson.M, value TData) (TData, error) { var res TData - err := c.coll.FindOneAndUpdate(ctx, bson.M{"_id": id}, bson.M{"$set": value}, options.FindOneAndUpdate().SetReturnDocument(options.After)).Decode(&res) + err := c.coll.FindOneAndUpdate(ctx, filterQuery, bson.M{"$set": value}, options.FindOneAndUpdate().SetReturnDocument(options.After)).Decode(&res) if err != nil { return *new(TData), err }