problems solved with memorycache. parseFromServer() parseToServer() added

Author: pablorsk

CHANGELOG.md

@@ -1,4 +1,4 @@
-# 0.7.x
+# 0.7.x (planned)
 
 - Interfaces are in `ng.jsonapi` now
 - Resources can be extended for personalized classes
@@ -9,6 +9,7 @@
 
 - Save on localstore all data. When you request a resource or collection, first check memory. If its empty, read from store. If is empty, get the data from back-end.
 - HttpStorage deprecated: jsons were saved as sent by the server, now we save json with logic (saving ids and resources separately).
+- Service with `toServer()` and `fromServer()` functions. They execute before and after http request. Ideal for type conversions.
 
 ## No more declaration file .d.ts
 

package.json

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

src/demo/authors/authors.service.ts

@@ -22,4 +22,14 @@ export class AuthorsService extends Jsonapi.Service {
         },
         ttl: 10
     };
+
+    // executed before get data from server
+    public parseFromServer(attributes): void {
+        attributes.name = attributes.name + ' ♥';
+    }
+
+    // executed before send to server
+    public parseToServer(attributes): void {
+        attributes.name = attributes.name.replace('♥', '').trim();
+    }
 }

src/library/interfaces/cachememory.d.ts

@@ -4,15 +4,13 @@ import { ICache } from '../interfaces/cache.d';
 export interface ICacheMemory extends ICache {
     resources: { [id: string]: IResource };
 
-    getResource(id: string): IResource;
     getOrCreateCollection(url: string): ICollection;
     isCollectionExist(url: string): boolean;
     isCollectionLive(url: string, ttl: number): boolean;
     clearAllCollections(): boolean;
 
     isResourceLive(id: string, ttl: number): boolean;
     getOrCreateResource(type: string, id: string): IResource;
-    getResource(id: string): IResource;
 
     removeResource(id: string): void;
 }

src/library/interfaces/service.d.ts

@@ -1,4 +1,4 @@
-import { ISchema, IResource, ICollection, ICacheMemory, ICacheStore, IParamsCollection, IParamsResource } from './index';
+import { ISchema, IResource, ICollection, ICacheMemory, IAttributes, ICacheStore, IParamsCollection, IParamsResource } from './index';
 
 export interface IService {
     type: string;
@@ -14,4 +14,6 @@ export interface IService {
     new?<T extends IResource>(): T;
     cachememory: ICacheMemory;
     cachestore: ICacheStore;
+    parseFromServer(attributes: IAttributes): void;
+    parseToServer(attributes: IAttributes): void;
 }

src/library/resource.ts

@@ -84,11 +84,14 @@ export class Resource extends ParentResourceService implements IResource {
             }
         });
 
+        let attributes = angular.copy(this.attributes);
+        this.getService().parseToServer(attributes);
+
         let ret: IDataObject = {
             data: {
                 type: this.type,
                 id: this.id,
-                attributes: this.attributes,
+                attributes: attributes,
                 relationships: relationships
             }
         };

src/library/service.ts

@@ -11,7 +11,7 @@ import { CacheMemory } from './services/cachememory';
 import { CacheStore } from './services/cachestore';
 
 import { IService, ISchema, IResource, ICollection, IExecParams, ICacheStore, ICacheMemory,
-    IParamsCollection, IParamsResource } from './interfaces';
+    IParamsCollection, IParamsResource, IAttributes } from './interfaces';
 
 export class Service extends ParentResourceService implements IService {
     public schema: ISchema;
@@ -37,8 +37,13 @@ export class Service extends ParentResourceService implements IService {
         return Core.me._register(this);
     }
 
-    public new<T extends IResource>(): T {
+    public newResource(): IResource {
         let resource: IResource = new Resource();
+        return resource;
+    }
+
+    public new<T extends IResource>(): T {
+        let resource = this.newResource();
         resource.type = this.type;
         resource.reset();
         return <T>resource;
@@ -145,7 +150,10 @@ export class Service extends ParentResourceService implements IService {
         let path = new PathBuilder();
         let paramsurl = new UrlParamsBuilder();
         path.applyParams(this, params);
-        params.remotefilter ? path.addParam(paramsurl.toparams( { filter: params.remotefilter } )) : null;
+        if (params.remotefilter && Object.keys(params.remotefilter).length > 0) {
+            this.getService().parseToServer(params.remotefilter);
+            path.addParam(paramsurl.toparams( { filter: params.remotefilter } ));
+        }
         if (params.page) {
             params.page.number > 1 ? path.addParam(
                 Core.injectedServices.rsJsonapiConfig.parameters.page.number + '=' + params.page.number) : null;
@@ -194,6 +202,7 @@ export class Service extends ParentResourceService implements IService {
             }
         } else {
             // STORE
+            tempororay_collection.$is_loading = true;
             this.getService().cachestore.getCollectionFromStorePromise(path.getForCache(), tempororay_collection)
             .then(
                 success => {
@@ -220,6 +229,7 @@ export class Service extends ParentResourceService implements IService {
 
     private getAllFromServer(path, params, fc_success, fc_error, tempororay_collection: ICollection, cached_collection: ICollection) {
         // SERVER REQUEST
+        tempororay_collection.$is_loading = true;
         Core.injectedServices.JsonapiHttp
         .get(path.get())
         .then(
@@ -286,4 +296,12 @@ export class Service extends ParentResourceService implements IService {
     public clearCacheMemory(): boolean {
         return this.getService().cachememory.clearAllCollections();
     }
+
+    public parseFromServer(attributes: IAttributes): void {
+
+    }
+
+    public parseToServer(attributes: IAttributes): void {
+
+    }
 }

src/library/services/cachememory.ts

@@ -43,27 +43,24 @@ export class CacheMemory implements ICacheMemory {
 
     public getOrCreateResource(type: string, id: string): IResource {
         if (Converter.getService(type).cachememory && id in Converter.getService(type).cachememory.resources) {
-            return Converter.getService(type).cachememory.getResource(id);
+            return Converter.getService(type).cachememory.resources[id];
         } else {
             let resource = Converter.getService(type).new();
             resource.id = id;
+            // needed for a lot of request (all and get, tested on multinexo.com)
+            this.setResource(resource, false);
             return resource;
         }
     }
 
-    /* @deprecated */
-    public getResource(id: string): IResource  {
-        return this.resources[id];
-    }
-
-    public setResource(resource: IResource): void  {
+    public setResource(resource: IResource, update_lastupdate = false): void  {
         // 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();
+        this.resources[resource.id].lastupdate = (update_lastupdate ? Date.now() : 0);
     }
 
     public clearAllCollections(): boolean {

src/library/services/converter.ts

@@ -76,15 +76,14 @@ export class Converter {
             resource = Converter.getService(data.type).cachememory.getOrCreateResource(data.type, data.id);
         }
 
-        resource.attributes = data.attributes ? data.attributes : {};
+        resource.attributes = data.attributes || {};
         resource.is_new = false;
         return resource;
     }
 
     public static build(
         document_from: IDataCollection & IDataObject,
-        resource_dest: IResource | ICollection,
-        build_relationships = true
+        resource_dest: IResource | ICollection
     ) {
         // instancio los include y los guardo en included arrary
         let included_resources: IResourcesByType = {};
@@ -95,15 +94,14 @@ export class Converter {
         if (angular.isArray(document_from.data)) {
             Converter._buildCollection(document_from, <ICollection>resource_dest, included_resources);
         } else {
-            build_relationships ? Converter._buildResource(document_from.data, <IResource>resource_dest, included_resources) : null;
+            Converter._buildResource(document_from.data, <IResource>resource_dest, included_resources);
         }
     }
 
     private static _buildCollection(
         collection_data_from: IDataCollection,
         collection_dest: ICollection,
-        included_resources: IResourcesByType,
-        build_relationships = true
+        included_resources: IResourcesByType
     ) {
         // sometime get Cannot set property 'number' of undefined (page)
         if (collection_dest.page && collection_data_from['meta']) {
@@ -119,7 +117,7 @@ export class Converter {
                 collection_dest[dataresource.id] =
                     Converter.getService(dataresource.type).cachememory.getOrCreateResource(dataresource.type, dataresource.id);
             }
-            build_relationships ? Converter._buildResource(dataresource, collection_dest[dataresource.id], included_resources) : null;
+            Converter._buildResource(dataresource, collection_dest[dataresource.id], included_resources);
             new_ids[dataresource.id] = dataresource.id;
         }
 
@@ -137,6 +135,9 @@ export class Converter {
         included_resources: IResourcesByType
     ) {
         resource_dest.attributes = resource_data_from.attributes;
+
+        Converter.getService(resource_data_from.type).parseFromServer(resource_dest.attributes);
+
         resource_dest.id = resource_data_from.id;
         resource_dest.is_new = false;
         let service = Converter.getService(resource_data_from.type);

src/library/sources/http.service.ts

@@ -16,15 +16,15 @@ export class Http {
 
     }
 
-    public delete(path: string) {
+    public delete(path: string): ng.IPromise<IDataObject> {
         return this.exec(path, 'DELETE');
     }
 
-    public get(path: string) {
+    public get(path: string): ng.IPromise<IDataObject> {
         return this.exec(path, 'get');
     }
 
-    protected exec(path: string, method: string, data?: IDataObject, call_loadings_error:boolean = true) {
+    protected exec(path: string, method: string, data?: IDataObject, call_loadings_error:boolean = true): ng.IPromise<IDataObject> {
 
         // http request (if we don't have any GET request yet)
         if (method !== 'get' || !this.noDuplicatedHttpCallsService.hasPromises(path)) {