Fix detecting of dirty attributes

ghidoz · Sep 17, 2016 · a38fa1c · a38fa1c
1 parent e1876d8
commit a38fa1c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/src/decorators/attribute.decorator.ts b/src/decorators/attribute.decorator.ts
@@ -5,6 +5,7 @@ export function Attribute(config: any = {}) {
 
     let saveAnnotations = function (hasDirtyAttributes: boolean, oldValue: any, newValue: any) {
         let annotations = Reflect.getMetadata('Attribute', target) || {};
+        hasDirtyAttributes = typeof oldValue === 'undefined' ? false : hasDirtyAttributes;
         annotations[propertyName] = {
             hasDirtyAttributes: hasDirtyAttributes,
             oldValue: oldValue,
@@ -13,19 +14,19 @@ export function Attribute(config: any = {}) {
         Reflect.defineMetadata('Attribute', annotations, target);
     };
 
-    let _val = target[propertyName];
-    saveAnnotations(false, undefined, _val);
-
     let getter = function () {
-        return _val;
+        return this['_' + propertyName];
     };
 
     let setter = function (newVal: any) {
-        saveAnnotations(true, _val, newVal);
-        _val = newVal;
+        if (newVal !== this['_' + propertyName]) {
+            saveAnnotations(true, this['_' + propertyName], newVal);
+            this['_' + propertyName] = newVal;
+        }
     };
 
     if (delete target[propertyName]) {
+        saveAnnotations(false, undefined, target[propertyName]);
         Object.defineProperty(target, propertyName, {
             get: getter,
             set: setter,

diff --git a/src/models/json-api.model.ts b/src/models/json-api.model.ts
@@ -28,6 +28,21 @@ export class JsonApiModel {
         return this._datastore.saveRecord(attributesMetadata, this, params, headers);
     }
 
+    hasDirtyAttributes() {
+        let attributesMetadata = Reflect.getMetadata('Attribute', this);
+        let hasDirtyAttributes = false;
+        for (let propertyName in attributesMetadata) {
+            if (attributesMetadata.hasOwnProperty(propertyName)) {
+                let metadata: any = attributesMetadata[propertyName];
+                if (metadata.hasDirtyAttributes) {
+                    hasDirtyAttributes = true;
+                    break;
+                }
+            }
+        }
+        return hasDirtyAttributes;
+    }
+
     private parseHasMany(data: any, included: any, level: number) {
         let hasMany = Reflect.getMetadata('HasMany', this);
         if (hasMany) {

diff --git a/src/services/json-api-datastore.service.ts b/src/services/json-api-datastore.service.ts
@@ -67,7 +67,7 @@ export class JsonApiDatastore {
             httpCall = this.http.post(url, body, options);
         }
         return httpCall
-            .map((res: any) => this.extractRecordData(res, modelType))
+            .map((res: any) => this.extractRecordData(res, modelType, data))
             .map((res: any) => this.resetMetadataAttributes(res, attributesMetadata, modelType))
             .catch((res: any) => this.handleError(res));
     }
@@ -127,9 +127,9 @@ export class JsonApiDatastore {
         return models;
     }
 
-    private extractRecordData(res: any, modelType: ModelType): JsonApiModel {
+    private extractRecordData(res: any, modelType: ModelType, data?: any): JsonApiModel {
         let body = res.json();
-        let model: JsonApiModel = new modelType(this, body.data);
+        let model: JsonApiModel = data || new modelType(this, body.data);
         if (body.included) {
             model.syncRelationships(body.data, body.included, 0);
         }
@@ -201,6 +201,7 @@ export class JsonApiDatastore {
     }
 
     private resetMetadataAttributes(res: any, attributesMetadata: any, modelType: ModelType) {
+        attributesMetadata = Reflect.getMetadata('Attribute', res);
         for (let propertyName in attributesMetadata) {
             if (attributesMetadata.hasOwnProperty(propertyName)) {
                 let metadata: any = attributesMetadata[propertyName];
@@ -209,7 +210,7 @@ export class JsonApiDatastore {
                 }
             }
         }
-        Reflect.defineMetadata('Attribute', attributesMetadata, modelType);
+        Reflect.defineMetadata('Attribute', attributesMetadata, res);
         return res;
     }