From 22a1d7033fd3121c347a22cda7ff0bb00da8b5df Mon Sep 17 00:00:00 2001 From: Nikita Tokarchuk Date: Mon, 13 Jul 2020 02:43:42 +0200 Subject: [PATCH] Remove custom errors --- mongox/database/count.go | 9 --------- mongox/database/deletearray.go | 2 +- mongox/database/deleteone.go | 7 ------- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/mongox/database/count.go b/mongox/database/count.go index 7075dba..122efda 100644 --- a/mongox/database/count.go +++ b/mongox/database/count.go @@ -1,11 +1,8 @@ package database import ( - "fmt" - "go.mongodb.org/mongo-driver/mongo/options" - "github.com/mainnika/mongox-go-driver/v2/mongox" "github.com/mainnika/mongox-go-driver/v2/mongox/query" ) @@ -21,12 +18,6 @@ func (d *Database) Count(target interface{}, filters ...interface{}) (result int opts.Skip = composed.Skipper() result, err = collection.CountDocuments(d.Context(), composed.M(), opts) - if err == mongox.ErrNoDocuments { - return 0, err - } - if err != nil { - return 0, fmt.Errorf("can't decode desult: %w", err) - } return } diff --git a/mongox/database/deletearray.go b/mongox/database/deletearray.go index d492dad..787e3dd 100644 --- a/mongox/database/deletearray.go +++ b/mongox/database/deletearray.go @@ -49,7 +49,7 @@ func (d *Database) DeleteArray(target interface{}) (err error) { result, err := collection.DeleteMany(d.Context(), primitive.M{"_id": primitive.M{"$in": ids}}, opts) if err != nil { - return fmt.Errorf("can't create find and delete result: %w", err) + return } if result.DeletedCount != int64(targetLen) { err = fmt.Errorf("can't verify delete result: removed count mismatch %d != %d", result.DeletedCount, targetLen) diff --git a/mongox/database/deleteone.go b/mongox/database/deleteone.go index cb5a1c9..b0e633e 100644 --- a/mongox/database/deleteone.go +++ b/mongox/database/deleteone.go @@ -7,7 +7,6 @@ import ( "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo/options" - "github.com/mainnika/mongox-go-driver/v2/mongox" "github.com/mainnika/mongox-go-driver/v2/mongox/base" "github.com/mainnika/mongox-go-driver/v2/mongox/query" "github.com/mainnika/mongox-go-driver/v2/mongox/utils" @@ -39,12 +38,6 @@ func (d *Database) DeleteOne(target interface{}, filters ...interface{}) (err er } err = result.Decode(target) - if err == mongox.ErrNoDocuments { - return err - } - if err != nil { - return fmt.Errorf("can't decode result: %w", err) - } return }