fix: 오류 수정

- 예약 물품 조회 시 인터넷 예약만 조회됨 -> 모든 예약물품 조회

frontend/admin/src/components/Wrapper/GlobalError.tsx

@@ -1,10 +1,10 @@
-import React, { useEffect, useState } from 'react'
-import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
-import { useSnackbar } from 'notistack'
-import { errorStateAtom } from '@stores'
-import { useRecoilState } from 'recoil'
 import CustomAlert from '@components/CustomAlert'
 import { ButtonProps } from '@material-ui/core/Button'
+import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'
+import { errorStateAtom } from '@stores'
+import { useSnackbar } from 'notistack'
+import React, { useEffect, useState } from 'react'
+import { useRecoilState } from 'recoil'
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
@@ -39,7 +39,7 @@ const GlobalError = () => {
     if (errorState.error) {
       if (errorState.status === 400) {
         const errors = errorState.errors.map(item => {
-          return item.defaultMessage
+          return item.defaultMessage || item.message
         })
 
         setAlertState({

frontend/admin/src/pages/reserve-item/index.tsx

@@ -205,6 +205,7 @@ const ReserveItem = (props: ReserveItemProps) => {
     categoryId:
       keywordState?.categoryId !== 'all' ? keywordState?.categoryId : null,
     isUse: Boolean(handlePopup),
+    isPopup: Boolean(handlePopup),
   })
 
   //목록 조회

frontend/admin/src/service/ReserveItem.ts

@@ -106,6 +106,7 @@ interface ReserveItemSearchPayload extends SearchPayload {
   locationId?: string
   categoryId?: string
   isUse?: boolean
+  isPopup?: boolean
 }
 
 export const reserveItemService = {
@@ -117,6 +118,7 @@ export const reserveItemService = {
     locationId,
     categoryId,
     isUse = false,
+    isPopup = false,
   }: ReserveItemSearchPayload) => {
     return useSWR<Page, AxiosError>(
       [
@@ -126,6 +128,7 @@ export const reserveItemService = {
         locationId,
         categoryId,
         isUse,
+        isPopup,
       ],
       url =>
         common.fetcher(url, {
@@ -134,6 +137,7 @@ export const reserveItemService = {
           locationId,
           categoryId,
           isUse,
+          isPopup,
         }),
 
       { revalidateOnFocus: false, errorRetryCount: 0 },

frontend/admin/src/stores/error.ts

@@ -1,6 +1,6 @@
+import { DEFAULT_ERROR_MESSAGE } from '@constants'
 import { AxiosError } from 'axios'
 import { atom, DefaultValue, selector } from 'recoil'
-import { DEFAULT_ERROR_MESSAGE } from '@constants'
 
 /**
  * Global error 상태관리
@@ -10,6 +10,7 @@ interface IErrors {
   defaultMessage: string
   field: string
   rejectedValue?: string
+  message?: string
 }
 
 export interface IErrorProps {

frontend/portal/src/components/Reserve/ReserveItemAdditional.tsx

@@ -27,6 +27,10 @@ const ReserveItemAdditional = ({ data }: ReserveItemAdditionalPropps) => {
             <dt>{t('reserve_item.contact')}</dt>
             <dd>{data.contact}</dd>
           </dl>
+          <dl>
+            <dt>{'주소'}</dt>
+            <dd>{data.address}</dd>
+          </dl>
         </div>
       )}
       <h4>{t('reserve_item.manager')}</h4>

frontend/portal/src/components/Reserve/ReserveItemInfo.tsx

@@ -27,6 +27,10 @@ const ReserveItemInfo = ({ data, reserveStatus }: ReserveItemInfoProps) => {
             <dt>{t('reserve_item.name')}</dt>
             <dd>{data.reserveItemName}</dd>
           </dl>
+          <dl>
+            <dt>{'예약방법'}</dt>
+            <dd>{data.reserveMethodName}</dd>
+          </dl>
           <dl>
             <dt>{`${t('reserve.count')}/${t('reserve.number_of_people')}`}</dt>
             <dd>{data.totalQty}</dd>

frontend/portal/src/pages/auth/logout/index.tsx

@@ -21,7 +21,6 @@ export const getServerSideProps: GetServerSideProps = async ({
   res,
   query,
 }) => {
-  console.log(query)
   if (!process.browser) {
     const Cookies = require('cookies')
     const cookies = new Cookies(req, res)

frontend/portal/src/pages/reserve/[category]/[id].tsx

@@ -37,7 +37,7 @@ const ReserveDetail = ({ initData }: ReserveDetailProps) => {
       },
     ]
 
-    if (initData?.isPossible) {
+    if (initData?.isPossible && initData?.reserveMethodId === 'internet') {
       buttons.push({
         id: 'item-edit-button',
         title: t('reserve_item.request'),

frontend/portal/src/pages/user/leave/index.tsx

@@ -40,7 +40,6 @@ const UserLeave = () => {
 
   // 탈퇴 처리
   const leave = async (data: IVerification) => {
-    console.log('leave', data)
     try {
       const result = await userService.leave(data)
       if (result === true) {

frontend/portal/src/pages/user/reserve/index.tsx

@@ -22,7 +22,7 @@ import { conditionAtom, conditionValue, userAtom } from '@stores'
 import { rownum } from '@utils'
 import { GetServerSideProps } from 'next'
 import { useRouter } from 'next/router'
-import React, { createRef, useEffect, useMemo, useState } from 'react'
+import React, { createRef, useMemo, useState } from 'react'
 import { TFunction, useTranslation } from 'react-i18next'
 import { useRecoilValue } from 'recoil'
 
@@ -239,12 +239,6 @@ const UserReserve = (props: UserReserveProps) => {
       keywordState?.categoryId !== 'all' ? keywordState?.categoryId : null,
   })
 
-  useEffect(() => {
-    if (data) {
-      console.log(data)
-    }
-  }, [data])
-
   const handleSearch = () => {
     if (page === 0) {
       mutate(data, false)

frontend/portal/src/service/Reserve.ts

@@ -147,6 +147,7 @@ export const reserveService = {
           locationId,
           categoryId,
           isUse: true,
+          isPopup: false,
         }),
       { revalidateOnFocus: false, errorRetryCount: 0 },
     ),