mode offline with relationships done!

Author: pablorsk

src/library/resource.ts

@@ -38,11 +38,10 @@ export class Resource extends ParentResourceService implements IResource {
 
     public toObject(params?: IParamsResource): IDataObject {
         params = angular.extend({}, Base.Params, params);
-        // this.getService().schema = angular.extend({}, Base.Schema, this.getService().schema);
 
-        let relationships = { };
-        let included = [ ];
-        let included_ids = [ ]; // just for control don't repeat any resource
+        let relationships = {};
+        let included = [];
+        let included_ids = []; // just for control don't repeat any resource
 
         // REALTIONSHIPS
         angular.forEach(this.relationships, (relationship: IRelationship, relation_alias) => {
@@ -128,7 +127,6 @@ export class Resource extends ParentResourceService implements IResource {
         this.id && path.appendPath(this.id);
 
         let resource = this.getService().cachememory.getOrCreateResource(this.type, this.id);
-        // Converter.getOrCreateResource(this.type, this.id);
 
         let promise = Core.injectedServices.JsonapiHttp.exec(
             path.get(), this.id ? 'PUT' : 'POST',

src/library/services/cachememory.ts

@@ -96,20 +96,15 @@ export class CacheMemory implements ICache {
     // -------- STORE ---------------------------------
 
     public getResourceFromStore(resource: IResource): Promise<any> {
-        let promise = this.fetchResourceFromStore(resource);
-        promise.then (success => {
+        let promise = Core.injectedServices.JsonapiCacheStore.getObjet(resource.type + '.' + resource.id);
+        promise.then(success => {
             if (success) {
                 Converter.build({ data: success }, resource);
-                console.log('recibí resource del cachestore, actualizo', resource);
             }
         });
         return promise;
     }
 
-    private fetchResourceFromStore(resource: IResource): Promise<any> {
-        return Core.injectedServices.JsonapiCacheStore.getObjet(resource.type + '.' + resource.id);
-    }
-
     private saveResourceStore(resource: IResource) {
         Core.injectedServices.JsonapiCacheStore.saveObject(
             resource.type + '.' + resource.id,
@@ -121,6 +116,7 @@ export class CacheMemory implements ICache {
         let promise = Core.injectedServices.JsonapiCacheStore.getObjet('collection.' + url);
         promise.then(success => {
             if (success) {
+                // build collection from store and resources from memory
                 let all_ok = true;
                 for (let key in success.data) {
                     let dataresource: IDataResource = success.data[key];
@@ -131,13 +127,12 @@ export class CacheMemory implements ICache {
                     }
                     collection[dataresource.id] = resource;
                 }
-
-                // collection full with resources
                 if (all_ok) {
                     collection.$source = 'cachestore';  // collection from cachestore, resources from memory
                     return;
                 }
 
+                // request resources from store
                 let temporalcollection = {};
                 let promises = [];
                 for (let key in success.data) {
@@ -148,7 +143,7 @@ export class CacheMemory implements ICache {
                     );
                 }
 
-                // we have all resources from store
+                // build collection and resources from store
                 Core.injectedServices.$q.all(promises).then(success => {
                     // just for precaution, we not rewrite server data
                     if (collection.$source !== 'new') {

src/library/services/converter.ts

@@ -83,7 +83,8 @@ export class Converter {
 
     public static build(
         document_from: IDataCollection & IDataObject,
-        resource_dest: IResource | ICollection
+        resource_dest: IResource | ICollection,
+        build_relationships = true
     ) {
         // instancio los include y los guardo en included arrary
         let included_resources: IResourcesByType = {};
@@ -94,14 +95,15 @@ export class Converter {
         if (angular.isArray(document_from.data)) {
             Converter._buildCollection(document_from, <ICollection>resource_dest, included_resources);
         } else {
-            Converter._buildResource(document_from.data, <IResource>resource_dest, included_resources);
+            build_relationships ? Converter._buildResource(document_from.data, <IResource>resource_dest, included_resources) : null;
         }
     }
 
     private static _buildCollection(
         collection_data_from: IDataCollection,
         collection_dest: ICollection,
-        included_resources: IResourcesByType
+        included_resources: IResourcesByType,
+        build_relationships = true
     ) {
         // sometime get Cannot set property 'number' of undefined (page)
         if (collection_dest.page && collection_data_from['meta']) {
@@ -117,7 +119,7 @@ export class Converter {
                 collection_dest[dataresource.id] =
                     Converter.getService(dataresource.type).cachememory.getOrCreateResource(dataresource.type, dataresource.id);
             }
-            Converter._buildResource(dataresource, collection_dest[dataresource.id], included_resources);
+            build_relationships ? Converter._buildResource(dataresource, collection_dest[dataresource.id], included_resources) : null;
             new_ids[dataresource.id] = dataresource.id;
         }
 
@@ -139,6 +141,11 @@ export class Converter {
         resource_dest.is_new = false;
         let schema = Converter.getService(resource_data_from.type).schema;
 
+        // esto previene la creación indefinida de resources
+        if (!resource_dest.relationships) {
+            return;
+        }
+
         let relationships_converter = new ResourceRelationshipsConverter(
             Converter.getService,
             resource_data_from.relationships,

src/library/services/resource-relationships-converter.ts

@@ -133,6 +133,10 @@ export class ResourceRelationshipsConverter {
             if (service && resource_data_from.id in service.cachememory.resources) {
                 return service.cachememory.resources[resource_data_from.id];
             } else {
+                // we dont have information on included or memory. try pass to store
+                if (service) {
+                    service.cachememory.getResourceFromStore(resource_data_from, false);
+                }
                 return resource_data_from;
             }
         }