Merge pull request #25 from kingscode/KCI-114

Update model.js value mapping

Author: Deluze

generator/templates/Crud/src/components/Resource.vue

@@ -145,8 +145,7 @@ export default {
               let item;
 
               if (this.modelType) {
-                item = new this.modelType();
-                item.mapResponse(response.data.data);
+                item = new this.modelType().mapResponse(response.data.data);
               } else {
                 item = response.data.data;
               }
@@ -239,8 +238,7 @@ export default {
       }
 
       if (this.modelType) {
-        this.updateForm.values = new this.modelType();
-        this.updateForm.values.mapResponse(selected[0]);
+        this.updateForm.values = new this.modelType().mapResponse(selected[0]);
       } else {
         this.updateForm.values = selected[0];
       }

generator/templates/Default/src/application/models/model.js

@@ -2,7 +2,6 @@
  *
  */
 class Model {
-
   /**
    * @return {{}};
    */
@@ -12,10 +11,66 @@ class Model {
 
   /**
    * @param data {{}}
+   * @return {model}
    */
   mapResponse(data) {
-    throw new Error(`${this.constructor.name}::mapResponse unset, keys: ${Object.keys(data)
-      .join(', ')}`);
+    return this.initializeObjectFromApi(data, this);
+  }
+
+  /**
+   * @private
+   * @param data
+   * @param assignable
+   * @return {model}
+   */
+  initializeObjectFromApi(data, assignable) {
+    Object.keys(assignable)
+      .forEach(key => {
+        const value = assignable[key];
+        const type = typeof value;
+
+        if (typeof data[key] === type) {
+          assignable[key] = data[key];
+          return;
+        }
+
+        const defaultValue = this.getDefaultValueFromType(type, value);
+
+        assignable[key] = data[key] || defaultValue;
+      });
+
+    Object.keys(data)
+      .forEach(key => {
+        if (typeof assignable[key] === 'undefined') {
+          assignable[key] = data[key];
+        }
+      });
+
+    return assignable;
+  }
+
+  /**
+   * @private
+   * @param type
+   * @param defaultModelValue
+   * @return {*}
+   */
+  getDefaultValueFromType(type, defaultModelValue) {
+    let defaultValue;
+
+    if (type === 'string') {
+      defaultValue = defaultModelValue || '';
+    } else if (type === 'boolean') {
+      defaultValue = defaultModelValue || false;
+    } else if (type === 'number') {
+      defaultValue = defaultModelValue || 0;
+    } else if (Array.isArray(defaultModelValue)) {
+      defaultValue = defaultModelValue || [];
+    } else {
+      defaultValue = defaultModelValue || null;
+    }
+
+    return defaultValue;
   }
 }
 

generator/templates/Default/src/application/models/user.js

@@ -11,12 +11,6 @@ class User extends Model {
       email: this.email,
     };
   }
-
-  mapResponse(data) {
-    this.id = data.id;
-    this.name = data.name;
-    this.email = data.email;
-  }
 }
 
 export default User;