Revert "Update model.js value mapping"

This reverts commit f6e9f63.

Author: Deluze

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

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

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

@@ -2,6 +2,7 @@
  *
  */
 class Model {
+
   /**
    * @return {{}};
    */
@@ -11,66 +12,10 @@ class Model {
 
   /**
    * @param data {{}}
-   * @return {model}
    */
   mapResponse(data) {
-    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;
+    throw new Error(`${this.constructor.name}::mapResponse unset, keys: ${Object.keys(data)
+      .join(', ')}`);
   }
 }
 

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

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