v0.0.155

goextVersion.go

@@ -1,5 +1,5 @@
 package goext
 
-const GoextVersion = "0.0.151"
+const GoextVersion = "0.0.155"
 
-const GoextVersionTimestamp = "2023-06-07T17:57:03+0200"
+const GoextVersionTimestamp = "2023-06-08T16:26:06+0200"

wmo/collection.go

@@ -2,13 +2,17 @@ package wmo
 
 import (
 	"context"
+	"go.mongodb.org/mongo-driver/bson/bsontype"
 	"go.mongodb.org/mongo-driver/mongo"
 	ct "gogs.mikescher.com/BlackForestBytes/goext/cursortoken"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"reflect"
 )
 
-type EntityID = any
+type EntityID interface {
+	MarshalBSONValue() (bsontype.Type, []byte, error)
+	String() string
+}
 
 type fullTypeRef[TData any] struct {
 	IsPointer      bool

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 {

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 {
+func (c *Coll[TData]) ReplaceOne(ctx context.Context, filterQuery bson.M, value TData) error {
-	_, err := c.coll.UpdateOne(ctx, bson.M{"_id": id}, value)
+	_, 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}, 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
 	}