onecore 0.1.7 → 0.3.0

package/lib/index.js

@@ -1,113 +1,82 @@
 "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) {
+var ViewUseCase = (function () {
+  function ViewUseCase(r) {
     this.r = r;
     this.metadata = this.metadata.bind(this);
     this.keys = this.keys.bind(this);
     this.load = this.load.bind(this);
   }
-  ViewManager.prototype.metadata = function () {
-    return this.r.metadata ? this.r.metadata() : undefined;
+  ViewUseCase.prototype.metadata = function () {
+    return (this.r.metadata ? this.r.metadata() : undefined);
   };
-  ViewManager.prototype.keys = function () {
-    return this.r.keys ? this.r.keys() : [];
+  ViewUseCase.prototype.keys = function () {
+    return (this.r.keys ? this.r.keys() : []);
   };
-  ViewManager.prototype.load = function (id, ctx) {
+  ViewUseCase.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 ViewUseCase;
-})(ViewManager);
+}());
 exports.ViewUseCase = ViewUseCase;
-var DefaultViewService = (function (_super) {
-  __extends(DefaultViewService, _super);
-  function DefaultViewService() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+var ViewManager = (function (_super) {
+  __extends(ViewManager, _super);
+  function ViewManager() {
+    return _super !== null && _super.apply(this, arguments) || this;
   }
-  return DefaultViewService;
-})(ViewManager);
-exports.DefaultViewService = DefaultViewService;
-var ViewSearchManager = (function (_super) {
-  __extends(ViewSearchManager, _super);
-  function ViewSearchManager(find, repo) {
-    var _this = _super.call(this, repo) || this;
-    _this.find = find;
-    _this.search = _this.search.bind(_this);
-    return _this;
+  return ViewManager;
+}(ViewUseCase));
+exports.ViewManager = ViewManager;
+var SearchUseCase = (function () {
+  function SearchUseCase(repo) {
+    this.repo = repo;
+    this.search = this.search.bind(this);
   }
-  ViewSearchManager.prototype.search = function (s, limit, offset, fields) {
-    return this.find(s, limit, offset, fields);
+  SearchUseCase.prototype.search = function (s, limit, page, fields) {
+    return this.repo.search(s, limit, page, fields);
   };
-  return ViewSearchManager;
-})(ViewManager);
-exports.ViewSearchManager = ViewSearchManager;
+  return SearchUseCase;
+}());
+exports.SearchUseCase = SearchUseCase;
+exports.SearchManager = SearchUseCase;
 var ViewSearchUseCase = (function (_super) {
   __extends(ViewSearchUseCase, _super);
-  function ViewSearchUseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
-  }
-  return ViewSearchUseCase;
-})(ViewSearchManager);
-exports.ViewSearchUseCase = ViewSearchUseCase;
-var SearchManager = (function (_super) {
-  __extends(SearchManager, _super);
-  function SearchManager(repository) {
-    var _this = _super.call(this, repository) || this;
-    _this.repository = repository;
+  function ViewSearchUseCase(repo) {
+    var _this = _super.call(this, repo) || this;
+    _this.repo = repo;
     _this.search = _this.search.bind(_this);
     return _this;
   }
-  SearchManager.prototype.search = function (s, limit, offset, fields) {
-    return this.repository.search(s, limit, offset, fields);
+  ViewSearchUseCase.prototype.search = function (s, limit, page, fields) {
+    return this.repo.search(s, limit, page, fields);
   };
-  return SearchManager;
-})(ViewManager);
-exports.SearchManager = SearchManager;
-var SearchUseCase = (function (_super) {
-  __extends(SearchUseCase, _super);
-  function SearchUseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
-  }
-  return SearchUseCase;
-})(SearchManager);
-exports.SearchUseCase = SearchUseCase;
-var GenericManager = (function (_super) {
-  __extends(GenericManager, _super);
-  function GenericManager(repository) {
+  return ViewSearchUseCase;
+}(ViewUseCase));
+exports.ViewSearchUseCase = ViewSearchUseCase;
+var ViewSearchManger = (function (_super) {
+  __extends(ViewSearchManger, _super);
+  function ViewSearchManger() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+  return ViewSearchManger;
+}(ViewSearchUseCase));
+exports.ViewSearchManger = ViewSearchManger;
+var GenericUseCase = (function (_super) {
+  __extends(GenericUseCase, _super);
+  function GenericUseCase(repository) {
     var _this = _super.call(this, repository) || this;
     _this.repository = repository;
     _this.create = _this.create.bind(_this);
@@ -116,171 +85,85 @@ var GenericManager = (function (_super) {
     _this.delete = _this.delete.bind(_this);
     return _this;
   }
-  GenericManager.prototype.create = function (obj, ctx) {
+  GenericUseCase.prototype.create = function (obj, ctx) {
     return this.repository.create(obj, ctx);
   };
-  GenericManager.prototype.update = function (obj, ctx) {
+  GenericUseCase.prototype.update = function (obj, ctx) {
     return this.repository.update(obj, ctx);
   };
-  GenericManager.prototype.patch = function (obj, ctx) {
-    return this.repository.patch
-      ? this.repository.patch(obj, ctx)
-      : Promise.resolve(-1);
+  GenericUseCase.prototype.patch = function (obj, ctx) {
+    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);
+  GenericUseCase.prototype.delete = function (id, ctx) {
+    return (this.repository.delete ? this.repository.delete(id, ctx) : Promise.resolve(-1));
   };
-  return GenericManager;
-})(ViewManager);
-exports.GenericManager = GenericManager;
-var GenericUseCase = (function (_super) {
-  __extends(GenericUseCase, _super);
-  function GenericUseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
-  }
   return GenericUseCase;
-})(GenericManager);
+}(ViewUseCase));
 exports.GenericUseCase = GenericUseCase;
-var DefaultGenericService = (function (_super) {
-  __extends(DefaultGenericService, _super);
-  function DefaultGenericService() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
-  }
-  return DefaultGenericService;
-})(GenericManager);
-exports.DefaultGenericService = DefaultGenericService;
-var DefaultService = (function (_super) {
-  __extends(DefaultService, _super);
-  function DefaultService() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
-  }
-  return DefaultService;
-})(GenericManager);
-exports.DefaultService = DefaultService;
-var DefaultGenericSearchService = (function (_super) {
-  __extends(DefaultGenericSearchService, _super);
-  function DefaultGenericSearchService() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
-  }
-  return DefaultGenericSearchService;
-})(GenericManager);
-exports.DefaultGenericSearchService = DefaultGenericSearchService;
-var Manager = (function (_super) {
-  __extends(Manager, _super);
-  function Manager(find, repo) {
+exports.GenericManager = GenericUseCase;
+var UseCase = (function (_super) {
+  __extends(UseCase, _super);
+  function UseCase(find, repo) {
     var _this = _super.call(this, repo) || this;
     _this.find = find;
     _this.search = _this.search.bind(_this);
     return _this;
   }
-  Manager.prototype.search = function (s, limit, offset, fields) {
-    return this.find(s, limit, offset, fields);
+  UseCase.prototype.search = function (s, limit, page, fields) {
+    return this.find(s, limit, page, fields);
   };
-  return Manager;
-})(GenericManager);
-exports.Manager = Manager;
-var UseCase = (function (_super) {
-  __extends(UseCase, _super);
-  function UseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
-  }
   return UseCase;
-})(Manager);
+}(GenericUseCase));
 exports.UseCase = UseCase;
-var GenericSearchManager = (function (_super) {
-  __extends(GenericSearchManager, _super);
-  function GenericSearchManager() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
-  }
-  return GenericSearchManager;
-})(Manager);
-exports.GenericSearchManager = GenericSearchManager;
-var GenericSearchUseCase = (function (_super) {
-  __extends(GenericSearchUseCase, _super);
-  function GenericSearchUseCase() {
-    return (_super !== null && _super.apply(this, arguments)) || this;
+var Manager = (function (_super) {
+  __extends(Manager, _super);
+  function Manager() {
+    return _super !== null && _super.apply(this, arguments) || this;
   }
-  return GenericSearchUseCase;
-})(Manager);
-exports.GenericSearchUseCase = GenericSearchUseCase;
+  return Manager;
+}(UseCase));
+exports.Manager = Manager;
 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.7",
+  "version": "0.3.0",
   "description": "onecore",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/index.ts

@@ -63,6 +63,8 @@ import { GenericSearchService } from './service/GenericSearchService';
 import { GenericService } from './service/GenericService';
 import { ViewSearchService } from './service/ViewSearchService';
 import { ViewService } from './service/ViewService';
+import { SearchRepository } from './repository/SearchRepository';
+import { ViewSearchRepository } from './repository/ViewSearchRepository';
 
 export type Search<T, F> = (s: F, limit: number, page?: number | string, fields?: string[]) => Promise<SearchResult<T>>;
 export type SearchFunc<T, F> = Search<T, F>;
@@ -126,7 +128,7 @@ export interface ExportService {
 export interface Exporter {
   export(ctx?: any): Promise<number>;
 }
-export class ViewManager<T, ID> implements ViewService<T, ID> {
+export class ViewUseCase<T, ID> implements ViewService<T, ID> {
   constructor(private r: ViewRepository<T, ID>) {
     this.metadata = this.metadata.bind(this);
     this.keys = this.keys.bind(this);
@@ -142,41 +144,36 @@ export class ViewManager<T, ID> implements ViewService<T, ID> {
     return this.r.load(id, ctx);
   }
 }
+
 // tslint:disable-next-line:max-classes-per-file
-export class ViewUseCase<T, ID> extends ViewManager<T, ID> {
-}
-// tslint:disable-next-line:max-classes-per-file
-export class DefaultViewService<T, ID> extends ViewManager<T, ID> {
+export class ViewManager<T, ID> extends ViewUseCase<T, ID> {
 }
 
 // tslint:disable-next-line:max-classes-per-file
-export class ViewSearchManager<T, ID, F extends Filter> extends ViewManager<T, ID> implements ViewSearchService<T, ID, F> {
-  constructor(public find: Search<T, F>, repo: ViewRepository<T, ID>) {
-    super(repo);
+export class SearchUseCase<T, F extends Filter> {
+  constructor(protected repo: SearchRepository<T, F>) {
     this.search = this.search.bind(this);
   }
   search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>> {
-    return this.find(s, limit, page, fields);
+    return this.repo.search(s, limit, page, fields);
   }
 }
+export const SearchManager = SearchUseCase
 // tslint:disable-next-line:max-classes-per-file
-export class ViewSearchUseCase<T, ID, F extends Filter> extends ViewSearchManager<T, ID, F> {
-}
-// tslint:disable-next-line:max-classes-per-file
-export class SearchManager<T, ID, F extends Filter> extends ViewManager<T, ID> implements ViewSearchService<T, ID, F> {
-  constructor(protected repository: ViewSearchService<T, ID, F>) {
-    super(repository);
+export class ViewSearchUseCase<T, ID, F extends Filter> extends ViewUseCase<T, ID> implements ViewSearchService<T, ID, F> {
+  constructor(protected repo: ViewSearchRepository<T, ID, Filter>) {
+    super(repo);
     this.search = this.search.bind(this);
   }
   search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>> {
-    return this.repository.search(s, limit, page, fields);
+    return this.repo.search(s, limit, page, fields);
   }
 }
 // tslint:disable-next-line:max-classes-per-file
-export class SearchUseCase<T, ID, F extends Filter> extends SearchManager<T, ID, F> {
+export class ViewSearchManger<T, ID, F extends Filter> extends ViewSearchUseCase<T, ID, F> {
 }
 // tslint:disable-next-line:max-classes-per-file
-export class GenericManager<T, ID> extends ViewManager<T, ID> implements GenericService<T, ID, number> {
+export class GenericUseCase<T, ID> extends ViewUseCase<T, ID> implements GenericService<T, ID, number> {
   constructor(protected repository: GenericRepository<T, ID>) {
     super(repository);
     this.create = this.create.bind(this);
@@ -197,20 +194,9 @@ export class GenericManager<T, ID> extends ViewManager<T, ID> implements Generic
     return (this.repository.delete ? this.repository.delete(id, ctx) : Promise.resolve(-1));
   }
 }
+export const GenericManager = GenericUseCase
 // tslint:disable-next-line:max-classes-per-file
-export class GenericUseCase<T, ID> extends GenericManager<T, ID> {
-}
-// tslint:disable-next-line:max-classes-per-file
-export class DefaultGenericService<T, ID> extends GenericManager<T, ID> {
-}
-// tslint:disable-next-line:max-classes-per-file
-export class DefaultService<T, ID> extends GenericManager<T, ID> {
-}
-// tslint:disable-next-line:max-classes-per-file
-export class DefaultGenericSearchService<T, ID> extends GenericManager<T, ID> {
-}
-// tslint:disable-next-line:max-classes-per-file
-export class Manager<T, ID, F extends Filter> extends GenericManager<T, ID> implements GenericSearchService<T, ID, number, F> {
+export class UseCase<T, ID, F extends Filter> extends GenericUseCase<T, ID> implements GenericSearchService<T, ID, number, F> {
   constructor(public find: Search<T, F>, repo: GenericRepository<T, ID>) {
     super(repo);
     this.search = this.search.bind(this);
@@ -220,72 +206,36 @@ export class Manager<T, ID, F extends Filter> extends GenericManager<T, ID> impl
   }
 }
 // tslint:disable-next-line:max-classes-per-file
-export class UseCase<T, ID, F extends Filter> extends Manager<T, ID, F> {
+export class Manager<T, ID, F extends Filter> extends UseCase<T, ID, F> {
 }
-// tslint:disable-next-line:max-classes-per-file
-export class GenericSearchManager<T, ID, F extends Filter> extends Manager<T, ID, F> {
-}
-// 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/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>;
+}