From 8e8a9a7309818f77480a04c84e9d1df3d3e62188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Garcia?= <vingarcia00@gmail.com>
Date: Mon, 14 Sep 2020 12:02:05 -0300
Subject: [PATCH] Add tests to StructToMap()

---
 postgres.go      |  8 +++++--
 postgres_test.go | 62 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/postgres.go b/postgres.go
index 7480c57..33d2423 100644
--- a/postgres.go
+++ b/postgres.go
@@ -138,8 +138,12 @@ func structToMap(obj interface{}) (map[string]interface{}, error) {
 	for i := 0; i < v.NumField(); i++ {
 		field := v.Field(i)
 		ft := field.Type()
-		if ft.Kind() == reflect.Ptr && field.IsNil() {
-			continue
+		if ft.Kind() == reflect.Ptr {
+			if field.IsNil() {
+				continue
+			}
+
+			field = field.Elem()
 		}
 		m[names[i]] = field.Interface()
 	}
diff --git a/postgres_test.go b/postgres_test.go
index 073b3b4..6957d00 100644
--- a/postgres_test.go
+++ b/postgres_test.go
@@ -199,6 +199,68 @@ func TestDelete(t *testing.T) {
 	})
 }
 
+func TestStructToMap(t *testing.T) {
+	type S1 struct {
+		Name string `sql:"name_attr"`
+		Age  int    `sql:"age_attr"`
+	}
+	t.Run("should convert plain structs to maps", func(t *testing.T) {
+		m, err := structToMap(S1{
+			Name: "my name",
+			Age:  22,
+		})
+
+		assert.Equal(t, nil, err)
+		assert.Equal(t, map[string]interface{}{
+			"name_attr": "my name",
+			"age_attr":  22,
+		}, m)
+	})
+
+	t.Run("should not ignore zero value attrs, if they are not pointers", func(t *testing.T) {
+		m, err := structToMap(S1{
+			Name: "",
+			Age:  0,
+		})
+
+		assert.Equal(t, nil, err)
+		assert.Equal(t, map[string]interface{}{
+			"name_attr": "",
+			"age_attr":  0,
+		}, m)
+	})
+
+	type S2 struct {
+		Name *string `sql:"name"`
+		Age  *int    `sql:"age"`
+	}
+
+	t.Run("should not ignore not nil pointers", func(t *testing.T) {
+		str := ""
+		age := 0
+		m, err := structToMap(S2{
+			Name: &str,
+			Age:  &age,
+		})
+
+		assert.Equal(t, nil, err)
+		assert.Equal(t, map[string]interface{}{
+			"name": "",
+			"age":  0,
+		}, m)
+	})
+
+	t.Run("should ignore nil pointers", func(t *testing.T) {
+		m, err := structToMap(S2{
+			Name: nil,
+			Age:  nil,
+		})
+
+		assert.Equal(t, nil, err)
+		assert.Equal(t, map[string]interface{}{}, m)
+	})
+}
+
 func createTable() error {
 	db, err := gorm.Open("sqlite3", "/tmp/test.db")
 	if err != nil {