fix: 인증 관련 로직 수정 (#475)

* fix: 인증 상태, 인증 보기 관련 로직 수정 * fix: 경험치 필드 추가 및 적용 * fix: 날짜 토스트 텍스트 수정 * fix: 빌드 오류 수정
team-moabam · Dec 3, 2023 · 81aa06c · 81aa06c
1 parent 52cf2a6
commit 81aa06c
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 25 deletions.
diff --git a/src/RoomDetail/components/RoomCalendarDate.tsx b/src/RoomDetail/components/RoomCalendarDate.tsx
@@ -42,7 +42,7 @@ const RoomCalendarDate = ({
     } else if (thisDateTime < roomCreateDateTime) {
       Toast.show(
         {
-          message: '기록이 없습니다',
+          message: '방 생성 전 날짜입니다',
           status: 'info'
         },
         2000

diff --git a/src/RoomDetail/components/RoomInfo.tsx b/src/RoomDetail/components/RoomInfo.tsx
@@ -13,8 +13,11 @@ const RoomInfo = ({
   certifyTime,
   status,
   roomType,
-  exp
+  totalExp,
+  currentExp
 }: RoomInfoProps) => {
+  const roomProgress = parseInt(`${(currentExp / totalExp) * 100}`);
+
   return (
     <div className="relative h-[20.56rem] overflow-hidden">
       {status !== 'success' ? (
@@ -34,16 +37,16 @@ const RoomInfo = ({
             Lv {level}
           </span>
           <div className="flex items-center font-IMHyemin-bold text-base text-light-gray">
-            <span className="font-IMHyemin-bold">{exp}</span>
+            <span className="font-IMHyemin-bold">{currentExp}</span>
             <span
               className="flex font-IMHyemin-bold before:ml-[0.4rem] before:mr-[0.2rem] before:block 
            before:font-IMHyemin-bold before:text-base before:content-['/']"
             >
-              10
+              {totalExp}
             </span>
           </div>
         </div>
-        <ProgressBar progress={(exp / 10) * 100}></ProgressBar>
+        <ProgressBar progress={roomProgress}></ProgressBar>
       </div>
     </div>
   );

diff --git a/src/RoomDetail/components/RoomRoutine.tsx b/src/RoomDetail/components/RoomRoutine.tsx
@@ -32,7 +32,7 @@ const RoomRoutine = ({
 
   const certifyEndTime = new Date(serverTime);
   certifyEndTime.setHours(certifyTime);
-  certifyEndTime.setMinutes(0);
+  certifyEndTime.setMinutes(10);
   certifyEndTime.setSeconds(0);
   certifyEndTime.setMilliseconds(0);
 
@@ -59,7 +59,7 @@ const RoomRoutine = ({
       </FormProvider>
       <div className="mb-[0.88rem] flex justify-between text-base">
         <h4 className="text-black dark:text-white">나의 인증</h4>
-        {certifiedDates.includes(chooseDateString) ? (
+        {certifiedDates.includes(chooseDateString) || myCertificationImage ? (
           <span className="text-light-point dark:text-dark-point">
             인증 성공
           </span>

diff --git a/src/RoomDetail/components/RoomSemi.tsx b/src/RoomDetail/components/RoomSemi.tsx
@@ -29,15 +29,16 @@ const RoomSemi = ({ roomId, serverTime, checkedRoomJoin }: RoomSemiProps) => {
     announcement,
     certifiedRanks,
     level,
-    currentUserCount,
-    maxUserCount,
-    exp,
+    currentExp,
+    totalExp,
     roomImage,
     roomType
   } = roomSemiData;
 
   const isBirdSleep = getTimeRange(serverTime) !== roomType;
 
+  const roomProgress = parseInt(`${(currentExp / totalExp) * 100}`);
+
   return (
     <>
       <RoomDetailMeta roomTitle={title} />
@@ -108,16 +109,16 @@ const RoomSemi = ({ roomId, serverTime, checkedRoomJoin }: RoomSemiProps) => {
                 Lv {level}
               </span>
               <div className="flex font-IMHyemin-bold text-base text-light-gray">
-                <span className="font-IMHyemin-bold">{currentUserCount}</span>
+                <span className="font-IMHyemin-bold">{currentExp}</span>
                 <span
                   className="flex font-IMHyemin-bold before:mx-[0.4rem] before:block 
            before:font-IMHyemin-bold before:text-base before:content-['/']"
                 >
-                  {maxUserCount}
+                  {totalExp}
                 </span>
               </div>
             </div>
-            <ProgressBar progress={(exp / 10) * 100}></ProgressBar>
+            <ProgressBar progress={roomProgress}></ProgressBar>
           </div>
         </div>
       </div>

diff --git a/src/RoomDetail/components/RoomWorkspace.tsx b/src/RoomDetail/components/RoomWorkspace.tsx
@@ -81,11 +81,11 @@ const RoomWorkspace = ({
     serverTime: Date,
     certifyTime: number
   ) => {
-    const certifyEndTime = new Date(serverTime);
-    certifyEndTime.setHours(certifyTime);
-    certifyEndTime.setMinutes(10);
-    certifyEndTime.setSeconds(0);
-    certifyEndTime.setMilliseconds(0);
+    const certifyStartTime = new Date(serverTime);
+    certifyStartTime.setHours(certifyTime);
+    certifyStartTime.setMinutes(0);
+    certifyStartTime.setSeconds(0);
+    certifyStartTime.setMilliseconds(0);
 
     const roomCreatedCertifyEndTime = new Date(roomCreatedDate);
     roomCreatedCertifyEndTime.setHours(certifyTime);
@@ -95,7 +95,7 @@ const RoomWorkspace = ({
 
     if (
       chooseDate.getDate() === serverTime.getDate() &&
-      certifyEndTime.getTime() > serverTime.getTime()
+      certifyStartTime.getTime() > serverTime.getTime()
     ) {
       e.preventDefault();
       Toast.show(

diff --git a/src/core/mocks/datas/room.ts b/src/core/mocks/datas/room.ts
@@ -5,9 +5,10 @@ export const RoomInfo = {
   managerNickName: '오목눈이#U8WN6I',
   roomImage: 'https://image.moabam.com/moabam/default/room-level-00.png',
   level: 5,
-  exp: 4,
+  currentExp: 4,
+  totalExp: 80,
   roomType: 'MORNING',
-  certifyTime: 23,
+  certifyTime: 0,
   currentUserCount: 5,
   maxUserCount: 9,
   announcement:
@@ -204,7 +205,8 @@ export const RoomSemiInfo = {
   title: '하윙 방',
   roomImage: 'https://~',
   level: 3,
-  exp: 6,
+  currentExp: 4,
+  totalExp: 80,
   roomType: 'MORNING',
   certifyTime: 7,
   currentUserCount: 6,

diff --git a/src/core/types/Room.ts b/src/core/types/Room.ts
@@ -8,7 +8,8 @@ export type RoomInfo = {
   certifyTime: number;
   completePercentage: number;
   currentUserCount: number;
-  exp: number;
+  currentExp: number;
+  totalExp: number;
   level: number;
   managerNickName: string;
   maxUserCount: number;
@@ -30,10 +31,11 @@ export type RoomSemiInfo = {
   certifiedRanks: RankMemberSemi[];
   certifyTime: number;
   currentUserCount: number;
-  exp: number;
+  currentExp: number;
+  totalExp: number;
   level: number;
   maxUserCount: number;
-  roomImage: 'https://image.moabam.com/moabam/default/room-level-00.png';
+  roomImage: string;
   roomType: DayType;
   routines: { routineId: number; content: string }[];
 };