pager fixed

pawelszczerbicki · Feb 1, 2018 · 0c88930 · 0c88930
1 parent 69628e0
commit 0c88930
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/app/channel/channel.dao.ts b/src/app/channel/channel.dao.ts
@@ -16,7 +16,7 @@ export class ChannelDao {
 
     getHistory(channelId: string, user: string, page: Page) {
         return this.mongo.findOne<Channel>({_id: new ObjectID(channelId), users: user},
-            {projection: {history: {'$slice': [page.skip(), page.size]}}});
+            {projection: {history: {'$slice': [(page.page - 1) * page.size, page.size]}}});
     }
 
     async getOrCreate(channel: Channel): Promise<Channel> {

diff --git a/src/app/index.ts b/src/app/index.ts
@@ -34,8 +34,8 @@ export class Index {
     }
 
     @Event(CHANNEL_HISTORY)
-    async channelHistory(@Args() request: HistoryRequest, @Socket() socket: SocketIO.Socket) {
-        socket.emit(CHANNEL_HISTORY, (await this.channelService.channelHistory(request.channelId, request.pager, socket.id))!.history);
+    async channelHistory(@Args() req: HistoryRequest, @Socket() socket: SocketIO.Socket) {
+        socket.emit(CHANNEL_HISTORY, (await this.channelService.channelHistory(req.channelId, req.pager, socket.id))!.history);
     }
 
     @Event(CONVERSATIONS)

diff --git a/src/app/page/page.ts b/src/app/page/page.ts
@@ -1,8 +1,4 @@
-export class Page {
-    constructor(public page: number, public size: number) {
-    }
-
-    skip() {
-        return (this.page - 1) * this.size;
-    }
+export interface Page {
+    page: number;
+    size: number;
 }