Fix for detecting names using a slice of models

BuxOrg · Apr 4, 2022 · 8225116 · 8225116
1 parent fe4481e
commit 8225116
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/datastore/mongodb.go b/datastore/mongodb.go
@@ -115,14 +115,14 @@ func (c *Client) incrementWithMongo(
 	return
 }
 
-// getWithMongo will get a given struct from MongoDB
+// getWithMongo will get given struct(s) from MongoDB
 func (c *Client) getWithMongo(
 	ctx context.Context,
-	model interface{},
+	models interface{},
 	conditions map[string]interface{},
 ) error {
-	queryConditions := getMongoQueryConditions(model, conditions)
-	collectionName := utils.GetModelTableName(model)
+	queryConditions := getMongoQueryConditions(models, conditions)
+	collectionName := utils.GetModelTableName(models)
 	if collectionName == nil {
 		return ErrUnknownCollection
 	}
@@ -132,7 +132,7 @@ func (c *Client) getWithMongo(
 		setPrefix(c.options.mongoDBConfig.TablePrefix, *collectionName),
 	)
 
-	if utils.IsModelSlice(model) {
+	if utils.IsModelSlice(models) {
 		c.DebugLog(fmt.Sprintf(logLine, "findMany", *collectionName, queryConditions))
 
 		cursor, err := collection.Find(ctx, queryConditions)
@@ -145,7 +145,7 @@ func (c *Client) getWithMongo(
 			return cursor.Err()
 		}
 
-		if err = cursor.All(ctx, model); err != nil {
+		if err = cursor.All(ctx, models); err != nil {
 			return err
 		}
 	} else {
@@ -160,7 +160,7 @@ func (c *Client) getWithMongo(
 			return result.Err()
 		}
 
-		if err := result.Decode(model); err != nil {
+		if err := result.Decode(models); err != nil {
 			c.DebugLog(fmt.Sprintf(logLine, "result err", *collectionName, err))
 			return err
 		}

diff --git a/utils/models.go b/utils/models.go
@@ -32,7 +32,8 @@ func GetModelName(model interface{}) *string {
 	}
 
 	// Model is a pointer
-	if reflect.ValueOf(model).Type().Kind() == reflect.Ptr {
+	k := GetModelType(model).Kind()
+	if reflect.ValueOf(model).Type().Kind() == reflect.Ptr && k != reflect.Struct {
 		if m, ok := model.(checkForMethod); ok {
 			name := m.GetModelName()
 			return &name
@@ -58,7 +59,8 @@ func GetModelTableName(model interface{}) *string {
 	}
 
 	// Model is a pointer
-	if reflect.ValueOf(model).Type().Kind() == reflect.Ptr {
+	k := GetModelType(model).Kind()
+	if reflect.ValueOf(model).Type().Kind() == reflect.Ptr && k != reflect.Struct {
 		if m, ok := model.(checkForMethod); ok {
 			name := m.GetModelTableName()
 			return &name

diff --git a/utils/models_test.go b/utils/models_test.go
@@ -178,6 +178,12 @@ func TestGetModelName(t *testing.T) {
 		assert.Equal(t, testModelName, *name)
 	})
 
+	t.Run("models are set - value", func(t *testing.T) {
+		tm := &[]testModel{{Field: testModelName}}
+		name := GetModelName(tm)
+		assert.Equal(t, testModelName, *name)
+	})
+
 	t.Run("model does not have method - pointer", func(t *testing.T) {
 		tm := &badModel{}
 		name := GetModelName(tm)
@@ -212,6 +218,12 @@ func TestGetModelTableName(t *testing.T) {
 		assert.Equal(t, testTableName, *name)
 	})
 
+	t.Run("models are set - value", func(t *testing.T) {
+		tm := &[]testModel{{Field: testModelName}}
+		name := GetModelTableName(tm)
+		assert.Equal(t, testModelName, *name)
+	})
+
 	t.Run("model does not have method - pointer", func(t *testing.T) {
 		tm := &badModel{}
 		name := GetModelTableName(tm)