Merge pull request #42 from leancloud/cloud-init

🚚 Move LeanEngine features into `leancloud.Engine`
leancloud · Oct 20, 2021 · ebeb27f · ebeb27f
2 parents 6df03a9 + f93a751
commit ebeb27f
Show file tree

Hide file tree

Showing 9 changed files with 458 additions and 439 deletions.
diff --git a/leancloud/client_test.go b/leancloud/client_test.go
@@ -6,6 +6,13 @@ import (
 	"testing"
 )
 
+var client *Client
+
+func init() {
+	client = NewEnvClient()
+	Engine.Init(client)
+}
+
 func TestNewClient(t *testing.T) {
 	appID, appKey, masterKey, serverURL := os.Getenv("LEANCLOUD_APP_ID"), os.Getenv("LEANCLOUD_APP_KEY"), os.Getenv("LEANCLOUD_APP_MASTER_KEY"), os.Getenv("LEANCLOUD_API_SERVER")
 	options := &ClientOptions{

diff --git a/leancloud/cloud.go b/leancloud/cloud.go
diff --git a/leancloud/encoding.go b/leancloud/encoding.go
@@ -598,14 +598,14 @@ func decodeObject(fields interface{}) (*Object, error) {
 	var decodedCreatedAt, decodedUpdatedAt time.Time
 	var ok bool
 
-	if decodedFields["objectId"] != "" {
+	if decodedFields["objectId"] != "" && decodedFields["objectId"] != nil {
 		objectID, ok = decodedFields["objectId"].(string)
 		if !ok {
 			return nil, fmt.Errorf("unexpected error when parse objectId: want type string but %v", reflect.TypeOf(decodedFields["objectId"]))
 		}
 	}
 
-	if decodedFields["createdAt"] != "" {
+	if decodedFields["createdAt"] != "" && decodedFields["createdAt"] != nil {
 		createdAt, ok = decodedFields["createdAt"].(string)
 		if !ok {
 			return nil, fmt.Errorf("unexpected error when parse createdAt: want type string but %v", reflect.TypeOf(decodedFields["createdAt"]))
@@ -617,7 +617,7 @@ func decodeObject(fields interface{}) (*Object, error) {
 		decodedFields["createdAt"] = decodedCreatedAt
 	}
 
-	if decodedFields["updatedAt"] != "" {
+	if decodedFields["updatedAt"] != "" && decodedFields["updatedAt"] != nil {
 		updatedAt, ok = decodedFields["updatedAt"].(string)
 		if !ok {
 			if decodedFields["updatedAt"] == nil {