Merge pull request #326 from code-zero-to-one/fix/payment-redirect

QNRR-779 결 제완료시 로그인 풀리는 문제

Author: yeun38

src/api/client/cookie.ts

@@ -15,7 +15,7 @@ export const setCookie = (
   const {
     path = '/',
     secure = true,
-    sameSite = 'Strict',
+    sameSite = 'Lax', // Strict에서 Lax로 변경: 외부 사이트에서 redirect 시 쿠키 전송 허용
     maxAge = 86400, // 1일
     httpOnly = false,
   } = options;

src/app/(admin)/admin/sales-management/payment-refund/page.tsx

@@ -26,6 +26,7 @@ const PAYMENT_HISTORY_TYPE_MAP: Record<
   }
 > = {
   PAYMENT_REQUESTED: { label: '결제대기', color: 'blue' },
+  PAYMENT_WAITING_FOR_DEPOSIT: { label: '입금대기', color: 'blue' },
   PAYMENT_SUCCESS: { label: '결제완료', color: 'green' },
   PAYMENT_FAILED: { label: '결제실패', color: 'red' },
   PAYMENT_CANCELED: { label: '결제취소', color: 'red' },

src/app/(service)/(my)/payment-management/page.tsx

@@ -33,6 +33,7 @@ const TRANSACTION_TYPE_MAP: Record<
   }
 > = {
   PAYMENT_REQUESTED: { label: '결제대기', color: 'blue' },
+  PAYMENT_WAITING_FOR_DEPOSIT: { label: '입금대기', color: 'blue' },
   PAYMENT_SUCCESS: { label: '결제완료', color: 'green' },
   PAYMENT_FAILED: { label: '결제실패', color: 'red' },
   PAYMENT_CANCELED: { label: '결제취소', color: 'red' },

src/app/(service)/payment/complete/page.tsx

@@ -1,6 +1,8 @@
 'use client';
 
+import dayjs from 'dayjs';
 import { ComponentProps } from 'react';
+
 import { MissionListResponse } from '@/api/openapi/models';
 import Badge from '@/components/ui/badge';
 import Button from '@/components/ui/button';
@@ -42,9 +44,8 @@ const STATUS_CONFIG = {
 
 function formatDate(dateString?: string) {
   if (!dateString) return '';
-  const date = new Date(dateString);
 
-  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+  return dayjs(dateString).format('YYYY-MM-DD');
 }
 
 function getDeadlineInfo(endDate?: string): {
@@ -53,15 +54,13 @@ function getDeadlineInfo(endDate?: string): {
 } | null {
   if (!endDate) return null;
 
-  const now = new Date();
-  const end = new Date(endDate);
-  end.setHours(23, 59, 59, 999);
+  const now = dayjs();
+  const end = dayjs(endDate).endOf('day');
 
-  const diffMs = end.getTime() - now.getTime();
-  if (diffMs < 0) return null;
+  if (end.isBefore(now)) return null;
 
-  const diffHours = diffMs / (1000 * 60 * 60);
-  const diffDays = Math.ceil(diffMs / (1000 * 60 * 60 * 24));
+  const diffHours = end.diff(now, 'hour');
+  const diffDays = Math.ceil(end.diff(now, 'day', true));
 
   if (diffHours <= 24) {
     return { text: '오늘 제출 마감', isUrgent: true };

src/components/card/mission-card.tsx

@@ -10,7 +10,6 @@ import type {
 import Avatar from '@/components/ui/avatar';
 import Button from '@/components/ui/button';
 import MoreMenu from '@/components/ui/dropdown/more-menu';
-import { useUserStore } from '@/stores/useUserStore';
 import ConfirmDeleteModal from '@/features/study/group/ui/confirm-delete-modal';
 import {
   useDeleteHomework,
@@ -22,6 +21,7 @@ import {
   useUpdatePeerReview,
 } from '@/hooks/queries/peer-review-api';
 import { useIsLeader } from '@/stores/useLeaderStore';
+import { useUserStore } from '@/stores/useUserStore';
 import DeleteHomeworkModal from '../modals/delete-homework-modal';
 import EditHomeworkModal from '../modals/edit-homework-modal';
 

src/components/contents/homework-detail-content.tsx

@@ -14,11 +14,11 @@ import StudyFilter, {
 import StudySearch from '@/components/filtering/study-search';
 import PageContainer from '@/components/layout/page-container';
 import Button from '@/components/ui/button';
+import { useAuth } from '@/hooks/common/use-auth';
 import { useGetStudies } from '@/hooks/queries/study-query';
 import GroupStudyFormModal from '../../features/study/group/ui/group-study-form-modal';
 import GroupStudyPagination from '../../features/study/group/ui/group-study-pagination';
 import GroupStudyList from '../lists/group-study-list';
-import { useAuth } from '@/hooks/common/use-auth';
 
 const PAGE_SIZE = 15;
 

src/components/pages/group-study-list-page.tsx

@@ -17,8 +17,8 @@ import PremiumStudyList from '@/components/premium/premium-study-list';
 import PremiumStudyPagination from '@/components/premium/premium-study-pagination';
 import Button from '@/components/ui/button';
 import GroupStudyFormModal from '@/features/study/group/ui/group-study-form-modal';
-import { useGetStudies } from '@/hooks/queries/study-query';
 import { useAuth } from '@/hooks/common/use-auth';
+import { useGetStudies } from '@/hooks/queries/study-query';
 
 const PAGE_SIZE = 15;
 

src/components/pages/premium-study-list-page.tsx

@@ -132,7 +132,6 @@ export default function SummaryStudyInfo({ data }: Props) {
   };
 
   const isApplyDisabled =
-    !isLoggedIn ||
     isLeader ||
     myApplicationStatus?.status !== 'NONE' ||
     groupStudyStatus !== 'RECRUITING' ||

src/components/summary/study-info-summary.tsx

@@ -6,8 +6,8 @@ import { useRouter } from 'next/navigation';
 import { deleteCookie, getCookie } from '@/api/client/cookie';
 import { logout, signUp, uploadProfileImage } from '@/features/auth/api/auth';
 import { hashValue } from '@/utils/hash';
-import { useUserStore } from '../../../stores/useUserStore';
 import { SignUpRequest, SignUpResponse } from './types';
+import { useUserStore } from '../../../stores/useUserStore';
 
 // 회원가입 요청 커스텀 훅
 export const useSignUpMutation = () => {