[FIX] 알림 읽음 처리 - Timezone Issue

TeamSparker · Jan 13, 2022 · 3bf3bd1 · 3bf3bd1
2 parents 3bc19fd + 9f825cb
commit 3bf3bd1
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/functions/db/notice.js b/functions/db/notice.js
@@ -3,33 +3,35 @@ const _ = require('lodash');
 const convertSnakeToCamel = require('../lib/convertSnakeToCamel');
 
 const serviceReadByUserId = async (client, userId) => {
+  const now = dayjs().add(9, 'hour');
   const { rows } = await client.query(
     `
     UPDATE spark.notification
-    SET is_read = TRUE, read_at = now(), updated_at = now()
+    SET is_read = TRUE, read_at = $2, updated_at = $2
     WHERE is_read = FALSE 
     AND is_deleted = FALSE 
     AND is_service = TRUE 
     AND receiver_id = $1
     RETURNING *
     `,
-    [userId],
+    [userId, now],
   );
   return convertSnakeToCamel.keysToCamel(rows);
 };
 
 const activeReadByUserId = async (client, userId) => {
+  const now = dayjs().add(9, 'hour');
   const { rows } = await client.query(
     `
     UPDATE spark.notification
-    SET is_read = TRUE, read_at = now(), updated_at = now()
+    SET is_read = TRUE, read_at = $2, updated_at = $2
     WHERE is_read = FALSE 
     AND is_deleted = FALSE 
     AND is_service = FALSE 
     AND receiver_id = $1
     RETURNING *
     `,
-    [userId],
+    [userId, now],
   );
   return convertSnakeToCamel.keysToCamel(rows);
 };
@@ -60,35 +62,37 @@ const deleteNoticeByNoticeId = async (client, noticeId) => {
 };
 
 const getServicesByUserId = async (client, userId, lastid, size) => {
+  const beforeAWeek = dayjs().subtract(7, 'day');
   const { rows } = await client.query(
     `
       SELECT * FROM spark.notification
       WHERE receiver_id = $1
       AND is_deleted = FALSE
       AND is_service = TRUE
       AND notification_id < $2
-      AND created_at > current_timestamp + '-7 days'
+      AND created_at > $4
       ORDER BY notification_id DESC
       LIMIT $3
     `,
-    [userId, lastid, size],
+    [userId, lastid, size, beforeAWeek],
   );
   return convertSnakeToCamel.keysToCamel(rows);
 };
 
 const getActivesByUserId = async (client, userId, lastid, size) => {
+  const beforeAWeek = dayjs().subtract(7, 'day');
   const { rows } = await client.query(
     `
       SELECT * FROM spark.notification
       WHERE receiver_id = $1
       AND is_deleted = FALSE
       AND is_service = FALSE
       AND notification_id < $2
-      AND created_at > current_timestamp + '-7 days'
+      AND created_at > $4
       ORDER BY notification_id DESC
       LIMIT $3
     `,
-    [userId, lastid, size],
+    [userId, lastid, size, beforeAWeek],
   );
   return convertSnakeToCamel.keysToCamel(rows);
 };