No more new resources when new data is received, just same resource updated.

Author: pablorsk

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-angular-jsonapi",
-  "version": "0.3.12",
+  "version": "0.3.33",
   "description": "JSONAPI library developed for AngularJS in Typescript",
   "repository": {
     "type": "git",

src/library/resource.ts

@@ -163,6 +163,11 @@ export class Resource implements IResource {
         return this.__exec(null, params, fc_success, fc_error, 'all');
     }
 
+    // just for debuggin purposes
+    public getCachedResources() {
+        return this.getService().memorycache.resources;
+    }
+
     public save<T extends IResource>(params?: Object | Function, fc_success?: Function, fc_error?: Function): Array<T> {
         return this.__exec(null, params, fc_success, fc_error, 'save');
     }
@@ -406,10 +411,32 @@ export class Resource implements IResource {
                     this.getService().memorycache.clearAllCollections();
                 }
 
-                this.id = success.data.data.id;
-
-                Converter.build(success.data, this, this.schema);
-                this.getService().memorycache.setResource(this);
+                // is a resource?
+                if ('id' in success.data.data) {
+                    this.id = success.data.data.id;
+                    Converter.build(success.data, this, this.schema);
+                    /*
+                    Si lo guardo en la caché, luego no queda bindeado con la vista
+                    Usar {{ $ctrl.service.getCachedResources() | json }}, agregar uno nuevo, editar
+                    */
+                    // this.getService().memorycache.setResource(this);
+                } else if (angular.isArray(success.data.data)) {
+                    console.warn('Server return a collection when we save()', success.data.data);
+
+                    /*
+                    we request the service again, because server maybe are giving
+                    us another type of resource (getService(resource.type))
+                    */
+                    let tempororay_collection = this.getService().memorycache.getCollection('justAnUpdate');
+                    Converter.build(success.data, tempororay_collection, this.schema);
+                    angular.forEach(tempororay_collection, (resource_value: IResource, key: string) => {
+                        let res = Converter.getService(resource_value.type).memorycache.resources[resource_value.id];
+                        Converter.getService(resource_value.type).memorycache.setResource(resource_value);
+                        res.id = res.id + 'x';
+                    });
+
+                    console.warn('Temporal collection for a resource_value update', tempororay_collection);
+                }
 
                 this.runFc(fc_success, success);
             },
@@ -434,18 +461,14 @@ export class Resource implements IResource {
             this.relationships[type_alias] = { data: { } };
         }
 
-        if (this.schema.relationships[type_alias].hasMany) {
+        if (type_alias in this.schema.relationships && this.schema.relationships[type_alias].hasMany) {
             this.relationships[type_alias]['data'][object_key] = resource;
         } else {
             this.relationships[type_alias]['data'] = resource;
         }
     }
 
     public addRelationships(resources: ICollection, type_alias: string) {
-        if (!this.schema.relationships[type_alias].hasMany) {
-            console.warn('addRelationships not supported on ' + this.type + ' schema.');
-        }
-
         if (!(type_alias in this.relationships)) {
             this.relationships[type_alias] = { data: { } };
         } else {

src/library/services/memorycache.ts

@@ -1,6 +1,7 @@
 import { ICollection, IResource } from '../interfaces';
 import { ICache } from '../interfaces/cache.d';
 import { Base } from './base';
+import { ResourceFunctions } from './resource-functions';
 
 export class MemoryCache implements ICache {
     private collections = {};
@@ -39,13 +40,19 @@ export class MemoryCache implements ICache {
     }
 
     public setResource(resource: IResource): void  {
-        this.resources[resource.id] = resource;
+        /*
+            we cannot redefine object, because view don't update.
+        */
+        if (resource.id in this.resources) {
+            ResourceFunctions.resourceToResource(resource, this.resources[resource.id]);
+        } else {
+            this.resources[resource.id] = resource;
+        }
         this.resources[resource.id].lastupdate = Date.now();
     }
 
     public clearAllCollections(): boolean {
         this.collections = {};
-        this.resources = {};
         this.collections_lastupdate = {};
         return true;
     }

src/library/services/resource-converter.ts

@@ -118,15 +118,27 @@ export class Converter {
             resource_dest.page.total_resources = document_from['meta']['total_resources'] ? document_from['meta']['total_resources'] : null;
         }
 
-        let resource: IDataResource;
-        for (resource of document_from.data) {
-            let service = Converter.getService(resource.type);
-            if (!(resource.id in resource_dest)) {
-                resource_dest[resource.id] = new (<any>service.constructor)();
-                resource_dest[resource.id].reset();
+        // convert and add new dataresoures to final collection
+        let dataresource: IDataResource;
+        let new_ids = {};
+        for (dataresource of document_from.data) {
+            let service = Converter.getService(dataresource.type);
+            if (!(dataresource.id in resource_dest)) {
+                resource_dest[dataresource.id] = new (<any>service.constructor)();
+                resource_dest[dataresource.id].reset();
             }
-            Converter._buildResource(resource, resource_dest[resource.id], schema, included_resources);
+            Converter._buildResource(dataresource, resource_dest[dataresource.id], schema, included_resources);
+            new_ids[dataresource.id] = dataresource.id;
         }
+
+        /*
+        remove old members of collection (bug, for example, when request something like orders/10/details and has new ids)
+        */
+        angular.forEach(resource_dest, resource => {
+            if (!(resource.id in new_ids)) {
+                delete resource_dest[resource.id];
+            }
+        });
     }
 
     static _buildResource(

src/library/services/resource-functions.ts

@@ -0,0 +1,32 @@
+import { IResource } from '../interfaces';
+
+export class ResourceFunctions {
+    static resourceToResource(source: IResource, destination: IResource): void {
+        destination.attributes = source.attributes;
+
+        // remove relationships on destination resource
+        for (let type_alias in destination.relationships) {
+            if (!(type_alias in source.relationships)) {
+                delete destination.relationships[type_alias];
+            } else {
+                // this resource is a collection?
+                if (!('id' in destination.relationships[type_alias].data)) {
+                    for (let id in destination.relationships[type_alias].data) {
+                        if (!(id in source.relationships[type_alias].data)) {
+                            delete destination.relationships[type_alias];
+                        }
+                    }
+                }
+            }
+        }
+
+        // add source relationships to destination
+        for (let type_alias in source.relationships) {
+            if ('id' in source.relationships[type_alias].data) {
+                destination.addRelationship(source.relationships[type_alias].data, source.relationships[type_alias].data.type);
+            } else {
+                destination.addRelationships(source.relationships[type_alias].data, type_alias);
+            }
+        }
+    }
+}