Merge pull request #45 from elcengine/test/increase-coverage

test: increased coverage

Author: Akalanka47000

core/model_plugins.go

@@ -1,6 +1,8 @@
 package elemental
 
-import "github.com/elcengine/elemental/plugins/filterquery"
+import (
+	"github.com/elcengine/elemental/plugins/filterquery"
+)
 
 // QS allows you to construct an Elemental query directly from a request's query string.
 //
@@ -23,7 +25,9 @@ func (m Model[T]) QSR(result fq.Result) Model[T] {
 		m = m.Find(result.Filters)
 	}
 	if len(result.Include) > 0 {
-		m = m.Populate(result.Include)
+		for _, field := range result.Include {
+			m = m.Populate(field)
+		}
 	}
 	if len(result.SecondaryFilters) > 0 {
 		m = m.Find(result.SecondaryFilters)

core/model_utils.go

@@ -122,19 +122,21 @@ func (m Model[T]) findMatchStage() bson.M {
 }
 
 func (m Model[T]) parseDocument(doc any) primitive.M {
-	if reflect.TypeOf(doc).Kind() == reflect.Ptr {
+	docType := reflect.TypeOf(doc).Kind()
+	if docType == reflect.Ptr {
 		doc = reflect.ValueOf(doc).Elem().Interface()
 	}
-	if reflect.TypeOf(doc).Kind() == reflect.Map {
+	if docType == reflect.Map {
 		return utils.Cast[primitive.M](doc)
 	}
-	result := utils.ToBSONDoc(doc)
-	for k, v := range *result {
-		if !reflect.ValueOf(v).IsValid() || reflect.ValueOf(v).IsZero() {
-			delete(*result, k)
+	result := *utils.ToBSONDoc(doc)
+	for k, v := range result {
+		fieldValue := reflect.ValueOf(v)
+		if !fieldValue.IsValid() || fieldValue.IsZero() {
+			delete(result, k)
 		}
 	}
-	return *result
+	return result
 }
 
 func parseUpdateOptions[T any, O any](m Model[T], opts []*O) []*O {

tests/core_delete_test.go

@@ -1,12 +1,14 @@
 package tests
 
 import (
+	"errors"
 	"testing"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
 	"github.com/elcengine/elemental/tests/fixtures/mocks"
 	ts "github.com/elcengine/elemental/tests/fixtures/setup"
+	"github.com/google/uuid"
 	. "github.com/smartystreets/goconvey/convey"
 )
 
@@ -46,6 +48,21 @@ func TestCoreDelete(t *testing.T) {
 			UserModel.Delete(user).Exec()
 			So(UserModel.FindByID(user.ID).Exec(), ShouldBeNil)
 		})
+		Convey("Delete a user using fail with", func() {
+			user := UserModel.FindOne().ExecT()
+			So(user.Name, ShouldEqual, mocks.Caranthir.Name)
+
+			So(func() {
+				UserModel.SetConnection(uuid.NewString()).DeleteByID(user.ID).OrFail().Exec()
+			}, ShouldPanicWith, errors.New("no results found matching the given query"))
+
+			Convey("With custom error", func() {
+				err := errors.New("some custom error")
+				So(func() {
+					UserModel.SetConnection(uuid.NewString()).DeleteByID(user.ID).OrFail(err).Exec()
+				}, ShouldPanicWith, err)
+			})
+		})
 		Convey("Delete a user by ID", func() {
 			user := UserModel.FindOne().ExecT()
 			So(user.Name, ShouldEqual, mocks.Caranthir.Name)

tests/core_middleware_test.go

@@ -36,6 +36,16 @@ func TestCoreMiddleware(t *testing.T) {
 		return true
 	})
 
+	CastleModel.PostSave(func(castle Castle) bool {
+		invokedHooks["postSaveSecond"] = true
+		return false
+	})
+
+	CastleModel.PostSave(func(castle Castle) bool {
+		invokedHooks["postSaveThird"] = true
+		return true
+	})
+
 	CastleModel.PreUpdateOne(func(doc any) bool {
 		invokedHooks["preUpdateOne"] = true
 		return true
@@ -140,6 +150,8 @@ func TestCoreMiddleware(t *testing.T) {
 	Convey("Post hooks", t, func() {
 		Convey("Save", func() {
 			So(invokedHooks["postSave"], ShouldBeTrue)
+			So(invokedHooks["postSaveSecond"], ShouldBeTrue)
+			So(invokedHooks["postSaveThird"], ShouldBeFalse)
 		})
 		Convey("UpdateOne", func() {
 			So(invokedHooks["postUpdateOne"], ShouldBeTrue)

tests/core_soft_delete_test.go

@@ -88,6 +88,8 @@ func TestCoreSoftDelete(t *testing.T) {
 			}
 
 			So(UserModel.CountDocuments().Exec(), ShouldEqual, 0)
+
+			So(UserModel.Distinct("name").Exec(), ShouldBeEmpty)
 		})
 	})
 }

tests/core_update_test.go

@@ -56,6 +56,25 @@ func TestCoreUpdate(t *testing.T) {
 			}).Upsert().Exec()
 			So(UserModel.Where("name", "Triss").Exec(), ShouldHaveLength, 1)
 		})
+		Convey("Update user with upsert within options", func() {
+			UserModel.UpdateOne(&primitive.M{"name": "Letho"}, User{
+				Name: "Letho",
+			}, &options.UpdateOptions{
+				Upsert: lo.ToPtr(true),
+			}).Exec()
+			So(UserModel.Where("name", "Letho").Exec(), ShouldHaveLength, 1)
+		})
+		Convey("Update a user with a pointer document", func() {
+			user := User{
+				Name: "Foltest",
+				Age:  50,
+			}
+			UserModel.Create(user).Exec()
+			UserModel.UpdateOne(&primitive.M{"name": user.Name}, &User{
+				Age: 51,
+			}).Exec()
+			So(UserModel.FindOne().Where("name", user.Name).ExecT().Age, ShouldEqual, 51)
+		})
 		Convey("Update user by ID", func() {
 			user := UserModel.FindOne().Where("name", "Triss").ExecT()
 			UserModel.UpdateByID(user.ID, User{
@@ -103,7 +122,7 @@ func TestCoreUpdate(t *testing.T) {
 				Weapons: []string{"Dagger"},
 			}).Exec()
 			users := UserModel.Where("weapons", "Dagger").ExecTT()
-			So(users, ShouldHaveLength, len(mocks.Users)+1)
+			So(users, ShouldHaveLength, len(mocks.Users)+3)
 		})
 		Convey("Increment age of a user", func() {
 			UserModel.Where("name", mocks.Vesemir.Name).Inc("age", 1).Exec()

tests/plugin_filter_query_test.go

@@ -253,5 +253,30 @@ func TestPluginFilterQuery(t *testing.T) {
 			So(result.Docs[0].Name, ShouldEqual, mocks.Ciri.Name)
 			So(result.Docs[1].Name, ShouldEqual, mocks.Geralt.Name)
 		})
+		Convey("When an include is present in query string", func() {
+			MonsterModel := MonsterModel.SetDatabase(t.Name())
+			KingdomModel := KingdomModel.SetDatabase(t.Name())
+			BestiaryModel := BestiaryModel.SetDatabase(t.Name())
+
+			monster := MonsterModel.Create(Monster{
+				Name:     "Katakan",
+				Category: "Vampire",
+			}).ExecT()
+
+			kingdom := KingdomModel.Create(Kingdom{
+				Name: "Nilfgaard",
+			}).ExecT()
+
+			BestiaryModel.Create(Bestiary{
+				Monster: monster,
+				Kingdom: kingdom,
+			}).Exec()
+
+			bestiaries := BestiaryModel.QS("include=monster,kingdom").ExecTT()
+			So(bestiaries, ShouldHaveLength, 1)
+			So(bestiaries[0].Monster.Name, ShouldEqual, monster.Name)
+			So(bestiaries[0].Monster.Category, ShouldEqual, monster.Category)
+			So(bestiaries[0].Kingdom.Name, ShouldEqual, kingdom.Name)
+		})
 	})
 }