rate-core 0.5.1 → 0.5.2

package/lib/index.js

@@ -53,8 +53,8 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./rate"));
-var BaseRateService = (function () {
-  function BaseRateService(find, repository, infoRepository, commentRepository, reactionRepository, queryURL) {
+var ReactionService = (function () {
+  function ReactionService(find, repository, infoRepository, commentRepository, reactionRepository, queryURL) {
     this.find = find;
     this.repository = repository;
     this.infoRepository = infoRepository;
@@ -72,7 +72,7 @@ var BaseRateService = (function () {
     this.getComments = this.getComments.bind(this);
     this.getComment = this.getComment.bind(this);
   }
-  BaseRateService.prototype.search = function (s, limit, offset, fields) {
+  ReactionService.prototype.search = function (s, limit, offset, fields) {
     var _this = this;
     return this.find(s, limit, offset, fields).then(function (res) {
       if (!_this.queryURL) {
@@ -102,19 +102,19 @@ var BaseRateService = (function () {
       }
     });
   };
-  BaseRateService.prototype.load = function (id, author) {
+  ReactionService.prototype.load = function (id, author) {
     return this.repository.load(id, author);
   };
-  BaseRateService.prototype.getRate = function (id, author) {
+  ReactionService.prototype.getRate = function (id, author) {
     return this.repository.load(id, author);
   };
-  BaseRateService.prototype.setUseful = function (id, author, userId) {
+  ReactionService.prototype.setUseful = function (id, author, userId) {
     return this.reactionRepository.save(id, author, userId, 1);
   };
-  BaseRateService.prototype.removeUseful = function (id, author, userId) {
+  ReactionService.prototype.removeUseful = function (id, author, userId) {
     return this.reactionRepository.remove(id, author, userId);
   };
-  BaseRateService.prototype.comment = function (comment) {
+  ReactionService.prototype.comment = function (comment) {
     var _this = this;
     return this.repository.load(comment.id, comment.author).then(function (checkRate) {
       if (!checkRate) {
@@ -126,7 +126,7 @@ var BaseRateService = (function () {
       }
     });
   };
-  BaseRateService.prototype.removeComment = function (commentId, userId) {
+  ReactionService.prototype.removeComment = function (commentId, userId) {
     var _this = this;
     return this.commentRepository.load(commentId).then(function (comment) {
       if (comment) {
@@ -142,7 +142,7 @@ var BaseRateService = (function () {
       }
     });
   };
-  BaseRateService.prototype.updateComment = function (comment) {
+  ReactionService.prototype.updateComment = function (comment) {
     var _this = this;
     return this.commentRepository.load(comment.commentId).then(function (exist) {
       if (!exist) {
@@ -166,7 +166,7 @@ var BaseRateService = (function () {
       }
     });
   };
-  BaseRateService.prototype.getComments = function (id, author, limit) {
+  ReactionService.prototype.getComments = function (id, author, limit) {
     var _this = this;
     return this.commentRepository.getComments(id, author, limit).then(function (comments) {
       if (_this.queryURL) {
@@ -191,7 +191,7 @@ var BaseRateService = (function () {
       }
     });
   };
-  BaseRateService.prototype.getComment = function (id) {
+  ReactionService.prototype.getComment = function (id) {
     var _this = this;
     return this.commentRepository.load(id).then(function (comment) {
       if (comment && _this.queryURL) {
@@ -208,9 +208,9 @@ var BaseRateService = (function () {
       }
     });
   };
-  return BaseRateService;
+  return ReactionService;
 }());
-exports.BaseRateService = BaseRateService;
+exports.ReactionService = ReactionService;
 var RateService = (function (_super) {
   __extends(RateService, _super);
   function RateService(find, repository, infoRepository, commentRepository, reactionRepository, queryURL) {
@@ -225,7 +225,7 @@ var RateService = (function (_super) {
         switch (_a.label) {
           case 0:
             rate.time = new Date();
-            return [4, this.infoRepository.load(rate.id)];
+            return [4, this.infoRepository.exist(rate.id)];
           case 1:
             info = _a.sent();
             if (!!info) return [3, 3];
@@ -260,7 +260,7 @@ var RateService = (function (_super) {
     });
   };
   return RateService;
-}(BaseRateService));
+}(ReactionService));
 exports.RateService = RateService;
 function avg(n) {
   var sum = 0;
@@ -283,7 +283,7 @@ var RatesService = (function (_super) {
       var info, r0, exist, r1, sr, history, res;
       return __generator(this, function (_a) {
         switch (_a.label) {
-          case 0: return [4, this.infoRepository.load(rate.id)];
+          case 0: return [4, this.infoRepository.exist(rate.id)];
           case 1:
             info = _a.sent();
             if (rate.rates && rate.rates.length > 0) {
@@ -322,92 +322,8 @@ var RatesService = (function (_super) {
     });
   };
   return RatesService;
-}(BaseRateService));
+}(ReactionService));
 exports.RatesService = RatesService;
-var CommentQuery = (function () {
-  function CommentQuery(find, repository, queryURL) {
-    this.find = find;
-    this.repository = repository;
-    this.queryURL = queryURL;
-    this.load = this.load.bind(this);
-    this.search = this.search.bind(this);
-    this.getComments = this.getComments.bind(this);
-  }
-  CommentQuery.prototype.load = function (id, ctx) {
-    var _this = this;
-    return this.repository.load(id, ctx).then(function (comment) {
-      if (comment && _this.queryURL) {
-        return _this.queryURL([id]).then(function (urls) {
-          var i = binarySearch(urls, comment.userId);
-          if (i >= 0) {
-            comment.userURL = urls[i].url;
-          }
-          return comment;
-        });
-      }
-      else {
-        return comment;
-      }
-    });
-  };
-  CommentQuery.prototype.getComments = function (id, author, limit) {
-    var _this = this;
-    return this.repository.getComments(id, author, limit).then(function (comments) {
-      if (_this.queryURL) {
-        var ids = [];
-        for (var _i = 0, comments_3 = comments; _i < comments_3.length; _i++) {
-          var comment = comments_3[_i];
-          ids.push(comment.userId);
-        }
-        return _this.queryURL(ids).then(function (urls) {
-          for (var _i = 0, comments_4 = comments; _i < comments_4.length; _i++) {
-            var comment = comments_4[_i];
-            var i = binarySearch(urls, comment.userId);
-            if (i >= 0) {
-              comment.userURL = urls[i].url;
-            }
-          }
-          return comments;
-        });
-      }
-      else {
-        return comments;
-      }
-    });
-  };
-  CommentQuery.prototype.search = function (s, limit, offset, fields) {
-    var _this = this;
-    return this.find(s, limit, offset, fields).then(function (res) {
-      if (!_this.queryURL) {
-        return res;
-      }
-      else {
-        if (res.list && res.list.length > 0) {
-          var ids = [];
-          for (var _i = 0, _a = res.list; _i < _a.length; _i++) {
-            var rate = _a[_i];
-            ids.push(rate.userId);
-          }
-          return _this.queryURL(ids).then(function (urls) {
-            for (var _i = 0, _a = res.list; _i < _a.length; _i++) {
-              var rate = _a[_i];
-              var i = binarySearch(urls, rate.userId);
-              if (i >= 0) {
-                rate.userURL = urls[i].url;
-              }
-            }
-            return res;
-          });
-        }
-        else {
-          return res;
-        }
-      }
-    });
-  };
-  return CommentQuery;
-}());
-exports.CommentQuery = CommentQuery;
 function binarySearch(ar, el) {
   var m = 0;
   var n = ar.length - 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rate-core",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "rate",
   "main": "./lib/index.js",
   "types": "./src/index.ts",
@@ -17,9 +17,11 @@
   },
   "repository": {
     "type": "git",
-    "url": "git@github.com/core-ts/rate"
+    "url": "git@github.com/core-ts/reaction"
   },
   "keywords": [
+    "reaction",
+    "reaction core",
     "rate",
     "rate core"
   ]

package/src/core.ts

@@ -78,7 +78,7 @@ export interface ViewRepository<T, ID> {
   keys?(): string[];
   all?(ctx?: any): Promise<T[]>;
   load(id: ID, ctx?: any): Promise<T|null>;
-  exist?(id: ID, ctx?: any): Promise<boolean>;
+  exist(id: ID, ctx?: any): Promise<boolean>;
 }
 export interface Repository<T, ID> extends ViewRepository<T, ID> {
   insert(obj: T, ctx?: any): Promise<number>;

package/src/index.ts

@@ -1,6 +1,6 @@
 import { Attributes, Search, SearchResult } from './core';
 import {
-  BaseRate, Comment, CommentFilter, InfoRepository, Rate, RateCommentQuery, RateCommentRepository, RateFilter, Rater, RateReactionRepository, RateRepository,
+  BaseRate, BaseRepository, Comment, InfoRepository, Rate, RateCommentRepository, RateFilter, Rater, RateReactionRepository,
   Rates, RatesFilter, ShortComment, ShortRate, ShortRates
 } from './rate';
 
@@ -10,9 +10,9 @@ export interface URL {
   id: string;
   url: string;
 }
-export class BaseRateService<R extends BaseRate, F, O> {
+export class ReactionService<R extends BaseRate, F, O> {
   constructor(protected find: Search<R, F>,
-    public repository: RateRepository<R>,
+    public repository: BaseRepository<R>,
     protected infoRepository: InfoRepository<O>,
     protected commentRepository: RateCommentRepository,
     protected reactionRepository: RateReactionRepository,
@@ -151,9 +151,9 @@ export interface CommentRepository {
   getComments(id: string, author: string, limit?: number): Promise<Comment[]>;
 }
 // tslint:disable-next-line:max-classes-per-file
-export class RateService<O> extends BaseRateService<Rate, RateFilter, O> implements Rater<Rate, RateFilter> {
+export class RateService<O> extends ReactionService<Rate, RateFilter, O> implements Rater<Rate, RateFilter> {
   constructor(find: Search<Rate, RateFilter>,
-    repository: RateRepository<Rate>,
+    repository: BaseRepository<Rate>,
     infoRepository: InfoRepository<O>,
     commentRepository: RateCommentRepository,
     reactionRepository: RateReactionRepository,
@@ -163,7 +163,7 @@ export class RateService<O> extends BaseRateService<Rate, RateFilter, O> impleme
   }
   async rate(rate: Rate): Promise<number> {
     rate.time = new Date();
-    const info = await this.infoRepository.load(rate.id);
+    const info = await this.infoRepository.exist(rate.id);
     if (!info) {
       const r0 = await this.repository.insert(rate, true);
       return r0;
@@ -193,9 +193,9 @@ export function avg(n: number[]): number {
   return sum / n.length;
 }
 // tslint:disable-next-line:max-classes-per-file
-export class RatesService<O> extends BaseRateService<Rates, RatesFilter, O> implements Rater<Rates, RatesFilter> {
+export class RatesService<O> extends ReactionService<Rates, RatesFilter, O> implements Rater<Rates, RatesFilter> {
   constructor(find: Search<Rates, RatesFilter>,
-    repository: RateRepository<Rates>,
+    repository: BaseRepository<Rates>,
     infoRepository: InfoRepository<O>,
     commentRepository: RateCommentRepository,
     reactionRepository: RateReactionRepository,
@@ -204,7 +204,7 @@ export class RatesService<O> extends BaseRateService<Rates, RatesFilter, O> impl
     this.rate = this.rate.bind(this);
   }
   async rate(rate: Rates): Promise<number> {
-    const info = await this.infoRepository.load(rate.id);
+    const info = await this.infoRepository.exist(rate.id);
     if (rate.rates && rate.rates.length > 0) {
       rate.rate = avg(rate.rates);
     }
@@ -230,75 +230,6 @@ export class RatesService<O> extends BaseRateService<Rates, RatesFilter, O> impl
     return res;
   }
 }
-// tslint:disable-next-line:max-classes-per-file
-export class CommentQuery implements RateCommentQuery {
-  constructor(protected find: Search<Comment, CommentFilter>, protected repository: CommentRepository, private queryURL?: (ids: string[]) => Promise<URL[]>) {
-    this.load = this.load.bind(this);
-    this.search = this.search.bind(this);
-    this.getComments = this.getComments.bind(this);
-  }
-  load(id: string, ctx?: any): Promise<Comment | null> {
-    return this.repository.load(id, ctx).then(comment => {
-      if (comment && this.queryURL) {
-        return this.queryURL([id]).then(urls => {
-          const i = binarySearch(urls, comment.userId);
-          if (i >= 0) {
-            comment.userURL = urls[i].url;
-          }
-          return comment;
-        });
-      } else {
-        return comment;
-      }
-    });
-  }
-  getComments(id: string, author: string, limit?: number): Promise<Comment[]> {
-    return this.repository.getComments(id, author, limit).then(comments => {
-      if (this.queryURL) {
-        const ids: string[] = [];
-        for (const comment of comments) {
-          ids.push(comment.userId);
-        }
-        return this.queryURL(ids).then(urls => {
-          for (const comment of comments) {
-            const i = binarySearch(urls, comment.userId);
-            if (i >= 0) {
-              comment.userURL = urls[i].url;
-            }
-          }
-          return comments;
-        });
-      } else {
-        return comments;
-      }
-    });
-  }
-  search(s: CommentFilter, limit?: number, offset?: number | string, fields?: string[]): Promise<SearchResult<Comment>> {
-    return this.find(s, limit, offset, fields).then(res => {
-      if (!this.queryURL) {
-        return res;
-      } else {
-        if (res.list && res.list.length > 0) {
-          const ids: string[] = [];
-          for (const rate of res.list) {
-            ids.push(rate.userId);
-          }
-          return this.queryURL(ids).then(urls => {
-            for (const rate of res.list) {
-              const i = binarySearch(urls, rate.userId);
-              if (i >= 0) {
-                rate.userURL = urls[i].url;
-              }
-            }
-            return res;
-          });
-        } else {
-          return res;
-        }
-      }
-    });
-  }
-}
 function binarySearch(ar: URL[], el: string): number {
   let m = 0;
   let n = ar.length - 1;

package/src/rate.ts

@@ -64,7 +64,7 @@ export interface RatesFilter extends RateFilter {
   rate9: number;
   rate10: number;
 }
-export interface RateRepository<R> {
+export interface BaseRepository<R> {
   // save(obj: Rate, info?: T, ctx?: any): Promise<number>;
   insert(rate: R, newInfo?: boolean): Promise<number>;
   update(rate: R, oldRate: number): Promise<number>;