Remove: all references to lottery module from outside lottery module

sparcs-kaist · Mar 20, 2024 · 86f8b4a · 86f8b4a
1 parent 2fc3a0e
commit 86f8b4a
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 94 deletions.
diff --git a/src/services/notifications.js b/src/services/notifications.js
@@ -5,7 +5,7 @@ const logger = require("@/modules/logger");
 const { registerDeviceToken, validateDeviceToken } = require("@/modules/fcm");
 
 // 이벤트 코드입니다.
-const { contracts } = require("../lottery");
+// const { contracts } = require("../lottery");
 
 const registerDeviceTokenHandler = async (req, res) => {
   try {
@@ -108,11 +108,11 @@ const editOptionsHandler = async (req, res) => {
     }
 
     // 이벤트 코드입니다.
-    await contracts?.completeAdPushAgreementQuest(
-      req.userOid,
-      req.timestamp,
-      options.advertisement
-    );
+    // await contracts?.completeAdPushAgreementQuest(
+    //   req.userOid,
+    //   req.timestamp,
+    //   options.advertisement
+    // );
 
     res.status(200).json(updatedNotificationOptions);
   } catch (err) {

diff --git a/src/services/rooms.js b/src/services/rooms.js
@@ -15,12 +15,12 @@ const {
 } = require("@/modules/slackNotification");
 
 // 이벤트 코드입니다.
-const { eventConfig } = require("../../loadenv");
-const eventPeriod = eventConfig && {
-  startAt: new Date(eventConfig.period.startAt),
-  endAt: new Date(eventConfig.period.endAt),
-};
-const { contracts } = require("../lottery");
+// const { eventConfig } = require("../../loadenv");
+// const eventPeriod = eventConfig && {
+//   startAt: new Date(eventConfig.period.startAt),
+//   endAt: new Date(eventConfig.period.endAt),
+// };
+// const { contracts } = require("../lottery");
 
 const createHandler = async (req, res) => {
   const { name, from, to, time, maxPartLength } = req.body;
@@ -102,7 +102,7 @@ const createHandler = async (req, res) => {
     const roomObjectFormated = formatSettlement(roomObject);
 
     // 이벤트 코드입니다.
-    await contracts?.completeFirstRoomCreationQuest(req.userOid, req.timestamp);
+    // await contracts?.completeFirstRoomCreationQuest(req.userOid, req.timestamp);
 
     return res.send(roomObjectFormated);
   } catch (err) {
@@ -172,56 +172,57 @@ const createTestHandler = async (req, res) => {
 
   try {
     // 이벤트 코드입니다.
-    if (
-      !eventPeriod ||
-      req.timestamp >= eventPeriod.endAt ||
-      req.timestamp < eventPeriod.startAt
-    )
-      return res.json({ result: true });
-
-    const countRecentlyMadeRooms = await roomModel.countDocuments({
-      madeat: { $gte: new Date(req.timestamp - 86400000) }, // 밀리초 단위로 24시간을 나타냅니다.
-      "part.0.user": req.userOid, // 방 최초 생성자를 저장하는 필드가 없으므로, 첫 번째 참여자를 생성자로 간주합니다.
-    });
-    if (!countRecentlyMadeRooms && countRecentlyMadeRooms !== 0)
-      return res
-        .status(500)
-        .json({ error: "Rooms/create/test : internal server error" });
-
-    const dateTime = new Date(time);
-    const candidateRooms = await roomModel
-      .find(
-        {
-          time: {
-            $gte: new Date(dateTime.getTime() - 43200000),
-            $lte: new Date(dateTime.getTime() + 43200000),
-          },
-          part: { $elemMatch: { user: req.userOid } },
-        },
-        "from to time maxPartLength"
-      )
-      .limit(2)
-      .lean();
-    if (!candidateRooms)
-      return res
-        .status(500)
-        .json({ error: "Rooms/create/test : internal server error" });
-
-    const isAbusing = checkIsAbusing(
-      req.body,
-      countRecentlyMadeRooms,
-      candidateRooms
-    );
-    if (isAbusing) {
-      const user = await userModel.findById(req.userOid).lean();
-      notifyRoomCreationAbuseToReportChannel(
-        req.userOid,
-        user?.nickname ?? req.userOid,
-        req.body
-      );
-    }
+    // if (
+    //   !eventPeriod ||
+    //   req.timestamp >= eventPeriod.endAt ||
+    //   req.timestamp < eventPeriod.startAt
+    // )
+    //   return res.json({ result: true });
+
+    // const countRecentlyMadeRooms = await roomModel.countDocuments({
+    //   madeat: { $gte: new Date(req.timestamp - 86400000) }, // 밀리초 단위로 24시간을 나타냅니다.
+    //   "part.0.user": req.userOid, // 방 최초 생성자를 저장하는 필드가 없으므로, 첫 번째 참여자를 생성자로 간주합니다.
+    // });
+    // if (!countRecentlyMadeRooms && countRecentlyMadeRooms !== 0)
+    //   return res
+    //     .status(500)
+    //     .json({ error: "Rooms/create/test : internal server error" });
+
+    // const dateTime = new Date(time);
+    // const candidateRooms = await roomModel
+    //   .find(
+    //     {
+    //       time: {
+    //         $gte: new Date(dateTime.getTime() - 43200000),
+    //         $lte: new Date(dateTime.getTime() + 43200000),
+    //       },
+    //       part: { $elemMatch: { user: req.userOid } },
+    //     },
+    //     "from to time maxPartLength"
+    //   )
+    //   .limit(2)
+    //   .lean();
+    // if (!candidateRooms)
+    //   return res
+    //     .status(500)
+    //     .json({ error: "Rooms/create/test : internal server error" });
+
+    // const isAbusing = checkIsAbusing(
+    //   req.body,
+    //   countRecentlyMadeRooms,
+    //   candidateRooms
+    // );
+    // if (isAbusing) {
+    //   const user = await userModel.findById(req.userOid).lean();
+    //   notifyRoomCreationAbuseToReportChannel(
+    //     req.userOid,
+    //     user?.nickname ?? req.userOid,
+    //     req.body
+    //   );
+    // }
 
-    return res.json({ result: !isAbusing });
+    // return res.json({ result: !isAbusing });
+    return res.json({ result: true });
   } catch (err) {
     logger.error(err);
     res.status(500).json({
@@ -622,16 +623,16 @@ const commitPaymentHandler = async (req, res) => {
     });
 
     // 이벤트 코드입니다.
-    await contracts?.completePayingQuest(
-      req.userOid,
-      req.timestamp,
-      roomObject
-    );
-    await contracts?.completePayingAndSendingQuest(
-      req.userOid,
-      req.timestamp,
-      roomObject
-    );
+    // await contracts?.completePayingQuest(
+    //   req.userOid,
+    //   req.timestamp,
+    //   roomObject
+    // );
+    // await contracts?.completePayingAndSendingQuest(
+    //   req.userOid,
+    //   req.timestamp,
+    //   roomObject
+    // );
 
     // 수정한 방 정보를 반환합니다.
     res.send(formatSettlement(roomObject, { isOver: true }));
@@ -700,16 +701,16 @@ const settlementHandler = async (req, res) => {
     });
 
     // 이벤트 코드입니다.
-    await contracts?.completeSendingQuest(
-      req.userOid,
-      req.timestamp,
-      roomObject
-    );
-    await contracts?.completePayingAndSendingQuest(
-      req.userOid,
-      req.timestamp,
-      roomObject
-    );
+    // await contracts?.completeSendingQuest(
+    //   req.userOid,
+    //   req.timestamp,
+    //   roomObject
+    // );
+    // await contracts?.completePayingAndSendingQuest(
+    //   req.userOid,
+    //   req.timestamp,
+    //   roomObject
+    // );
 
     // 수정한 방 정보를 반환합니다.
     res.send(formatSettlement(roomObject, { isOver: true }));

diff --git a/src/services/users.js b/src/services/users.js
@@ -1,14 +1,14 @@
 const { userModel } = require("@/modules/stores/mongo");
 const logger = require("@/modules/logger");
 const aws = require("@/modules/stores/aws");
-
-// 이벤트 코드입니다.
-const { contracts } = require("../lottery");
 const {
   generateNickname,
   generateProfileImageUrl,
 } = require("@/modules/modifyProfile");
 
+// 이벤트 코드입니다.
+// const { contracts } = require("../lottery");
+
 const agreeOnTermsOfServiceHandler = async (req, res) => {
   try {
     let user = await userModel.findOne({ id: req.userId });
@@ -52,10 +52,10 @@ const editNicknameHandler = async (req, res) => {
 
     if (result) {
       // 이벤트 코드입니다.
-      await contracts?.completeNicknameChangingQuest(
-        req.userOid,
-        req.timestamp
-      );
+      // await contracts?.completeNicknameChangingQuest(
+      //   req.userOid,
+      //   req.timestamp
+      // );
 
       res
         .status(200)
@@ -79,11 +79,11 @@ const editAccountHandler = async (req, res) => {
 
     if (result) {
       // 이벤트 코드입니다.
-      await contracts?.completeAccountChangingQuest(
-        req.userOid,
-        req.timestamp,
-        newAccount
-      );
+      // await contracts?.completeAccountChangingQuest(
+      //   req.userOid,
+      //   req.timestamp,
+      //   newAccount
+      // );
 
       res.status(200).send("Users/editAccount : edit user account successful");
     } else {