Merge pull request #384 from sparcs-kaist/#383-events-global-state-cr…

…eate-check-period #383 `/global-state/create` Endpoint에 이벤트 기간에만 접근 가능하도록 변경
sparcs-kaist · Sep 20, 2023 · 72be970 · 72be970
2 parents 3501f4a + 7d54a70
commit 72be970
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 23 deletions.
diff --git a/src/lottery/middlewares/timestampValidator.js b/src/lottery/middlewares/timestampValidator.js
@@ -0,0 +1,19 @@
+const { eventConfig } = require("../../../loadenv");
+const eventPeriod = eventConfig && {
+  startAt: new Date(eventConfig.startAt),
+  endAt: new Date(eventConfig.endAt),
+};
+
+const timestampValidator = (req, res, next) => {
+  if (
+    !eventPeriod ||
+    req.timestamp >= eventPeriod.endAt ||
+    req.timestamp < eventPeriod.startAt
+  ) {
+    return res.status(400).json({ error: "out of date" });
+  } else {
+    next();
+  }
+};
+
+module.exports = timestampValidator;
diff --git a/src/lottery/routes/docs/quests.js b/src/lottery/routes/docs/quests.js
@@ -18,7 +18,7 @@ eventsDocs[`${apiPrefix}/instagram/share-event`] = {
               properties: {
                 result: {
                   type: "boolean",
-                  description: "성공 여부. 항상 true입니다.",
+                  description: "성공 여부",
                   example: true,
                 },
               },
@@ -45,7 +45,7 @@ eventsDocs[`${apiPrefix}/instagram/share-purchase`] = {
               required: ["result"],
               properties: {
                 result: {
-                  description: "성공 여부. 항상 true입니다.",
+                  description: "성공 여부",
                   type: "boolean",
                   example: true,
                 },

diff --git a/src/lottery/routes/globalState.js b/src/lottery/routes/globalState.js
@@ -7,8 +7,9 @@ const globalStateSchema = require("./docs/globalStateSchema");
 
 router.get("/", globalStateHandlers.getUserGlobalStateHandler);
 
-// 아래의 Endpoint 접근 시 로그인 필요
+// 아래의 Endpoint 접근 시 로그인 및 시각 체크 필요
 router.use(require("../../middlewares/auth"));
+router.use(require("../middlewares/timestampValidator"));
 
 router.post(
   "/create",

diff --git a/src/lottery/routes/items.js b/src/lottery/routes/items.js
@@ -8,8 +8,9 @@ const itemsSchema = require("./docs/itemsSchema");
 
 router.get("/list", itemsHandlers.listHandler);
 
-// 아래의 Endpoint 접근 시 로그인 필요
+// 아래의 Endpoint 접근 시 로그인 및 시각 체크 필요
 router.use(require("../../middlewares/auth"));
+router.use(require("../middlewares/timestampValidator"));
 
 router.post(
   "/purchase/:itemId",

diff --git a/src/lottery/routes/quests.js b/src/lottery/routes/quests.js
@@ -3,6 +3,7 @@ const router = express.Router();
 const quests = require("../services/quests");
 
 router.use(require("../../middlewares/auth"));
+router.use(require("../middlewares/timestampValidator"));
 
 router.post("/instagram/share-event", quests.instagramEventShareHandler);
 router.post("/instagram/share-purchase", quests.instagramPurchaseShareHandler);

diff --git a/src/lottery/services/globalState.js b/src/lottery/services/globalState.js
@@ -1,9 +1,9 @@
 const { eventStatusModel } = require("../modules/stores/mongo");
+const { userModel } = require("../../modules/stores/mongo");
 const logger = require("../../modules/logger");
 const { isLogin, getLoginInfo } = require("../../modules/auths/login");
 
 const { eventConfig } = require("../../../loadenv");
-const { userModel } = require("../../modules/stores/mongo");
 const contracts =
   eventConfig && require(`../modules/contracts/${eventConfig.mode}`);
 const quests = contracts ? Object.values(contracts.quests) : undefined;

diff --git a/src/lottery/services/items.js b/src/lottery/services/items.js
@@ -20,12 +20,6 @@ const updateEventStatus = async (
     }
   );
 
-const { eventConfig } = require("../../../loadenv");
-const eventPeriod = eventConfig && {
-  startAt: new Date(eventConfig.startAt),
-  endAt: new Date(eventConfig.endAt),
-};
-
 const getRandomItem = async (req, depth) => {
   if (depth >= 10) {
     logger.error(`User ${req.userOid} failed to open random box`);
@@ -130,12 +124,6 @@ const purchaseHandler = async (req, res) => {
         .status(400)
         .json({ error: "Items/Purchase : nonexistent eventStatus" });
 
-    if (
-      req.timestamp >= eventPeriod.endAt ||
-      req.timestamp < eventPeriod.startAt
-    )
-      return res.status(400).json({ error: "Items/Purchase : out of date" });
-
     const { itemId } = req.params;
     const item = await itemModel.findOne({ _id: itemId }).lean();
     if (!item)

diff --git a/src/lottery/services/publicNotice.js b/src/lottery/services/publicNotice.js
@@ -7,10 +7,6 @@ const {
   publicNoticePopulateOption,
 } = require("../modules/populates/transactions");
 
-const hideNickname = (nickname) => {
-  return `${nickname.toString().slice(0, 2)}${"*".repeat(nickname.length - 2)}`;
-};
-
 const getRecentPurchaceItemListHandler = async (req, res) => {
   try {
     const transactions = (
@@ -22,7 +18,7 @@ const getRecentPurchaceItemListHandler = async (req, res) => {
         .lean()
     ).map(
       ({ userId, item, comment }) =>
-        `${hideNickname(userId.nickname)}님께서 ${item.name}을(를) ${
+        `${userId.nickname}님께서 ${item.name}을(를) ${
           comment.startsWith("송편")
             ? "을(를) 구입하셨습니다."
             : comment.startsWith("랜덤 박스")
@@ -73,7 +69,7 @@ const getTicketLeaderboardHandler = async (req, res) => {
           return null;
         }
         return {
-          nickname: hideNickname(userInfo.nickname),
+          nickname: userInfo.nickname,
           profileImageUrl: userInfo.profileImageUrl,
           ticket1Amount: user.ticket1Amount,
           ticket2Amount: user.ticket2Amount,