onecore 0.6.6 → 0.6.8

package/package.json

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

package/src/db.ts

@@ -20,6 +20,9 @@ export interface Executor {
   execute(sql: string, args?: any[]): Promise<number>
   executeBatch(statements: Statement[], requireFirstAffected?: boolean): Promise<number>
   query<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]): Promise<T[]>
+  queryOne<T>(sql: string, args?: any[], m?: StringMap, bools?: Attribute[]): Promise<T | null>
+  executeScalar<T>(sql: string, args?: any[]): Promise<T | null>
+  count(sql: string, args?: any[]): Promise<number>
 }
 export interface Transaction extends Executor {
   commit(): Promise<void>
@@ -35,7 +38,7 @@ export interface ViewRepository<T, ID> {
   load(id: ID, tx?: Transaction): Promise<T | null>;
 }
 export interface SearchRepository<T, F extends Filter> {
-  search(filter: F, limit: number, offset?: number|string, fields?: string[], tx?: Transaction): Promise<SearchResult<T>>;
+  search(filter: F, limit: number, page?: number, fields?: string[], tx?: Transaction): Promise<SearchResult<T>>;
 }
 export interface ViewSearchRepository<T, ID, F extends Filter>
   extends ViewRepository<T, ID>, SearchRepository<T, F> {
@@ -72,7 +75,7 @@ export interface ViewPort<T, ID> {
   load(id: ID, tx?: Transaction): Promise<T | null>;
 }
 export interface SearchPort<T, F extends Filter> {
-  search(s: F, limit: number, offset?: number|string, fields?: string[], tx?: Transaction): Promise<SearchResult<T>>;
+  search(s: F, limit: number, page?: number, fields?: string[], tx?: Transaction): Promise<SearchResult<T>>;
 }
 export interface ViewSearchPort<T, ID, F extends Filter>
   extends ViewPort<T, ID>, SearchPort<T, F> {

package/src/index.ts

@@ -134,7 +134,7 @@ export class SearchUseCase<T, F extends Filter> {
   constructor(protected repository: SearchRepository<T, F>) {
     this.search = this.search.bind(this);
   }
-  search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>> {
+  search(s: F, limit: number, page?: number, fields?: string[]): Promise<SearchResult<T>> {
     return this.repository.search(s, limit, page, fields);
   }
 }
@@ -164,7 +164,7 @@ export class Writer<T> {
 }
 
 interface SearchWriterRepo<T, F extends Filter> {
-  search(s: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>>
+  search(s: F, limit: number, page?: number, fields?: string[]): Promise<SearchResult<T>>
   create(obj: T, ctx?: Transaction): Promise<number>;
   update(obj: T, ctx?: Transaction): Promise<number>;
   patch(obj: Partial<T>, ctx?: Transaction): Promise<number>;
@@ -175,7 +175,7 @@ export class SearchWriter<T, F extends Filter> extends Writer<T> {
     super(repository)
     this.search = this.search.bind(this);
   }
-  search(filter: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>> {
+  search(filter: F, limit: number, page?: number, fields?: string[]): Promise<SearchResult<T>> {
     return this.repository.search(filter, limit, page, fields);
   }
 }

package/src/job.ts

@@ -1,4 +1,4 @@
-import { DateRange, Filter, SearchResult, TimeRange } from "./model";
+import { DateRange, Filter, TimeRange } from "./model";
 
 export interface Attachment {
   originalFilename: string;
@@ -7,37 +7,6 @@ export interface Attachment {
   size: number;
 }
 
-export interface Article {
-  id: string
-  slug: string
-  title: string
-  description?: string
-  publishedAt?: Date
-  tags?: string[]
-  thumbnail?: string
-  status?: string
-  createdAt?: Date
-  authorId?: string
-  savedAt?: Date
-}
-export interface ArticleFilter extends Filter {
-  id?: string
-  slug?: string
-  title?: string
-  description?: string
-  status?: string
-  publishedAt: TimeRange
-  tags?: string[]
-  authorId?: string
-  userId?: string
-  isSaved?: boolean
-}
-export interface ArticleRepository {
-  search(filter: ArticleFilter, limit: number, page?: number, fields?: string[]): Promise<SearchResult<Article>>
-  load(slug: string, userId?: string): Promise<Article | null>
-  getIdBySlug(slug: string): Promise<string>
-}
-
 export interface Achievement {
   subject: string;
   description: string;
@@ -46,17 +15,7 @@ export interface Skill {
   skill: string;
   hirable: boolean;
 }
-export interface UserFilter extends Filter {
-  userId?: string;
-  username?: string;
-  email?: string;
-  displayName?: string;
-  dateOfBirth?: DateRange;
-  status?: string[]|string;
-  interests?: string[];
-  skills?: Skill[];
-  achievements?: Achievement[];
-}
+
 export interface RoleFilter extends Filter {
   roleId?: string;
   roleName?: string;
@@ -91,35 +50,50 @@ export interface ReviewCommentFilter extends Filter {
   time?: DateRange;
   updatedAt?: DateRange;
 }
-export interface Info {
-  id: string;
-  rate: number;
-  rate1: number;
-  rate2: number;
-  rate3: number;
-  rate4: number;
-  rate5: number;
-  count: number;
-  score: number;
+
+export interface Rate {
+  rate: number
+  rate1: number
+  rate2: number
+  rate3: number
+  rate4: number
+  rate5: number
 }
-export interface Info10 {
-  id: string;
-  rate: number;
-  rate1: number;
-  rate2: number;
-  rate3: number;
-  rate4: number;
-  rate5: number;
-  rate6: number;
-  rate7: number;
-  rate8: number;
-  rate9: number;
-  rate10: number;
-  count: number;
-  score: number;
+
+export interface Article {
+  id: string
+  slug: string
+  title: string
+  description?: string
+  publishedAt?: Date
+  tags?: string[]
+  thumbnail?: string
+  status?: string
+  createdAt?: Date
+  authorId?: string
+  savedAt?: Date
 }
-export interface InfoRepository<ID> {
-  exist(id: ID, ctx?: any): Promise<boolean>;
+
+export interface User {
+  id: string
+  username: string
+  email?: string
+  phone?: string
+  dateOfBirth?: Date
+  displayName?: string
+  status?: string
+  imageURL?: string
+  coverURL?: string
+  headline?: string
+  bio?: string
+  website?: string
+  occupation?: string
+  company?: string
+  location?: string
+
+  followedAt?: Date
+  followerCount?: number
+  followingCount?: number
 }
 
 export interface Company {
@@ -153,8 +127,11 @@ export interface Job {
   skills?: string[]
   minSalary?: number
   maxSalary?: number
-  companyId?: string
   status: string
+  companyId?: string
+  companyName?: string
+  logo?: string
+  savedAt?: Date
 }
 export interface JobFilter extends Filter {
   id?: string
@@ -169,4 +146,6 @@ export interface JobFilter extends Filter {
   applicantCount?: number
   companyId?: string
   status?: string
+  userId?: string
+  isSaved?: boolean
 }

package/src/metadata.ts

@@ -37,6 +37,8 @@ export interface Attribute {
   createdAt?: boolean;
   updatedAt?: boolean;
   length?: number;
+  eq?: number | Date | string;
+  ne?: number | Date | string;
   min?: number | Date | string;
   max?: number | Date | string;
   gt?: number | Date | string;

package/src/service.ts

@@ -9,7 +9,7 @@ export interface ViewService<T, ID> {
 
 export interface SearchService<T, F extends Filter> {
   keys?(): string[];
-  search(filter: F, limit: number, page?: number|string, fields?: string[]): Promise<SearchResult<T>>;
+  search(filter: F, limit: number, page?: number, fields?: string[]): Promise<SearchResult<T>>;
 }
 
 export interface Query<T, ID, F extends Filter> extends SearchService<T, F> {