From 0c70a3b68833b43efe3e7dc3721389171114c43e Mon Sep 17 00:00:00 2001 From: Jerko Steiner Date: Tue, 22 Jan 2019 11:59:21 +0100 Subject: [PATCH] Move ICommentTree to @rondo/common --- packages/common/src/ICommentTree.ts | 8 ++++++++ packages/common/src/index.ts | 1 + packages/server/src/services/CommentService.ts | 4 ++-- packages/server/src/services/ICommentService.ts | 9 +-------- 4 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 packages/common/src/ICommentTree.ts diff --git a/packages/common/src/ICommentTree.ts b/packages/common/src/ICommentTree.ts new file mode 100644 index 0000000..a50fce7 --- /dev/null +++ b/packages/common/src/ICommentTree.ts @@ -0,0 +1,8 @@ +import {IComment} from './IComment' + +export interface ICommentTree { + rootIds: number[], + commentsById: { + [key: number]: IComment + } +} diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts index 390bcb9..7f59612 100644 --- a/packages/common/src/index.ts +++ b/packages/common/src/index.ts @@ -1,5 +1,6 @@ export * from './IAPIDef' export * from './IComment' +export * from './ICommentTree' export * from './ICredentials' export * from './IRoutes' export * from './IUser' diff --git a/packages/server/src/services/CommentService.ts b/packages/server/src/services/CommentService.ts index b3d2ca8..f351a83 100644 --- a/packages/server/src/services/CommentService.ts +++ b/packages/server/src/services/CommentService.ts @@ -1,7 +1,7 @@ import {BaseService} from './BaseService' import {Comment} from '../entities/Comment' -import {ICommentService, ICommentTree} from './ICommentService' -import {IComment} from '@rondo/common' +import {ICommentService} from './ICommentService' +import {IComment, ICommentTree} from '@rondo/common' import {Spam} from '../entities/Spam' import {Validator} from '../validator' import {Vote} from '../entities/Vote' diff --git a/packages/server/src/services/ICommentService.ts b/packages/server/src/services/ICommentService.ts index ba1bed0..e86f737 100644 --- a/packages/server/src/services/ICommentService.ts +++ b/packages/server/src/services/ICommentService.ts @@ -1,11 +1,4 @@ -import {IComment} from '@rondo/common' - -export interface ICommentTree { - rootIds: number[], - commentsById: { - [key: number]: IComment - } -} +import {IComment, ICommentTree} from '@rondo/common' export interface ICommentService { find(storyId: number): Promise