rate-core 0.0.3 → 0.0.6

package/lib/index.js

@@ -41,18 +41,24 @@ function __export(m) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./rate"));
 var RateService = (function () {
-  function RateService(find, repository, infoRepository, rateCommentRepository, rateReactionRepository, queryURL) {
+  function RateService(find, repository, infoRepository, commentRepository, rateReactionRepository, queryURL) {
     this.find = find;
     this.repository = repository;
     this.infoRepository = infoRepository;
-    this.rateCommentRepository = rateCommentRepository;
+    this.commentRepository = commentRepository;
     this.rateReactionRepository = rateReactionRepository;
     this.queryURL = queryURL;
     this.rate = this.rate.bind(this);
+    this.search = this.search.bind(this);
+    this.load = this.load.bind(this);
+    this.getRate = this.getRate.bind(this);
+    this.setUseful = this.setUseful.bind(this);
+    this.removeUseful = this.removeUseful.bind(this);
     this.comment = this.comment.bind(this);
     this.removeComment = this.removeComment.bind(this);
     this.updateComment = this.updateComment.bind(this);
-    this.search = this.search.bind(this);
+    this.getComments = this.getComments.bind(this);
+    this.getComment = this.getComment.bind(this);
   }
   RateService.prototype.rate = function (rate) {
     return __awaiter(this, void 0, void 0, function () {
@@ -69,7 +75,7 @@ var RateService = (function () {
           case 2:
             r0 = _a.sent();
             return [2, r0];
-          case 3: return [4, this.repository.getRate(rate.id, rate.author)];
+          case 3: return [4, this.repository.load(rate.id, rate.author)];
           case 4:
             exist = _a.sent();
             if (!!exist) return [3, 6];
@@ -125,8 +131,11 @@ var RateService = (function () {
       }
     });
   };
+  RateService.prototype.load = function (id, author) {
+    return this.repository.load(id, author);
+  };
   RateService.prototype.getRate = function (id, author) {
-    return this.repository.getRate(id, author);
+    return this.repository.load(id, author);
   };
   RateService.prototype.setUseful = function (id, author, userId) {
     return this.rateReactionRepository.save(id, author, userId, 1);
@@ -136,22 +145,22 @@ var RateService = (function () {
   };
   RateService.prototype.comment = function (comment) {
     var _this = this;
-    return this.repository.getRate(comment.id, comment.author).then(function (checkRate) {
+    return this.repository.load(comment.id, comment.author).then(function (checkRate) {
       if (!checkRate) {
         return -1;
       }
       else {
         comment.time ? comment.time = comment.time : comment.time = new Date();
-        return _this.rateCommentRepository.insert(comment);
+        return _this.commentRepository.insert(comment);
       }
     });
   };
   RateService.prototype.removeComment = function (commentId, userId) {
     var _this = this;
-    return this.rateCommentRepository.load(commentId).then(function (comment) {
+    return this.commentRepository.load(commentId).then(function (comment) {
       if (comment) {
         if (userId === comment.author || userId === comment.userId) {
-          return _this.rateCommentRepository.remove(commentId, comment.id, comment.author);
+          return _this.commentRepository.remove(commentId, comment.id, comment.author);
         }
         else {
           return -2;
@@ -164,7 +173,7 @@ var RateService = (function () {
   };
   RateService.prototype.updateComment = function (comment) {
     var _this = this;
-    return this.rateCommentRepository.load(comment.commentId).then(function (exist) {
+    return this.commentRepository.load(comment.commentId).then(function (exist) {
       if (!exist) {
         return -1;
       }
@@ -181,11 +190,17 @@ var RateService = (function () {
           exist.histories = [c];
         }
         exist.comment = comment.comment;
-        var res = _this.rateCommentRepository.update(exist);
+        var res = _this.commentRepository.update(exist);
         return res;
       }
     });
   };
+  RateService.prototype.getComments = function (id, author, limit) {
+    return this.commentRepository.getComments(id, author, limit);
+  };
+  RateService.prototype.getComment = function (id) {
+    return this.commentRepository.load(id);
+  };
   return RateService;
 }());
 exports.RateService = RateService;
@@ -202,12 +217,7 @@ var CommentQuery = (function () {
     return this.repository.load(id, ctx);
   };
   CommentQuery.prototype.getComments = function (id, author, limit) {
-    if (this.repository.getComments) {
-      return this.repository.getComments(id, author, limit);
-    }
-    else {
-      return Promise.resolve([]);
-    }
+    return this.repository.getComments(id, author, limit);
   };
   CommentQuery.prototype.search = function (s, limit, offset, fields) {
     var _this = this;

package/lib/rate.js

@@ -116,45 +116,3 @@ exports.info10Model = {
     type: 'number',
   }
 };
-exports.commentModel = {
-  comment: {
-    length: 500
-  },
-  time: {
-    type: 'datetime'
-  }
-};
-exports.rateCommentModel = {
-  commentId: {
-    key: true
-  },
-  id: {
-    required: true,
-    noupdate: true,
-    match: 'equal'
-  },
-  author: {
-    required: true,
-    noupdate: true,
-    match: 'equal'
-  },
-  userId: {
-    required: true,
-    noupdate: true,
-    match: 'equal'
-  },
-  comment: {
-    length: 500
-  },
-  time: {
-    type: 'datetime',
-    noupdate: true,
-  },
-  updatedAt: {
-    type: 'datetime'
-  },
-  histories: {
-    type: 'array',
-    typeof: exports.commentModel
-  }
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rate-core",
-  "version": "0.0.3",
+  "version": "0.0.6",
   "description": "rate",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/index.ts

@@ -1,7 +1,7 @@
 import { Attributes, Search, SearchResult } from './core';
 import {
-  InfoRepository, Rate, RateComment, RateCommentFilter, RateCommentRepository, RateCommentQuery, RateFilter, RateReactionRepository,
-  RateRepository, Rater, ShortComment, ShortRate
+  Comment, CommentFilter, InfoRepository, Rate, RateCommentQuery, RateCommentRepository, RateFilter, Rater,
+  RateReactionRepository, RateRepository, ShortComment, ShortRate
 } from './rate';
 
 export * from './rate';
@@ -14,14 +14,20 @@ export class RateService<O> implements Rater {
   constructor(protected find: Search<Rate, RateFilter>,
     public repository: RateRepository,
     private infoRepository: InfoRepository<O>,
-    private rateCommentRepository: RateCommentRepository,
+    private commentRepository: RateCommentRepository,
     private rateReactionRepository: RateReactionRepository,
     private queryURL?: (ids: string[]) => Promise<URL[]>) {
     this.rate = this.rate.bind(this);
+    this.search = this.search.bind(this);
+    this.load = this.load.bind(this);
+    this.getRate = this.getRate.bind(this);
+    this.setUseful = this.setUseful.bind(this);
+    this.removeUseful = this.removeUseful.bind(this);
     this.comment = this.comment.bind(this);
     this.removeComment = this.removeComment.bind(this);
     this.updateComment = this.updateComment.bind(this);
-    this.search = this.search.bind(this);
+    this.getComments = this.getComments.bind(this);
+    this.getComment = this.getComment.bind(this);
   }
   async rate(rate: Rate): Promise<number> {
     rate.time = new Date();
@@ -30,7 +36,7 @@ export class RateService<O> implements Rater {
       const r0 = await this.repository.insert(rate, true);
       return r0;
     }
-    const exist = await this.repository.getRate(rate.id, rate.author);
+    const exist = await this.repository.load(rate.id, rate.author);
     if (!exist) {
       const r1 = await this.repository.insert(rate);
       return r1;
@@ -71,8 +77,11 @@ export class RateService<O> implements Rater {
       }
     });
   }
+  load(id: string, author: string): Promise<Rate | null> {
+    return this.repository.load(id, author);
+  }
   getRate(id: string, author: string): Promise<Rate | null> {
-    return this.repository.getRate(id, author);
+    return this.repository.load(id, author);
   }
   setUseful(id: string, author: string, userId: string): Promise<number> {
     return this.rateReactionRepository.save(id, author, userId, 1);
@@ -80,21 +89,21 @@ export class RateService<O> implements Rater {
   removeUseful(id: string, author: string, userId: string): Promise<number> {
     return this.rateReactionRepository.remove(id, author, userId);
   }
-  comment(comment: RateComment): Promise<number> {
-    return this.repository.getRate(comment.id, comment.author).then(checkRate => {
+  comment(comment: Comment): Promise<number> {
+    return this.repository.load(comment.id, comment.author).then(checkRate => {
       if (!checkRate) {
         return -1;
       } else {
         comment.time ? comment.time = comment.time : comment.time = new Date();
-        return this.rateCommentRepository.insert(comment);
+        return this.commentRepository.insert(comment);
       }
     });
   }
   removeComment(commentId: string, userId: string): Promise<number> {
-    return this.rateCommentRepository.load(commentId).then(comment => {
+    return this.commentRepository.load(commentId).then(comment => {
       if (comment) {
         if (userId === comment.author || userId === comment.userId) {
-          return this.rateCommentRepository.remove(commentId, comment.id, comment.author);
+          return this.commentRepository.remove(commentId, comment.id, comment.author);
         } else {
           return -2;
         }
@@ -103,8 +112,8 @@ export class RateService<O> implements Rater {
       }
     });
   }
-  updateComment(comment: RateComment): Promise<number> {
-    return this.rateCommentRepository.load(comment.commentId).then(exist => {
+  updateComment(comment: Comment): Promise<number> {
+    return this.commentRepository.load(comment.commentId).then(exist => {
       if (!exist) {
         return -1;
       } else {
@@ -119,34 +128,36 @@ export class RateService<O> implements Rater {
           exist.histories = [c];
         }
         exist.comment = comment.comment;
-        const res =  this.rateCommentRepository.update(exist);
+        const res =  this.commentRepository.update(exist);
         return res;
       }
     });
   }
+  getComments(id: string, author: string, limit?: number): Promise<Comment[]> {
+    return this.commentRepository.getComments(id, author, limit);
+  }
+  getComment(id: string): Promise<Comment|null> {
+    return this.commentRepository.load(id);
+  }
 }
 export interface CommentRepository {
-  load(commentId: string, ctx?: any): Promise<RateComment|null>;
-  getComments?(id: string, author: string, limit?: number): Promise<RateComment[]>;
+  load(commentId: string, ctx?: any): Promise<Comment|null>;
+  getComments(id: string, author: string, limit?: number): Promise<Comment[]>;
 }
 // tslint:disable-next-line:max-classes-per-file
 export class CommentQuery implements RateCommentQuery {
-  constructor(protected find: Search<RateComment, RateCommentFilter>, protected repository: CommentRepository, private queryURL?: (ids: string[]) => Promise<URL[]>) {
+  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)
+    this.getComments = this.getComments.bind(this);
   }
-  load(id: string, ctx?: any): Promise<RateComment|null> {
+  load(id: string, ctx?: any): Promise<Comment|null> {
     return this.repository.load(id, ctx);
   }
-  getComments(id: string, author: string, limit?: number): Promise<RateComment[]> {
-    if (this.repository.getComments) {
-      return this.repository.getComments(id, author, limit);
-    } else {
-      return Promise.resolve([]);
-    }
+  getComments(id: string, author: string, limit?: number): Promise<Comment[]> {
+    return this.repository.getComments(id, author, limit);
   }
-  search(s: RateCommentFilter, limit?: number, offset?: number | string, fields?: string[]): Promise<SearchResult<RateComment>> {
+  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;
@@ -203,7 +214,7 @@ export class CommentValidator {
   constructor(protected attributes: Attributes, protected check: (obj: any, attributes: Attributes) => ErrorMessage[]) {
     this.validate = this.validate.bind(this);
   }
-  validate(comment: RateComment): Promise<ErrorMessage[]> {
+  validate(comment: Comment): Promise<ErrorMessage[]> {
     const errs = this.check(comment, this.attributes);
     return Promise.resolve(errs);
   }

package/src/rate.ts

@@ -35,26 +35,28 @@ export interface RateRepository {
   // save(obj: Rate, info?: T, ctx?: any): Promise<number>;
   insert(rate: Rate, newInfo?: boolean): Promise<number>;
   update(rate: Rate, oldRate: number): Promise<number>;
-  getRate(id: string, author: string): Promise<Rate | null>;
+  load(id: string, author: string): Promise<Rate | null>;
 }
 export interface Rater {
   search(s: RateFilter, limit?: number, offset?: number | string, fields?: string[], ctx?: any): Promise<SearchResult<Rate>>;
-  getRate(id: string, author: string): Promise<Rate | null>;
+  load(id: string, author: string): Promise<Rate | null>;
   rate(rate: Rate): Promise<number>;
   setUseful(id: string, author: string, userId: string, ctx?: any): Promise<number>;
   removeUseful(id: string, author: string, userId: string, ctx?: any): Promise<number>;
-  comment(comment: RateComment): Promise<number>;
+  comment(comment: Comment): Promise<number>;
   removeComment(id: string, author: string, ctx?: any): Promise<number>;
-  updateComment(comment: RateComment): Promise<number>;
+  updateComment(comment: Comment): Promise<number>;
+  getComments(id: string, author: string, limit?: number): Promise<Comment[]>;
+  getComment(id: string): Promise<Comment|null>;
 }
-
 export interface RateReactionRepository {
   remove(id: string, author: string, userId: string, ctx?: any): Promise<number>;
   save(id: string, author: string, userId: string, type: number): Promise<number>;
 }
 
-export interface RateCommentRepository extends Repository<RateComment, string> {
+export interface RateCommentRepository extends Repository<Comment, string> {
   remove(commentId: string, id: string, author: string): Promise<number>;
+  getComments(id: string, author: string, limit?: number): Promise<Comment[]>;
 }
 
 export interface Query<T, ID, S> {
@@ -62,8 +64,8 @@ export interface Query<T, ID, S> {
   metadata?(): Attributes|undefined;
   load(id: ID, ctx?: any): Promise<T|null>;
 }
-export interface RateCommentQuery extends Query<RateComment, string, RateCommentFilter> {
-  getComments(id: string, author: string, limit?: number): Promise<RateComment[]>;
+export interface RateCommentQuery extends Query<Comment, string, CommentFilter> {
+  getComments(id: string, author: string, limit?: number): Promise<Comment[]>;
 }
 export const rateHistoryModel: Attributes = {
   rate: {
@@ -213,13 +215,13 @@ export interface Info10 {
 export interface InfoRepository<T> extends ViewRepository<T, string> {
 }
 
-export interface RateCommentId {
+export interface CommentId {
   id: string;
   author: string;
   userId: string;
 }
 
-export interface RateComment {
+export interface Comment {
   commentId: string;
   id: string;
   author: string;
@@ -236,7 +238,7 @@ export interface ShortComment {
   time: Date;
 }
 
-export interface RateCommentFilter extends Filter {
+export interface CommentFilter extends Filter {
   commentId?: string;
   id?: string;
   author?: string;
@@ -245,45 +247,3 @@ export interface RateCommentFilter extends Filter {
   time?: Date;
   updatedAt?: Date;
 }
-export const commentModel: Attributes = {
-  comment: {
-    length: 500
-  },
-  time: {
-    type: 'datetime'
-  }
-};
-export const rateCommentModel: Attributes = {
-  commentId: {
-    key: true
-  },
-  id: {
-    required: true,
-    noupdate: true,
-    match: 'equal'
-  },
-  author: {
-    required: true,
-    noupdate: true,
-    match: 'equal'
-  },
-  userId: {
-    required: true,
-    noupdate: true,
-    match: 'equal'
-  },
-  comment: {
-    length: 500
-  },
-  time: {
-    type: 'datetime',
-    noupdate: true,
-  },
-  updatedAt: {
-    type: 'datetime'
-  },
-  histories: {
-    type: 'array',
-    typeof: commentModel
-  }
-};