Merge pull request #918 from appwrite/fix-go-data

Fix: Go data in generics

Author: eldadfux

templates/go/base/requests/api.twig

@@ -2,14 +2,29 @@
 	if err != nil {
 		return nil, err
 	}
-	var parsed {{ method | returnType(spec, spec.title | caseLower) }}
 	if strings.HasPrefix(resp.Type, "application/json") {
-		err = json.Unmarshal([]byte(resp.Result.(string)), &parsed)
+		bytes := []byte(resp.Result.(string))
+
+{%~ if method | returnType(spec, spec.title | caseLower) != 'interface{}' and method | returnType(spec, spec.title | caseLower) != '[]byte' and method | returnType(spec, spec.title | caseLower) != 'bool' %}
+		parsed := {{ method | returnType(spec, spec.title | caseLower) }}{}.New(bytes)
+
+		err = json.Unmarshal(bytes, parsed)
+		if err != nil {
+			return nil, err
+		}
+
+		return parsed, nil
+{%~ else %}
+		var parsed {{ method | returnType(spec, spec.title | caseLower) }}
+
+		err = json.Unmarshal(bytes, &parsed)
 		if err != nil {
 			return nil, err
 		}
 		return &parsed, nil
+{%~ endif %}
 	}
+	var parsed {{ method | returnType(spec, spec.title | caseLower) }}
 	parsed, ok := resp.Result.({{ method | returnType(spec, spec.title | caseLower) }})
 	if !ok {
 		return nil, errors.New("unexpected response type")

templates/go/models/model.go.twig

@@ -1,5 +1,9 @@
 package models
 
+import (
+    "encoding/json"
+    "errors"
+)
 
 {{ ((definition.description | caseUcfirst) ~ " Model") | godocComment }}
 type {{ definition.name | caseUcfirst }} struct {
@@ -8,8 +12,27 @@ type {{ definition.name | caseUcfirst }} struct {
     {{ property.name | caseUcfirst  }} {{ property | propertyType(spec) }} `json:"{{ property.name | escapeKeyword }}"`
     {%~ endfor %}
 
-    {%~ if definition.additionalProperties %}
-    // Additional properties
-    Data map[string]interface{}
-    {%~ endif %}
+    // Used by Decode() method
+    data []byte
 }
+
+func (model {{ definition.name | caseUcfirst }}) New(data []byte) *{{ definition.name | caseUcfirst }} {
+    model.data = data
+    return &model
+}
+
+{%~ if definition.additionalProperties %}
+// Use this method to get response in desired type
+{%~ endif %}
+func (model *{{ definition.name | caseUcfirst }}) Decode(value interface{}) error {
+    if len(model.data) <= 0 {
+        return errors.New("method Decode() cannot be used on nested struct")
+    }
+
+    err := json.Unmarshal(model.data, value)
+    if err != nil {
+        return err
+    }
+
+    return nil
+}