Merge pull request #17 from 0x-buidl/fix/empty_doc_with_single_find

fix: empty document when populating with findOne and FindById

internal/find.go

@@ -318,6 +318,8 @@ func mergeFindOptsWithAggregatOpts[T UnionFindOpts](opt T) (mongo.Pipeline, *opt
 			pipelineOpts = append(pipelineOpts, bson.D{{Key: "$project", Value: opt.Projection}})
 		}
 		queryOpts = opt.QueryOptions
+		pipelineOpts = append(pipelineOpts, bson.D{{Key: "$limit", Value: 1}})
+
 	}
 	return pipelineOpts, aggOpts, queryOpts
 }

model.go

@@ -218,15 +218,15 @@ func (model *Model[T, P]) FindById(ctx context.Context, id any, opts ...*mopt.Fi
 		opt.FindOneOptions = fopt
 		opt.QueryOptions = qopt
 
-		docs, err := findWithPopulate[*mopt.FindOneOptions, T, P](
-			ctx, model.collection, query, doc.doc, opt)
+		docs, err := findWithPopulate[*mopt.FindOneOptions, T, P](ctx, model.collection, query, doc.doc, opt)
 		if err != nil {
 			return nil, err
 		}
 
 		if len(docs) == 0 {
 			return nil, mongo.ErrNoDocuments
 		}
+		doc = docs[0]
 	} else {
 		err = model.collection.FindOne(ctx, query, fopt).Decode(doc)
 		if err != nil {
@@ -262,15 +262,15 @@ func (model *Model[T, P]) FindOne(ctx context.Context, query bson.M, opts ...*mo
 		opt.FindOneOptions = fopt
 		opt.QueryOptions = qopt
 
-		docs, err := findWithPopulate[*mopt.FindOneOptions, T, P](
-			ctx, model.collection, query, doc.doc, opt)
+		docs, err := findWithPopulate[*mopt.FindOneOptions, T, P](ctx, model.collection, query, doc.doc, opt)
 		if err != nil {
 			return nil, err
 		}
 
 		if len(docs) == 0 {
 			return nil, mongo.ErrNoDocuments
 		}
+		doc = docs[0]
 	} else {
 		err = model.collection.FindOne(ctx, query, fopt).Decode(doc)
 		if err != nil {
@@ -306,9 +306,7 @@ func (model *Model[T, P]) Find(ctx context.Context, query bson.M, opts ...*mopt.
 		opt := mopt.Find()
 		opt.FindOptions = fopt
 		opt.QueryOptions = qopt
-		docs, err = findWithPopulate[*mopt.FindOptions, T, P](
-			ctx, model.collection, query,
-			d.doc, opt)
+		docs, err = findWithPopulate[*mopt.FindOptions, T, P](ctx, model.collection, query, d.doc, opt)
 		if err != nil {
 			return nil, err
 		}
@@ -354,10 +352,7 @@ func (model *Model[T, P]) UpdateOne(ctx context.Context, query bson.M, update bs
 	ds := model.docSample()
 
 	callback := func(sessCtx mongo.SessionContext) (interface{}, error) {
-		qa := NewQuery[T]().SetFilter(&query).
-			SetUpdate(&update).
-			SetOperation(UpdateOne).
-			SetOptions(opts)
+		qa := NewQuery[T]().SetFilter(&query).SetUpdate(&update).SetOperation(UpdateOne).SetOptions(opts)
 
 		err := runBeforeUpdateHooks(ctx, ds, newHookArg[T](qa, UpdateOne))
 		if err != nil {
@@ -394,10 +389,7 @@ func (model *Model[T, P]) UpdateMany(ctx context.Context, query bson.M, update b
 	ds := model.docSample()
 
 	callback := func(sessCtx mongo.SessionContext) (interface{}, error) {
-		qa := NewQuery[T]().SetFilter(&query).
-			SetUpdate(&update).
-			SetOperation(UpdateMany).
-			SetOptions(opts)
+		qa := NewQuery[T]().SetFilter(&query).SetUpdate(&update).SetOperation(UpdateMany).SetOptions(opts)
 
 		err := runBeforeUpdateHooks(ctx, ds, newHookArg[T](qa, UpdateMany))
 		if err != nil {

model_test.go

@@ -205,12 +205,15 @@ func TestModel_Populate(t *testing.T) {
 
 		assert.NoError(t, err, "Find should not return error")
 		assert.NotNil(t, book, "book should not be nil")
+		assert.NotZero(t, book.GetID(), "book.ID should not be zero")
+		assert.NotEmpty(t, book.Doc.Authors, "book should have authors")
 
 		for _, author := range book.Doc.Authors {
 			assert.NotEmpty(t, author.(bson.M)["name"], "author should not be empty")
 		}
 
 		chapters := book.Doc.Chapters
+		assert.NotEmpty(t, chapters, "book should have chapters")
 		for _, chapter := range chapters {
 			author := chapter.Author.(bson.M)
 			assert.NotEmpty(t, author["name"], "author should not be empty")
@@ -234,12 +237,15 @@ func TestModel_Populate(t *testing.T) {
 
 		assert.NoError(t, err, "Find should not return error")
 		assert.NotNil(t, book, "book should not be nil")
+		assert.NotZero(t, book.GetID(), "book.ID should not be zero")
+		assert.NotEmpty(t, book.Doc.Authors, "book should have authors")
 
 		for _, author := range book.Doc.Authors {
 			assert.NotEmpty(t, author.(bson.M)["name"], "author should not be empty")
 		}
 
 		chapters := book.Doc.Chapters
+		assert.NotEmpty(t, chapters, "book should have chapters")
 		for _, chapter := range chapters {
 			author := chapter.Author.(bson.M)
 			assert.NotEmpty(t, author["name"], "author should not be empty")