Merge branch 'feat/chart' of https://github.com/boostcampwm-2024/web0…

…5-Denamu into feat/chart

.github/workflows/server_test.yml

@@ -1,9 +1,7 @@
-name: Test
+name: BE Test
 
 on:
   pull_request:
-    paths:
-      - 'server/**'
     branches:
       - main
   workflow_dispatch:

rss-notifier/src/db-access.ts

@@ -1,5 +1,5 @@
-import logger from "./logger.js";
-import { FeedObj, FeedDetail } from "./types.js";
+import logger from "./logger";
+import { RssObj, FeedDetail } from "./types";
 import * as dotenv from "dotenv";
 import * as mysql from "mysql2/promise";
 import Redis from "ioredis";
@@ -50,7 +50,7 @@ export const executeQuery = async (query: string, params: any[] = []) => {
   }
 };
 
-export const selectAllRss = async (): Promise<FeedObj[]> => {
+export const selectAllRss = async (): Promise<RssObj[]> => {
   const query = `SELECT id, rss_url as rssUrl
                  FROM rss_accept`;
   return executeQuery(query);
@@ -59,12 +59,12 @@ export const selectAllRss = async (): Promise<FeedObj[]> => {
 export const insertFeeds = async (resultData: FeedDetail[]) => {
   let successCount = 0;
   let lastFeedId;
-  try {
-    const query = `
+  const query = `
         INSERT INTO feed (blog_id, created_at, title, path, thumbnail)
         VALUES (?, ?, ?, ?, ?)
     `;
-    for (const feed of resultData) {
+  for (const feed of resultData) {
+    try {
       lastFeedId = (
         await executeQuery(query, [
           feed.blogId,
@@ -75,12 +75,13 @@ export const insertFeeds = async (resultData: FeedDetail[]) => {
         ])
       )[INSERT_ID];
       successCount++;
+    } catch (error) {
+      logger.error(`누락된 피드 데이터가 존재합니다. 에러 내용: ${error}`);
     }
-  } catch (error) {
-    logger.error(`누락된 피드 데이터가 존재합니다. 에러 내용: ${error}`);
   }
+
   logger.info(
-    `${successCount}개의 피드 데이터가 성공적으로 데이터베이스에 삽입되었습니다.`,
+    `${successCount}개의 피드 데이터가 성공적으로 데이터베이스에 삽입되었습니다.`
   );
   lastFeedId = lastFeedId - successCount + 1;
   return lastFeedId;
@@ -96,7 +97,7 @@ export const deleteRecentFeedStartId = async () => {
     await redis.set(redisConstant.FEED_RECENT_KEY, "false");
   } catch (error) {
     logger.error(
-      `Redis의 feed:recent:*를 삭제하는 도중 에러가 발생했습니다. 에러 내용: ${error}`,
+      `Redis의 feed:recent:*를 삭제하는 도중 에러가 발생했습니다. 에러 내용: ${error}`
     );
   } finally {
     if (redis) await redis.quit();
@@ -128,7 +129,7 @@ export const setRecentFeedList = async (startId: number) => {
     await pipeLine.exec();
   } catch (error) {
     logger.error(
-      `Redis의 feed:recent:*를 저장하는 도중 에러가 발생했습니다. 에러 내용: ${error}`,
+      `Redis의 feed:recent:*를 저장하는 도중 에러가 발생했습니다. 에러 내용: ${error}`
     );
   } finally {
     if (redis) await redis.quit();

rss-notifier/src/logger.ts

@@ -16,7 +16,11 @@ const logger = winston.createLogger({
   transports: [
     new winston.transports.Console(),
     new winston.transports.File({
-      filename: "rss-notifier/rss-notifier.log",
+      filename: `${
+        process.env.NODE_ENV === "production"
+          ? "rss-notifier/logs/rss-notifier.log"
+          : "logs/rss-notifier.log"
+      }`,
     }),
   ],
 });

rss-notifier/src/rss-notifier.ts

@@ -6,21 +6,11 @@ import {
   deleteRecentFeedStartId,
   setRecentFeedList,
 } from "./db-access.js";
-import { FeedObj, FeedDetail, RawFeed } from "./types.js";
+import { RssObj, FeedDetail, RawFeed } from "./types.js";
 import { XMLParser } from "fast-xml-parser";
 import { parse } from "node-html-parser";
 import { unescape } from "html-escaper";
 
-const htmlEntities = {
-  "·": "·",
-  " ": " ",
-};
-
-const xmlParser = new XMLParser();
-const TIME_INTERVAL = process.env.TIME_INTERVAL
-  ? parseInt(process.env.TIME_INTERVAL)
-  : 1;
-
 const getImageUrl = async (link: string): Promise<string> => {
   const response = await fetch(link, {
     headers: {
@@ -42,6 +32,7 @@ const getImageUrl = async (link: string): Promise<string> => {
 };
 
 const fetchRss = async (rssUrl: string): Promise<RawFeed[]> => {
+  const xmlParser = new XMLParser();
   const response = await fetch(rssUrl, {
     headers: {
       Accept: "application/rss+xml, application/xml, text/xml",
@@ -65,14 +56,17 @@ const fetchRss = async (rssUrl: string): Promise<RawFeed[]> => {
 };
 
 const findNewFeeds = async (
-  rssObj: FeedObj,
-  now: number,
+  rssObj: RssObj,
+  now: number
 ): Promise<FeedDetail[]> => {
   try {
+    const TIME_INTERVAL = process.env.TIME_INTERVAL
+      ? parseInt(process.env.TIME_INTERVAL)
+      : 1;
     const feeds = await fetchRss(rssObj.rssUrl);
 
     const filteredFeeds = feeds.filter((item) => {
-      const pubDate = new Date(item.pubDate).setMinutes(0, 0, 0);
+      const pubDate = new Date(item.pubDate).setSeconds(0, 0);
       const timeDiff = (now - pubDate) / (1000 * 60 * TIME_INTERVAL);
       return timeDiff >= 0 && timeDiff < 1;
     });
@@ -90,19 +84,23 @@ const findNewFeeds = async (
           link: decodeURIComponent(feed.link),
           imageUrl: imageUrl,
         };
-      }),
+      })
     );
 
     return detailedFeeds;
   } catch (err) {
     logger.warn(
-      `[${rssObj.rssUrl}] 에서 데이터 조회 중 오류 발생으로 인한 스킵 처리. 오류 내용 : ${err}`,
+      `[${rssObj.rssUrl}] 에서 데이터 조회 중 오류 발생으로 인한 스킵 처리. 오류 내용 : ${err}`
     );
     return [];
   }
 };
 
 const customUnescape = (text: string): string => {
+  const htmlEntities = {
+    "&middot;": "·",
+    "&nbsp;": " ",
+  };
   Object.keys(htmlEntities).forEach((entity) => {
     const value = htmlEntities[entity];
     const regex = new RegExp(entity, "g");
@@ -113,22 +111,22 @@ const customUnescape = (text: string): string => {
 };
 
 export const performTask = async () => {
+  const currentTime = new Date();
   const rssObjects = await selectAllRss();
 
   if (rssObjects.length === 0) {
     logger.info("등록된 RSS가 없습니다.");
     return;
   }
-  const currentTime = new Date();
 
   let idx = 0;
   const newFeeds = await Promise.all(
     rssObjects.map(async (rssObj) => {
       logger.info(
-        `[${++idx}번째 rss [${rssObj.rssUrl}] 에서 데이터 조회하는 중...`,
+        `[${++idx}번째 rss [${rssObj.rssUrl}] 에서 데이터 조회하는 중...`
       );
-      return await findNewFeeds(rssObj, currentTime.setMinutes(0, 0, 0));
-    }),
+      return await findNewFeeds(rssObj, currentTime.setSeconds(0, 0));
+    })
   );
 
   const result = newFeeds.flat().sort((currentFeed, nextFeed) => {

rss-notifier/src/types.ts

@@ -4,7 +4,7 @@ export interface RawFeed {
   pubDate: string;
 }
 
-export interface FeedObj {
+export interface RssObj {
   id: number;
   rssUrl: string;
 }

server/test/fixture/feed.fixture.ts

@@ -16,7 +16,7 @@ export class FeedFixture {
         path: `https://test.com/test${index}`,
         thumbnail: `https://test.com/test${index}.png`,
       },
-      rssAccept,
+      blog: rssAccept,
     });
     return Object.assign(feed, overwrites);
   }

server/test/statistic/dto/statistic-query.dto.spec.ts

@@ -0,0 +1,50 @@
+import { validate } from 'class-validator';
+import { StatisticQueryDto } from '../../../src/statistic/dto/statistic-query.dto';
+
+describe('StatisticQueryDto', () => {
+  it('실수를 입력한다.', async () => {
+    // given
+    const dto = new StatisticQueryDto();
+    dto.limit = 1.1;
+
+    // when
+    const errors = await validate(dto);
+
+    // then
+    expect(errors.length).toBe(1);
+    expect(errors[0].constraints).toHaveProperty(
+      'isInt',
+      '정수로 입력해주세요.',
+    );
+  });
+  it('문자열을 입력한다.', async () => {
+    // given
+    const dto = new StatisticQueryDto();
+    dto.limit = 'test' as unknown as number;
+
+    // when
+    const errors = await validate(dto);
+
+    // then
+    expect(errors.length).toBe(1);
+    expect(errors[0].constraints).toHaveProperty(
+      'isInt',
+      '정수로 입력해주세요.',
+    );
+  });
+  it('음수를 입력한다.', async () => {
+    // given
+    const dto = new StatisticQueryDto();
+    dto.limit = -1;
+
+    // when
+    const errors = await validate(dto);
+
+    // then
+    expect(errors.length).toBe(1);
+    expect(errors[0].constraints).toHaveProperty(
+      'min',
+      'limit 값은 1 이상이어야 합니다.',
+    );
+  });
+});