From 7c056dfc079f8f21551f6e5df70be91cb0fbf4db Mon Sep 17 00:00:00 2001
From: Nikita Tokarchuk <tokarchuk+bitbucket@nevisq.com>
Date: Thu, 16 May 2019 23:59:54 +0200
Subject: [PATCH] Implement single document loaders through find cursor

---
 mongox/common/loadbinary.go | 30 +++++++++++++++---------------
 mongox/common/loadone.go    | 30 +++++++++++++++---------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/mongox/common/loadbinary.go b/mongox/common/loadbinary.go
index 5777e9f..b078a3e 100644
--- a/mongox/common/loadbinary.go
+++ b/mongox/common/loadbinary.go
@@ -6,30 +6,30 @@ import (
 	"github.com/mainnika/mongox-go-driver/mongox/query"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 // LoadBinary function loads a first single target document by a query
 func LoadBinary(db *mongox.Database, target interface{}, filters ...interface{}) (bson.Raw, error) {
 
-	collection := db.GetCollectionOf(target)
-	opts := options.FindOne()
-	composed := query.Compose(filters...)
+	composed := query.Compose(append(filters, query.Limit(1))...)
+	hasPreloader, _ := composed.Preloader()
 
-	opts.Sort = composed.Sorter()
+	var result *mongo.Cursor
+	var err error
 
-	result := collection.FindOne(db.Context(), composed.M(), opts)
-	if result.Err() != nil {
-		return nil, errors.InternalErrorf("can't create find one result: %s", result.Err())
-	}
-
-	bytes, err := result.DecodeBytes()
-	if err == mongo.ErrNoDocuments {
-		return nil, errors.NotFoundErrorf("%s", err)
+	if hasPreloader {
+		result, err = createAggregateLoad(db, target, composed)
+	} else {
+		result, err = createSimpleLoad(db, target, composed)
 	}
 	if err != nil {
-		return nil, errors.InternalErrorf("can't decode desult: %s", err)
+		return nil, errors.InternalErrorf("can't create find result: %s", err)
+	}
+
+	hasNext := result.Next(db.Context())
+	if !hasNext {
+		return nil, errors.NotFoundErrorf("can't find result: %s", result.Err())
 	}
 
-	return bytes, nil
+	return result.Current, nil
 }
diff --git a/mongox/common/loadone.go b/mongox/common/loadone.go
index ed2942c..baff4b0 100644
--- a/mongox/common/loadone.go
+++ b/mongox/common/loadone.go
@@ -5,30 +5,30 @@ import (
 	"github.com/mainnika/mongox-go-driver/mongox/errors"
 	"github.com/mainnika/mongox-go-driver/mongox/query"
 	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
 // LoadOne function loads a first single target document by a query
 func LoadOne(db *mongox.Database, target interface{}, filters ...interface{}) error {
 
-	collection := db.GetCollectionOf(target)
-	opts := options.FindOne()
-	composed := query.Compose(filters...)
+	composed := query.Compose(append(filters, query.Limit(1))...)
+	hasPreloader, _ := composed.Preloader()
 
-	opts.Sort = composed.Sorter()
+	var result *mongo.Cursor
+	var err error
 
-	result := collection.FindOne(db.Context(), composed.M(), opts)
-	if result.Err() != nil {
-		return errors.InternalErrorf("can't create find one result: %s", result.Err())
-	}
-
-	err := result.Decode(target)
-	if err == mongo.ErrNoDocuments {
-		return errors.NotFoundErrorf("%s", err)
+	if hasPreloader {
+		result, err = createAggregateLoad(db, target, composed)
+	} else {
+		result, err = createSimpleLoad(db, target, composed)
 	}
 	if err != nil {
-		return errors.InternalErrorf("can't decode desult: %s", err)
+		return errors.InternalErrorf("can't create find result: %s", err)
+	}
+
+	hasNext := result.Next(db.Context())
+	if !hasNext {
+		return errors.NotFoundErrorf("can't find result: %s", result.Err())
 	}
 
-	return nil
+	return result.Decode(target)
 }