Remove "omitempty" from Double/Int/Boolean. (#53)

grid · Nov 17, 2018 · a9fe647 · a9fe647
1 parent f37bd29
commit a9fe647
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/langs/go/go.go b/langs/go/go.go
@@ -406,6 +406,20 @@ func (m *GoModeler) packageName() string {
 	return m.pkg
 }
 
+func (m *GoModeler) fieldTags(field *firemodel.SchemaField) string {
+	switch field.Type.(type) {
+	// "false" and "0" should be written
+	case *firemodel.Boolean,
+		*firemodel.Integer,
+		*firemodel.Double:
+		return strcase.ToLowerCamel(field.Name)
+
+	default:
+		return strcase.ToLowerCamel(field.Name) + ",omitempty"
+	}
+
+}
+
 func (m *GoModeler) fields(structName string, fields []*firemodel.SchemaField, addTimestampFields bool) func(g *jen.Group) {
 	return func(g *jen.Group) {
 		for _, field := range fields {
@@ -414,10 +428,11 @@ func (m *GoModeler) fields(structName string, fields []*firemodel.SchemaField, a
 			} else {
 				g.Comment(field.Comment)
 			}
+
 			g.
 				Id(strcase.ToCamel(field.Name)).
 				Do(m.goType(field.Type)).
-				Tag(map[string]string{"firestore": strcase.ToLowerCamel(field.Name) + ",omitempty"})
+				Tag(map[string]string{"firestore": m.fieldTags(field)})
 		}
 		if addTimestampFields {
 			g.Line()

diff --git a/testfixtures/firemodel/TestFiremodelFromSchema/go/test_model.firemodel.go b/testfixtures/firemodel/TestFiremodelFromSchema/go/test_model.firemodel.go
@@ -20,13 +20,13 @@ type TestModel struct {
 	// The name.
 	Name string `firestore:"name,omitempty"`
 	// The age.
-	Age int64 `firestore:"age,omitempty"`
+	Age int64 `firestore:"age"`
 	// The number pi.
-	Pi float64 `firestore:"pi,omitempty"`
+	Pi float64 `firestore:"pi"`
 	// The birth date.
 	Birthdate time.Time `firestore:"birthdate,omitempty"`
 	// True if it is good.
-	IsGood bool `firestore:"isGood,omitempty"`
+	IsGood bool `firestore:"isGood"`
 	// TODO: Add comment to TestModel.data.
 	Data []byte `firestore:"data,omitempty"`
 	// TODO: Add comment to TestModel.friend.

diff --git a/testfixtures/firemodel/TestFiremodelFromSchema/go/test_struct.firemodel.go b/testfixtures/firemodel/TestFiremodelFromSchema/go/test_struct.firemodel.go
@@ -7,7 +7,7 @@ type TestStruct struct {
 	// TODO: Add comment to TestStruct.where.
 	Where string `firestore:"where,omitempty"`
 	// TODO: Add comment to TestStruct.how_much.
-	HowMuch int64 `firestore:"howMuch,omitempty"`
+	HowMuch int64 `firestore:"howMuch"`
 	// TODO: Add comment to TestStruct.some_enum.
 	SomeEnum TestEnum `firestore:"someEnum,omitempty"`
 }