Merge pull request #46 from donghquinn/dev

Dev

src/controllers/geek/geek.ctl.ts

@@ -10,11 +10,11 @@ export class GeekController {
   constructor(private readonly geek: GeekProvider) {}
 
   @Post('/news')
-  async getHadaNews(@Body() request: DailyHadaNewsRequest) {
+  async getHadaNews(@Body() request: DailyHadaNewsRequest, @Query('page') page: number, @Query('size') size: number) {
     try {
       const { today } = await hadaNewsValidator(request);
 
-      const result = await this.geek.getNews(today);
+      const result = await this.geek.getNews(today, page, size);
 
       return new SetResponse(200, { result });
     } catch (error) {

src/controllers/hacker/hacker.ctl.ts

@@ -1,4 +1,4 @@
-import { Body, Controller, Get, Post, Headers, Query } from '@nestjs/common';
+import { Body, Controller, Get, Headers, Post, Query } from '@nestjs/common';
 import { hackerNewsStarValidator, hackerNewsValidator } from '@validators/hacker.validator';
 import { SetErrorResponse, SetResponse } from 'dto/response.dto';
 import { HackersNewsProvider } from 'providers/news/hacker/hacker.pvd';
@@ -21,11 +21,15 @@ export class HackerController {
   }
 
   @Post('/news')
-  async getHackerNews(@Body() request: DailyHackerNewsRequest) {
+  async getHackerNews(
+    @Body() request: DailyHackerNewsRequest,
+    @Query('page') page: number,
+    @Query('size') size: number,
+  ) {
     try {
       const { today } = await hackerNewsValidator(request);
 
-      const result = await this.hacker.bringTodayHackerPosts(today);
+      const result = await this.hacker.bringTodayHackerPosts(today, page, size);
 
       return new SetResponse(200, { result });
     } catch (error) {

src/controllers/machine/machine.ctl.ts

@@ -1,20 +1,24 @@
-import { MachineLearningProvider } from 'providers/news/ml/machine.pvd';
-import { Body, Controller, Get, Post, Headers, Query } from '@nestjs/common';
+import { Body, Controller, Get, Headers, Post, Query } from '@nestjs/common';
 import { machineLearningValidator, mlNewsStarValidator } from '@validators/ml.validator';
 import { SetErrorResponse, SetResponse } from 'dto/response.dto';
-import { StarRequest } from 'types/request.type';
+import { MachineLearningProvider } from 'providers/news/ml/machine.pvd';
 import { DailyMlNewsRequest } from 'types/ml.type';
+import { StarRequest } from 'types/request.type';
 
 @Controller('ml')
 export class MachineLearningController {
   constructor(private readonly mlNews: MachineLearningProvider) {}
 
   @Post('/latest')
-  async getLatestMlNewsController(@Body() request: DailyMlNewsRequest) {
+  async getLatestMlNewsController(
+    @Body() request: DailyMlNewsRequest,
+    @Query('page') page: number,
+    @Query('size') size: number,
+  ) {
     try {
       const { today } = await machineLearningValidator(request);
 
-      const result = await this.mlNews.bringLatestMachineLearningNews(today);
+      const result = await this.mlNews.bringLatestMachineLearningNews(today, page, size);
 
       return new SetResponse(200, { result });
     } catch (error) {

src/providers/news/geek/geek-prisma.lib.ts

@@ -6,7 +6,7 @@ import { NewsLogger } from '@utils/logger.util';
 
 @Injectable()
 export class GeekPrismaLibrary extends PrismaClient {
-  async bringHadaNews(startDate: Date, endDate: Date) {
+  async bringHadaNews(startDate: Date, endDate: Date, page: number, size: number) {
     try {
       const result = await this.geek.findMany({
         select: { uuid: true, post: true, link: true, descLink: true, founded: true, liked: true },
@@ -17,6 +17,8 @@ export class GeekPrismaLibrary extends PrismaClient {
           },
         },
         orderBy: { rank: 'desc' },
+        take: size,
+        skip: (page - 1) * size,
       });
 
       return result;

src/providers/news/geek/geek.pvd.ts

@@ -18,7 +18,7 @@ export class GeekProvider {
     this.resultNewsArray = [];
   }
 
-  async getNews(today: string) {
+  async getNews(today: string, page: number, size: number) {
     try {
       const yesterday = moment(today).subtract(1, 'day').toDate();
 
@@ -30,7 +30,7 @@ export class GeekProvider {
         end: endDate,
       });
 
-      const result = await this.prisma.bringHadaNews(startDate, endDate);
+      const result = await this.prisma.bringHadaNews(startDate, endDate, page, size);
 
       for (let i = 0; i <= result.length - 1; i += 1) {
         const isUrlUndefined = result[i].descLink.split('.io/')[1];
@@ -82,7 +82,7 @@ export class GeekProvider {
 
   async giveStar(postUuid: string, clientUuid: string) {
     try {
-      const isLogined = this.account.getItem(clientUuid);
+      const isLogined = await this.account.getItem(clientUuid);
 
       if (!isLogined) throw new HadaError('[GEEK] Give Star on the Stars', 'No Logined User Found.');
 

src/providers/news/hacker/hacker-prisma.lib.ts

@@ -6,7 +6,7 @@ import { NewsLogger } from '@utils/logger.util';
 
 @Injectable()
 export class HackerPrismaLibrary extends PrismaClient {
-  async bringHackerNews(startDate: Date, endDate: Date) {
+  async bringHackerNews(startDate: Date, endDate: Date, page: number, size: number) {
     try {
       const result = await this.hackers.findMany({
         select: { uuid: true, post: true, link: true, founded: true, liked: true },
@@ -17,6 +17,8 @@ export class HackerPrismaLibrary extends PrismaClient {
           },
         },
         orderBy: { rank: 'desc' },
+        take: size,
+        skip: (page - 1) * size,
       });
 
       return result;

src/providers/news/hacker/hacker.pvd.ts

@@ -33,7 +33,7 @@ export class HackersNewsProvider {
     }
   }
 
-  async bringTodayHackerPosts(today: string) {
+  async bringTodayHackerPosts(today: string, page: number, size: number) {
     try {
       const yesterday = moment(today).subtract(1, 'day').toDate();
 
@@ -45,7 +45,7 @@ export class HackersNewsProvider {
         end: endDate,
       });
 
-      const result = await this.prisma.bringHackerNews(startDate, endDate);
+      const result = await this.prisma.bringHackerNews(startDate, endDate, page, size);
 
       return result;
     } catch (error) {
@@ -63,7 +63,7 @@ export class HackersNewsProvider {
 
   async giveStar(postUuid: string, clientUuid: string) {
     try {
-      const isLogined = this.account.getItem(clientUuid);
+      const isLogined = await this.account.getItem(clientUuid);
 
       if (!isLogined) throw new HackerError('[Hackers] Give Star on the Stars', 'No Logined User Found.');
 

src/providers/news/ml/machine.pvd.ts

@@ -13,7 +13,7 @@ export class MachineLearningProvider {
     private readonly account: AccountManager,
   ) {}
 
-  async bringLatestMachineLearningNews(today: string) {
+  async bringLatestMachineLearningNews(today: string, page: number, size: number) {
     try {
       const yesterday = moment(today).subtract(1, 'day').toDate();
 
@@ -24,7 +24,7 @@ export class MachineLearningProvider {
         start: startDate,
         end: endDate,
       });
-      const result = await this.prisma.bringMlNews(startDate, endDate);
+      const result = await this.prisma.bringMlNews(startDate, endDate, page, size);
 
       return result;
     } catch (error) {
@@ -42,7 +42,7 @@ export class MachineLearningProvider {
 
   async giveStar(postUuid: string, clientUuid: string) {
     try {
-      const isLogined = this.account.getItem(clientUuid);
+      const isLogined = await this.account.getItem(clientUuid);
 
       if (!isLogined) throw new MachineLearningError('[ML] Give Star on the Stars', 'No Logined User Found.');
 

src/providers/news/ml/ml-prisma.lib.ts

@@ -6,7 +6,7 @@ import { NewsLogger } from '@utils/logger.util';
 
 @Injectable()
 export class MlPrismaLibrary extends PrismaClient {
-  async bringMlNews(startDate: Date, endDate: Date) {
+  async bringMlNews(startDate: Date, endDate: Date, page: number, size: number) {
     try {
       const result = await this.machineNews.findMany({
         select: {
@@ -22,6 +22,8 @@ export class MlPrismaLibrary extends PrismaClient {
             lte: endDate,
           },
         },
+        take: size,
+        skip: (page - 1) * size,
       });
 
       return result;