onecore 0.1.6 → 0.2.0

package/lib/index.js

@@ -1,30 +1,17 @@
 "use strict";
-var __extends =
-  (this && this.__extends) ||
-  (function () {
-    var extendStatics = function (d, b) {
-      extendStatics =
-        Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array &&
-          function (d, b) {
-            d.__proto__ = b;
-          }) ||
-        function (d, b) {
-          for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-        };
-      return extendStatics(d, b);
-    };
-    return function (d, b) {
-      extendStatics(d, b);
-      function __() {
-        this.constructor = d;
-      }
-      d.prototype =
-        b === null
-          ? Object.create(b)
-          : ((__.prototype = b.prototype), new __());
-    };
-  })();
+var __extends = (this && this.__extends) || (function () {
+  var extendStatics = function (d, b) {
+    extendStatics = Object.setPrototypeOf ||
+      ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+      function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+    return extendStatics(d, b);
+  };
+  return function (d, b) {
+    extendStatics(d, b);
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 var ViewManager = (function () {
   function ViewManager(r) {
@@ -34,32 +21,32 @@ var ViewManager = (function () {
     this.load = this.load.bind(this);
   }
   ViewManager.prototype.metadata = function () {
-    return this.r.metadata ? this.r.metadata() : undefined;
+    return (this.r.metadata ? this.r.metadata() : undefined);
   };
   ViewManager.prototype.keys = function () {
-    return this.r.keys ? this.r.keys() : [];
+    return (this.r.keys ? this.r.keys() : []);
   };
   ViewManager.prototype.load = function (id, ctx) {
     return this.r.load(id, ctx);
   };
   return ViewManager;
-})();
+}());
 exports.ViewManager = ViewManager;
 var ViewUseCase = (function (_super) {
   __extends(ViewUseCase, _super);
   function ViewUseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return ViewUseCase;
-})(ViewManager);
+}(ViewManager));
 exports.ViewUseCase = ViewUseCase;
 var DefaultViewService = (function (_super) {
   __extends(DefaultViewService, _super);
   function DefaultViewService() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return DefaultViewService;
-})(ViewManager);
+}(ViewManager));
 exports.DefaultViewService = DefaultViewService;
 var ViewSearchManager = (function (_super) {
   __extends(ViewSearchManager, _super);
@@ -69,19 +56,19 @@ var ViewSearchManager = (function (_super) {
     _this.search = _this.search.bind(_this);
     return _this;
   }
-  ViewSearchManager.prototype.search = function (s, limit, offset, fields) {
-    return this.find(s, limit, offset, fields);
+  ViewSearchManager.prototype.search = function (s, limit, page, fields) {
+    return this.find(s, limit, page, fields);
   };
   return ViewSearchManager;
-})(ViewManager);
+}(ViewManager));
 exports.ViewSearchManager = ViewSearchManager;
 var ViewSearchUseCase = (function (_super) {
   __extends(ViewSearchUseCase, _super);
   function ViewSearchUseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return ViewSearchUseCase;
-})(ViewSearchManager);
+}(ViewSearchManager));
 exports.ViewSearchUseCase = ViewSearchUseCase;
 var SearchManager = (function (_super) {
   __extends(SearchManager, _super);
@@ -91,19 +78,19 @@ var SearchManager = (function (_super) {
     _this.search = _this.search.bind(_this);
     return _this;
   }
-  SearchManager.prototype.search = function (s, limit, offset, fields) {
-    return this.repository.search(s, limit, offset, fields);
+  SearchManager.prototype.search = function (s, limit, page, fields) {
+    return this.repository.search(s, limit, page, fields);
   };
   return SearchManager;
-})(ViewManager);
+}(ViewManager));
 exports.SearchManager = SearchManager;
 var SearchUseCase = (function (_super) {
   __extends(SearchUseCase, _super);
   function SearchUseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return SearchUseCase;
-})(SearchManager);
+}(SearchManager));
 exports.SearchUseCase = SearchUseCase;
 var GenericManager = (function (_super) {
   __extends(GenericManager, _super);
@@ -123,49 +110,45 @@ var GenericManager = (function (_super) {
     return this.repository.update(obj, ctx);
   };
   GenericManager.prototype.patch = function (obj, ctx) {
-    return this.repository.patch
-      ? this.repository.patch(obj, ctx)
-      : Promise.resolve(-1);
+    return (this.repository.patch ? this.repository.patch(obj, ctx) : Promise.resolve(-1));
   };
   GenericManager.prototype.delete = function (id, ctx) {
-    return this.repository.delete
-      ? this.repository.delete(id, ctx)
-      : Promise.resolve(-1);
+    return (this.repository.delete ? this.repository.delete(id, ctx) : Promise.resolve(-1));
   };
   return GenericManager;
-})(ViewManager);
+}(ViewManager));
 exports.GenericManager = GenericManager;
 var GenericUseCase = (function (_super) {
   __extends(GenericUseCase, _super);
   function GenericUseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return GenericUseCase;
-})(GenericManager);
+}(GenericManager));
 exports.GenericUseCase = GenericUseCase;
 var DefaultGenericService = (function (_super) {
   __extends(DefaultGenericService, _super);
   function DefaultGenericService() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return DefaultGenericService;
-})(GenericManager);
+}(GenericManager));
 exports.DefaultGenericService = DefaultGenericService;
 var DefaultService = (function (_super) {
   __extends(DefaultService, _super);
   function DefaultService() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return DefaultService;
-})(GenericManager);
+}(GenericManager));
 exports.DefaultService = DefaultService;
 var DefaultGenericSearchService = (function (_super) {
   __extends(DefaultGenericSearchService, _super);
   function DefaultGenericSearchService() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return DefaultGenericSearchService;
-})(GenericManager);
+}(GenericManager));
 exports.DefaultGenericSearchService = DefaultGenericSearchService;
 var Manager = (function (_super) {
   __extends(Manager, _super);
@@ -175,112 +158,77 @@ var Manager = (function (_super) {
     _this.search = _this.search.bind(_this);
     return _this;
   }
-  Manager.prototype.search = function (s, limit, offset, fields) {
-    return this.find(s, limit, offset, fields);
+  Manager.prototype.search = function (s, limit, page, fields) {
+    return this.find(s, limit, page, fields);
   };
   return Manager;
-})(GenericManager);
+}(GenericManager));
 exports.Manager = Manager;
 var UseCase = (function (_super) {
   __extends(UseCase, _super);
   function UseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return UseCase;
-})(Manager);
+}(Manager));
 exports.UseCase = UseCase;
 var GenericSearchManager = (function (_super) {
   __extends(GenericSearchManager, _super);
   function GenericSearchManager() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return GenericSearchManager;
-})(Manager);
+}(Manager));
 exports.GenericSearchManager = GenericSearchManager;
 var GenericSearchUseCase = (function (_super) {
   __extends(GenericSearchUseCase, _super);
   function GenericSearchUseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return GenericSearchUseCase;
-})(Manager);
+}(Manager));
 exports.GenericSearchUseCase = GenericSearchUseCase;
 var SavedService = (function () {
-  function SavedService(repository, query, max, autoRemove) {
-    this.repository = repository;
-    this.query = query;
+  function SavedService(savedRepository, max) {
+    this.savedRepository = savedRepository;
     this.max = max;
-    this.autoRemove = autoRemove;
-    this.load = this.load.bind(this);
+    this.isSaved = this.isSaved.bind(this);
     this.save = this.save.bind(this);
     this.remove = this.remove.bind(this);
   }
-  SavedService.prototype.load = function (id) {
-    var _this = this;
-    return this.repository.load(id).then(function (items) {
-      if (!items || items.length === 0) {
-        return [];
-      }
-      return _this.query(items);
-    });
+  SavedService.prototype.isSaved = function (userId, id) {
+    return this.savedRepository.isSaved(userId, id);
   };
-  SavedService.prototype.save = function (id, itemId) {
+  SavedService.prototype.save = function (userId, id) {
     var _this = this;
-    return this.repository.load(id).then(function (items) {
-      if (items == null) {
-        return _this.repository.create(id, [itemId]);
-      } else {
-        if (items.includes(itemId)) {
-          return Promise.resolve(0);
-        } else {
-          items.push(itemId);
-          if (items.length > _this.max) {
-            if (_this.autoRemove) {
-              items.shift();
-              return _this.repository.update(id, items);
-            } else {
-              return Promise.resolve(-1);
-            }
-          } else {
-            return _this.repository.update(id, items);
-          }
-        }
+    return this.savedRepository.count(userId).then(function (count) {
+      if (count >= _this.max) {
+        return -1;
       }
-    });
-  };
-  SavedService.prototype.remove = function (id, itemId) {
-    var _this = this;
-    return this.repository.load(id).then(function (items) {
-      if (items == null) {
-        return Promise.resolve(0);
-      } else {
-        if (items.includes(itemId)) {
-          items = items.filter(function (item) {
-            return item !== itemId;
-          });
-          return _this.repository.update(id, items);
-        } else {
-          return Promise.resolve(0);
-        }
+      else {
+        return _this.savedRepository.save(userId, id);
       }
     });
   };
+  SavedService.prototype.remove = function (userId, id) {
+    return this.savedRepository.remove(userId, id);
+  };
   return SavedService;
-})();
+}());
 exports.SavedService = SavedService;
 var SavedManager = (function (_super) {
   __extends(SavedManager, _super);
   function SavedManager() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return SavedManager;
-})(SavedService);
+}(SavedService));
 exports.SavedManager = SavedManager;
 var SavedUseCase = (function (_super) {
   __extends(SavedUseCase, _super);
   function SavedUseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+    return _super !== null && _super.apply(this, arguments) || this;
   }
   return SavedUseCase;
-})(SavedService);
+}(SavedService));
 exports.SavedUseCase = SavedUseCase;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "onecore",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "description": "onecore",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/index.ts

@@ -228,64 +228,34 @@ export class GenericSearchManager<T, ID, F extends Filter> extends Manager<T, ID
 // tslint:disable-next-line:max-classes-per-file
 export class GenericSearchUseCase<T, ID, F extends Filter> extends Manager<T, ID, F> {
 }
-export interface SavedRepository<ID> {
-  load(id: ID): Promise<string[]|null>;
-  create(id: ID, arr: string[]): Promise<number>;
-  update(id: ID, arr: string[]): Promise<number>;
+export interface SavedRepository<UID, ID> {
+  isSaved(userId: UID, id: ID): Promise<boolean>
+  save(userId: UID, id: ID): Promise<number>
+  remove(userId: UID, id: ID): Promise<number>
+  count(userId: UID): Promise<number>
 }
+
 // tslint:disable-next-line:max-classes-per-file
-export class SavedService<ID, T> {
-  constructor(protected repository: SavedRepository<ID>, protected query: (ids: string[]) => Promise<T[]>, public max: number, public autoRemove?: boolean) {
-    this.load = this.load.bind(this);
+export class SavedService<UID, ID> {
+  constructor(protected savedRepository: SavedRepository<UID, ID>, protected max: number) {
+    this.isSaved = this.isSaved.bind(this);
     this.save = this.save.bind(this);
     this.remove = this.remove.bind(this);
   }
-  load(id: ID): Promise<T[]> {
-    return this.repository.load(id).then(items => {
-      if (!items || items.length === 0) {
-        return [];
-      }
-      return this.query(items);
-    });
+  isSaved(userId: UID, id: ID): Promise<boolean> {
+    return this.savedRepository.isSaved(userId, id)
   }
-  save(id: ID, itemId: string): Promise<number> {
-    return this.repository.load(id).then(items => {
-      if (items == null) {
-        return this.repository.create(id, [itemId]);
+  save(userId: UID, id: ID): Promise<number> {
+    return this.savedRepository.count(userId).then((count) => {
+      if (count >= this.max) {
+        return -1
       } else {
-        if (items.includes(itemId)) {
-          return Promise.resolve(0);
-        } else {
-          items.push(itemId);
-          if (items.length > this.max) {
-            if (this.autoRemove) {
-              items.shift();
-              return this.repository.update(id, items);
-            } else {
-              return Promise.resolve(-1);
-            }
-          } else {
-            return this.repository.update(id, items);
-          }
-        }
+        return this.savedRepository.save(userId, id)
       }
-    });
+    })
   }
-  remove(id: ID, itemId: string): Promise<number> {
-    return this.repository.load(id).then(items => {
-      if (items == null) {
-        return Promise.resolve(0);
-      } else {
-        if (items.includes(itemId)) {
-          items = items.filter((item: any) => {
-            return item !== itemId;
-          });
-          return this.repository.update(id, items);
-        } else {
-          return Promise.resolve(0);
-        }
-      }
-    });
+  remove(userId: UID, id: ID): Promise<number> {
+    return this.savedRepository.remove(userId, id)
   }
 }
 // tslint:disable-next-line:max-classes-per-file

package/src/metadata.ts

@@ -35,10 +35,10 @@ export interface Attribute {
   nopatch?: boolean;
   version?: boolean;
   length?: number;
-  min?: number;
-  max?: number;
-  gt?: number;
-  lt?: number;
+  min?: number | Date | string;
+  max?: number | Date | string;
+  gt?: number | Date | string;
+  lt?: number | Date | string;
   precision?: number;
   scale?: number;
   exp?: RegExp | string;

package/src/repository/GenericRepository.ts

@@ -12,3 +12,9 @@ export interface Repository<T, ID> extends ViewRepository<T, ID> {
   patch(obj: Partial<T>, ctx?: any): Promise<number>;
   delete(id: ID, ctx?: any): Promise<number>;
 }
+export interface CRUDRepository<T, ID> extends ViewRepository<T, ID> {
+  create(obj: T, ctx?: any): Promise<number>;
+  update(obj: T, ctx?: any): Promise<number>;
+  patch(obj: Partial<T>, ctx?: any): Promise<number>;
+  delete(id: ID, ctx?: any): Promise<number>;
+}