Merge pull request #61 from donghquinn/dev

Dev

.dockerignore

@@ -16,6 +16,5 @@ npm-debug.log
 example.env
 
 migrations
-.eslintrc.json
 
 newsData

src/controllers/geek/geek.ctl.ts

@@ -1,5 +1,5 @@
 import { Body, Controller, Post, Query } from '@nestjs/common';
-import { hadaNewsStarValidator, hadaNewsUnStarValidator, hadaNewsValidator } from '@validators/hada.validator';
+import { geekNewsStarValidator, geekNewsUnStarValidator, geekNewsValidator } from '@validators/geek.validator';
 import { SetErrorResponse, SetResponse } from 'dto/response.dto';
 import { GeekProvider } from 'providers/news/geek/geek.pvd';
 import { DailyHadaNewsRequest } from 'types/geek.type';
@@ -9,14 +9,14 @@ import { StarRequest } from 'types/request.type';
 export class GeekController {
   constructor(private readonly geek: GeekProvider) {}
 
-  @Post('/news')
+  @Post('news')
   async geekGetLatestNewsController(
     @Body() request: DailyHadaNewsRequest,
     @Query('page') page: number,
     @Query('size') size: number,
   ) {
     try {
-      const { today } = await hadaNewsValidator(request);
+      const { today } = await geekNewsValidator(request);
 
       const { result, total } = await this.geek.getNews(today, page, size);
 
@@ -26,10 +26,10 @@ export class GeekController {
     }
   }
 
-  @Post('/star')
+  @Post('star')
   async geekGiveStarController(@Body() request: StarRequest) {
     try {
-      const { uuid: postUuid, email } = await hadaNewsStarValidator(request);
+      const { uuid: postUuid, email } = await geekNewsStarValidator(request);
 
       await this.geek.giveStar(postUuid, email);
 
@@ -39,10 +39,10 @@ export class GeekController {
     }
   }
 
-  @Post('/unstar')
+  @Post('unstar')
   async geekUnStarController(@Body() request: StarRequest) {
     try {
-      const { uuid: postUuid, email } = await hadaNewsUnStarValidator(request);
+      const { uuid: postUuid, email } = await geekNewsUnStarValidator(request);
 
       await this.geek.unStar(postUuid, email);
 

src/controllers/hacker/hacker.ctl.ts

@@ -9,7 +9,7 @@ import { StarRequest } from 'types/request.type';
 export class HackerController {
   constructor(private readonly hacker: HackersNewsProvider) {}
 
-  @Post('/news')
+  @Post('news')
   async hackerGetLatestNewsController(
     @Body() request: DailyHackerNewsRequest,
     @Query('page') page: number,
@@ -26,7 +26,7 @@ export class HackerController {
     }
   }
 
-  @Post('/star')
+  @Post('star')
   async hackerGiveStarController(@Body() request: StarRequest) {
     try {
       const { uuid: PostUuid, email } = await hackerNewsStarValidator(request);
@@ -39,7 +39,7 @@ export class HackerController {
     }
   }
 
-  @Post('/unstar')
+  @Post('unstar')
   async hackerUnStarController(@Body() request: StarRequest) {
     try {
       const { uuid: postUuid, email } = await hackerNewsUnStarValidator(request);

src/controllers/machine/machine.ctl.ts

@@ -9,7 +9,7 @@ import { StarRequest } from 'types/request.type';
 export class MachineLearningController {
   constructor(private readonly mlNews: MachineLearningProvider) {}
 
-  @Post('/latest')
+  @Post('news')
   async mlGetLatestNewsController(
     @Body() request: DailyMlNewsRequest,
     @Query('page') page: number,
@@ -26,7 +26,7 @@ export class MachineLearningController {
     }
   }
 
-  @Post('/star')
+  @Post('star')
   async mlGiveStarController(@Body() request: StarRequest) {
     try {
       const { uuid: postUuid, email } = await mlNewsStarValidator(request);
@@ -39,7 +39,7 @@ export class MachineLearningController {
     }
   }
 
-  @Post('/unstar')
+  @Post('unstar')
   async mlUnStarController(@Body() request: StarRequest) {
     try {
       const { uuid: postUuid, email } = await mlNewsUnStarValidator(request);

src/dto/response.dto.ts

@@ -1,7 +1,7 @@
 import { AuthError } from '@errors/auth.error';
 import { ClientError } from '@errors/client.error';
 import { HackerError } from '@errors/hacker.error';
-import { HadaError } from '@errors/hada.error';
+import { HadaError } from '@errors/geek.error';
 import { MachineLearningError } from '@errors/machine.error';
 import { PrismaError } from '@errors/prisma.error';
 import { ValidatorError } from '@errors/validator.error';

src/errors/hada.error.ts → src/errors/geek.error.ts

@@ -1,12 +1,12 @@
-export class HadaError extends Error {
+export class GeekError extends Error {
   type: string;
 
   constructor(type: string, message: string, cause?: Error) {
     super(message);
 
     this.type = type;
 
-    this.name = '[Hada Error]';
+    this.name = '[Geek Error]';
 
     this.cause = cause;
   }

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

@@ -1,12 +1,11 @@
-import { HadaError } from '@errors/hada.error';
-import { PrismaError } from '@errors/prisma.error';
+import { GeekError } from '@errors/geek.error';
 import { Injectable } from '@nestjs/common';
 import { PrismaClient } from '@prisma/client';
 import { NewsLogger } from '@utils/logger.util';
 
 @Injectable()
 export class GeekPrismaLibrary extends PrismaClient {
-  async bringHadaNews(startDate: Date, endDate: Date, page: number, size: number) {
+  async bringGeekNews(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 },
@@ -23,12 +22,12 @@ export class GeekPrismaLibrary extends PrismaClient {
 
       return result;
     } catch (error) {
-      NewsLogger.error('[HADA] Bring Geek News Error: %o', {
+      NewsLogger.error('[GEEK] Bring Geek News Error: %o', {
         error,
       });
 
-      throw new PrismaError(
-        '[HADA] Bring Geek News',
+      throw new GeekError(
+        '[GEEK] Bring Geek News',
         'Bring Geek News Error. Please Try Again.',
         error instanceof Error ? error : new Error(JSON.stringify(error)),
       );
@@ -48,19 +47,19 @@ export class GeekPrismaLibrary extends PrismaClient {
 
       return Math.ceil(totalCounts / size);
     } catch (error) {
-      NewsLogger.error('[HADA] Bring Total Geek News Count Error: %o', {
+      NewsLogger.error('[GEEK] Bring Total Geek News Count Error: %o', {
         error,
       });
 
-      throw new PrismaError(
-        '[HADA] Bring Total Geek News Count',
+      throw new GeekError(
+        '[GEEK] Bring Total Geek News Count',
         'Bring Total Geek News Count Error. Please Try Again.',
         error instanceof Error ? error : new Error(JSON.stringify(error)),
       );
     }
   }
 
-  async checkHadaNewsIsLiked(postUuid: string, clientUuid: string) {
+  async checkGeekNewsIsLiked(postUuid: string, clientUuid: string) {
     try {
       const isStarred = await this.geek_Liked.findFirst({
         select: {
@@ -77,29 +76,29 @@ export class GeekPrismaLibrary extends PrismaClient {
         },
       });
 
-      if (isStarred === null) throw new HadaError('[Hada] Get Star Info', 'No Star Info Found.');
+      if (isStarred === null) throw new GeekError('[GEEK] Get Star Info', 'No Star Info Found.');
 
-      NewsLogger.debug('[Hada] Found Is Starred Info: %o', {
+      NewsLogger.debug('[GEEK] Found Is Starred Info: %o', {
         isLiked: isStarred.geek_news.liked,
       });
 
       return { uuid: isStarred.uuid, liked: isStarred.geek_news.liked };
     } catch (error) {
-      NewsLogger.error('[Hada] Check Hada News Liked Info Error: %o', {
+      NewsLogger.error('[GEEK] Check Hada News Liked Info Error: %o', {
         error,
       });
 
-      throw new HadaError(
-        '[Hada] Check Hada News Liked Info',
+      throw new GeekError(
+        '[GEEK] Check Hada News Liked Info',
         'Check Hada News Liked Info Error.',
         error instanceof Error ? error : new Error(JSON.stringify(error)),
       );
     }
   }
 
-  async updateHadaNewsLikedtoUnliked(likedUuid: string, postUuid: string, clientUuid: string) {
+  async updateGeekNewsLikedtoUnliked(likedUuid: string, postUuid: string, clientUuid: string) {
     try {
-      NewsLogger.debug('[HADA] Give Hada News unStar Request: %o', {
+      NewsLogger.debug('[GEEK] Give Hada News unStar Request: %o', {
         likedUuid,
         postUuid,
         clientUuid,
@@ -120,25 +119,25 @@ export class GeekPrismaLibrary extends PrismaClient {
         },
       });
 
-      NewsLogger.info('[HADA] Unstarred Updated');
+      NewsLogger.info('[GEEK] Unstarred Updated');
 
       return 0;
     } catch (error) {
-      NewsLogger.error('[Hada] Update Liked to UnLiked Error: %o', {
+      NewsLogger.error('[GEEK] Update Liked to UnLiked Error: %o', {
         error,
       });
 
-      throw new HadaError(
-        '[Hada] Update Liked to UnLiked',
+      throw new GeekError(
+        '[GEEK] Update Liked to UnLiked',
         'Update Liked to UnLiked Error.',
         error instanceof Error ? error : new Error(JSON.stringify(error)),
       );
     }
   }
 
-  async updateHadaNewsLiked(likedUuid: string, postUuid: string, clientUuid: string) {
+  async updateGeekNewsLiked(likedUuid: string, postUuid: string, clientUuid: string) {
     try {
-      NewsLogger.debug('[HADA] Give Hacker News Star Request: %o', {
+      NewsLogger.debug('[GEEK] Give Hacker News Star Request: %o', {
         likedUuid,
         postUuid,
         clientUuid,
@@ -159,62 +158,19 @@ export class GeekPrismaLibrary extends PrismaClient {
         },
       });
 
-      NewsLogger.info('[HADA] Starred Updated');
+      NewsLogger.info('[GEEK] Starred Updated');
 
       return 0;
     } catch (error) {
-      NewsLogger.error('[Hada] Update News Liked Error: %o', {
+      NewsLogger.error('[GEEK] Update News Liked Error: %o', {
         error,
       });
 
-      throw new HadaError(
-        '[Hada] Update News Liked',
+      throw new GeekError(
+        '[GEEK] Update News Liked',
         'Update News Liked Error.',
         error instanceof Error ? error : new Error(JSON.stringify(error)),
       );
     }
   }
-
-  async getStarredHadaNewsPagination(page: number, size: number) {
-    try {
-      const totalPosts = await this.geek.count({ where: { liked: 1 } });
-
-      const starredNews = await this.geek.findMany({
-        select: {
-          uuid: true,
-          post: true,
-          link: true,
-          founded: true,
-        },
-        orderBy: {
-          founded: 'desc',
-        },
-        where: {
-          liked: 1,
-        },
-        take: size,
-        skip: (page - 1) * size,
-      });
-
-      NewsLogger.debug('[Hada] Founded Starred News: %o', {
-        totalPosts,
-        newsSize: starredNews.length,
-      });
-
-      return {
-        totalPosts,
-        starredNews,
-      };
-    } catch (error) {
-      NewsLogger.info('[Hada] Get Starred News Error: %o', {
-        error,
-      });
-
-      throw new HadaError(
-        '[Hada] Get Starred News',
-        'Get Starred News Error.',
-        error instanceof Error ? error : new Error(JSON.stringify(error)),
-      );
-    }
-  }
 }