From 4aaf37a133734bd1ef3bf3529218e76065b5f201 Mon Sep 17 00:00:00 2001
From: iOdiO89 <117376841+iOdiO89@users.noreply.github.com>
Date: Wed, 4 Sep 2024 15:01:55 +0900
Subject: [PATCH 1/7] chore: delete S3 deploy yml

---
 .github/workflows/s3Deploy.yml | 37 ----------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 .github/workflows/s3Deploy.yml

diff --git a/.github/workflows/s3Deploy.yml b/.github/workflows/s3Deploy.yml
deleted file mode 100644
index 8899043..0000000
--- a/.github/workflows/s3Deploy.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: eollugage-pc Deploy To S3
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  publish-eollugage-pc:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 21
-
-      - name: Put Env
-        run: echo ${{ secrets.ENV }} > .env
-
-      - name: Install dependencies
-        run: yarn install
-
-      - name: Build React
-        run: yarn env-build
-
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v2
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ap-northeast-2
-
-      - name: Upload to S3
-        run: aws s3 sync --region ap-northeast-2 ./build s3://s3-eollugage-pc --delete

From 3095ca161d6c289d3602a64b04b07dff9284043a Mon Sep 17 00:00:00 2001
From: iOdiO89 <117376841+iOdiO89@users.noreply.github.com>
Date: Wed, 4 Sep 2024 15:22:37 +0900
Subject: [PATCH 2/7] =?UTF-8?q?fix:=20PATCH=20=ED=9B=84=20=EB=B0=94?=
 =?UTF-8?q?=EB=A1=9C=20GET=20=EC=95=88=20=EB=90=98=EB=8A=94=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/paymentHistory.ts       | 2 +-
 src/hooks/apis/paymentHistory.ts | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/apis/paymentHistory.ts b/src/apis/paymentHistory.ts
index 902ba5a..19ae768 100644
--- a/src/apis/paymentHistory.ts
+++ b/src/apis/paymentHistory.ts
@@ -23,7 +23,7 @@ export interface OrderHistory {
 type PaymentHistoryStatus = 'WAITING' | 'PROCESS' | 'HISTORY'
 type OrderHistoryStatus = 'APPROVED' | 'PENDING' | 'DISAPPROVED' | 'HISTORY'
 
-async function getPaymentHistory(storeId: string, status?: string, filter: string = 'ALL'): Promise<PaymentHistory[]> {
+async function getPaymentHistory(storeId: string, filter: string, status?: string): Promise<PaymentHistory[]> {
   const statusQuery = status ? `&status=${status}` : ''
   const { data } = await api.get(`/api/v1/stores/${storeId}/payment-histories?filter=${filter}${statusQuery}`)
   return data
diff --git a/src/hooks/apis/paymentHistory.ts b/src/hooks/apis/paymentHistory.ts
index cf3bfe4..2ae2fdd 100644
--- a/src/hooks/apis/paymentHistory.ts
+++ b/src/hooks/apis/paymentHistory.ts
@@ -18,9 +18,9 @@ function useGetWaitingOrder() {
 
   const { data, isLoading } = useQuery({
     queryKey: ['getWaitingOrder'],
-    queryFn: () => getPaymentHistory(storeId),
     refetchInterval: 5000,
     refetchIntervalInBackground: true,
+    queryFn: () => getPaymentHistory(storeId, 'ALL'),
   })
 
   useEffect(() => {
@@ -38,12 +38,12 @@ function useGetWaitingOrder() {
   return { data, isLoading }
 }
 
-function useGetPaymentHistory(status: string, filter?: string) {
+function useGetPaymentHistory(status: string, filter: string = 'ALL') {
   const [storeId] = useAtom(storeIdAtom)
 
   const { data, isLoading } = useQuery({
     queryKey: ['getPaymentHistory', status, filter],
-    queryFn: () => getPaymentHistory(storeId, status, filter),
+    queryFn: () => getPaymentHistory(storeId, filter, status),
   })
 
   return { data, isLoading }
@@ -69,7 +69,8 @@ function usePatchPaymentHistory(tableNumber?: number) {
       patchPaymentHistory(storeId, paymentHistoryId, orderHistoryId, status),
     onSuccess: () => {
       setModalShow(false)
-      queryClient.invalidateQueries({ queryKey: ['getPaymentHistory', 'getWaitingOrder'] })
+      queryClient.invalidateQueries({ queryKey: ['getWaitingOrder'] })
+      queryClient.invalidateQueries({ queryKey: ['getPaymentHistory', 'PROCESS', 'ALL'] })
     },
     onError: (error, variables) => {
       const axiosError = error as AxiosError

From f1d0c1ee5e4d248f2c589fb54df902ad40f03238 Mon Sep 17 00:00:00 2001
From: iOdiO89 <117376841+iOdiO89@users.noreply.github.com>
Date: Wed, 4 Sep 2024 16:47:10 +0900
Subject: [PATCH 3/7] =?UTF-8?q?chore:=20meta=20data=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index ae43a8c..c7b09e0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Web site created using create-react-app" />
+    <meta name="description" content="얼루가게 PC입니다." />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a

From 472d85ed06e73e1aafbff679e1bc953a2831d125 Mon Sep 17 00:00:00 2001
From: iOdiO89 <117376841+iOdiO89@users.noreply.github.com>
Date: Thu, 5 Sep 2024 23:31:43 +0900
Subject: [PATCH 4/7] =?UTF-8?q?refactor:=20=ED=83=AD=EC=95=8C=EB=A6=BC?=
 =?UTF-8?q?=EA=B0=9C=EC=88=98=20=EA=B3=84=EC=82=B0=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/apis/paymentHistory.ts | 16 ++++------------
 src/utils/atom.ts                |  1 +
 src/utils/getAlarmCount.ts       | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 src/utils/getAlarmCount.ts

diff --git a/src/hooks/apis/paymentHistory.ts b/src/hooks/apis/paymentHistory.ts
index 2ae2fdd..9f44483 100644
--- a/src/hooks/apis/paymentHistory.ts
+++ b/src/hooks/apis/paymentHistory.ts
@@ -6,16 +6,13 @@ import { modalDetailAtom, modalShowAtom, processCountAtom, storeIdAtom, waitingC
 import { AxiosError } from 'axios'
 import { useNavigate } from 'react-router-dom'
 import { ROUTE } from 'constants/path'
-import orderSound from 'assets/sound/newOrder.mp3'
-import useSound from 'use-sound'
+import { getProcessCount, getWaitingCount } from 'utils/getAlarmCount'
 
 function useGetWaitingOrder() {
   const [storeId] = useAtom(storeIdAtom)
   const [, setWaitingCount] = useAtom(waitingCountAtom)
   const [, setProcessCount] = useAtom(processCountAtom)
 
-  const [soundPlay] = useSound(orderSound)
-
   const { data, isLoading } = useQuery({
     queryKey: ['getWaitingOrder'],
     refetchInterval: 5000,
@@ -25,15 +22,10 @@ function useGetWaitingOrder() {
 
   useEffect(() => {
     if (data) {
-      // prettier-ignore
-      const waitingCount = data?.reduce((acc, cur) => acc + cur.orderHistoryResponseDtoList.filter(order => order.status === 'PENDING').length, 0) ?? 0
-      if (waitingCount > 0) soundPlay()
-      setWaitingCount(waitingCount)
-
-      setProcessCount(data?.reduce((acc, cur) => acc + (cur.status === 'PROCESS' ? 1 : 0), 0) ?? 0)
+      setWaitingCount(getWaitingCount(data))
+      setProcessCount(getProcessCount(data))
     }
-    // eslint-disable-next-line
-  }, [data])
+  }, [data, setWaitingCount, setProcessCount])
 
   return { data, isLoading }
 }
diff --git a/src/utils/atom.ts b/src/utils/atom.ts
index 84ec137..bd7daa3 100644
--- a/src/utils/atom.ts
+++ b/src/utils/atom.ts
@@ -7,6 +7,7 @@ currentTabAtom.debugLabel = 'currentTabAtom'
 
 export const waitingCountAtom = atom<number>(0)
 export const processCountAtom = atom<number>(0)
+waitingCountAtom.debugLabel = 'waitingCountAtom'
 
 export const storeIdAtom = atomWithStorage('Store ID', '')
 storeIdAtom.debugLabel = 'storeIdAtom'
diff --git a/src/utils/getAlarmCount.ts b/src/utils/getAlarmCount.ts
new file mode 100644
index 0000000..be1e0f5
--- /dev/null
+++ b/src/utils/getAlarmCount.ts
@@ -0,0 +1,14 @@
+import { PaymentHistory } from 'apis/paymentHistory'
+
+export function getWaitingCount(data: PaymentHistory[]) {
+  return (
+    data?.reduce(
+      (acc, cur) => acc + cur.orderHistoryResponseDtoList.filter(order => order.status === 'PENDING').length,
+      0,
+    ) ?? 0
+  )
+}
+
+export function getProcessCount(data: PaymentHistory[]) {
+  return data?.reduce((acc, cur) => acc + (cur.status === 'PROCESS' ? 1 : 0), 0) ?? 0
+}

From c9fb21acf6e2f385f116ca30aa6cd81dad703397 Mon Sep 17 00:00:00 2001
From: iOdiO89 <117376841+iOdiO89@users.noreply.github.com>
Date: Thu, 5 Sep 2024 23:32:01 +0900
Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=EC=8A=B9=EC=9D=B8=EB=8C=80=EA=B8=B0?=
 =?UTF-8?q?=20=ED=83=AD=EC=97=90=EC=84=9C=EB=A7=8C=20=ED=9A=A8=EA=B3=BC?=
 =?UTF-8?q?=EC=9D=8C=20=EB=B0=9C=EC=83=9D=ED=95=98=EB=8D=98=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layout.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/components/layout.tsx b/src/components/layout.tsx
index 2b7fbdb..4b56198 100644
--- a/src/components/layout.tsx
+++ b/src/components/layout.tsx
@@ -5,6 +5,9 @@ import { useAtom } from 'jotai'
 import { currentTabAtom, modalDetailAtom, modalShowAtom, processCountAtom, waitingCountAtom } from 'utils/atom'
 import { ROUTE } from 'constants/path'
 import Modal from './modal'
+import { useEffect } from 'react'
+import useSound from 'use-sound'
+import orderSound from 'assets/sound/newOrder.mp3'
 
 export default function Layout() {
   const navigate = useNavigate()
@@ -39,6 +42,16 @@ export default function Layout() {
     navigate(pathname)
   }
 
+  const [playSound] = useSound(orderSound)
+  useEffect(() => {
+    let interval: NodeJS.Timeout | null = null
+    if (waitingCount > 0) interval = setInterval(playSound, 5000)
+
+    return () => {
+      if (interval) clearInterval(interval)
+    }
+  }, [waitingCount])
+
   return (
     <Container>
       {modalShow && (

From 6864dac83b8c9a8f3683c2bc6d601dcfd0a69de4 Mon Sep 17 00:00:00 2001
From: iOdiO89 <117376841+iOdiO89@users.noreply.github.com>
Date: Thu, 5 Sep 2024 23:50:04 +0900
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20Order=20Card=20=EC=B4=9D=20=EA=B0=9C?=
 =?UTF-8?q?=EC=88=98,=20=EA=B0=80=EA=B2=A9=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/orderCard.tsx | 10 +++++++++-
 src/pages/process.tsx        |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/orderCard.tsx b/src/components/orderCard.tsx
index f07f939..ad02a6e 100644
--- a/src/components/orderCard.tsx
+++ b/src/components/orderCard.tsx
@@ -73,6 +73,14 @@ export default function OrderCard({
     setModalShow(true)
   }
 
+  const getOrderCount = () => {
+    const currentOrderCount = orders.reduce((acc, cur) => acc + cur.count, 0)
+    // prettier-ignore
+    const prevOrdersCount = prevOrders?.reduce((acc, cur) => acc + cur.reduce((acc2, cur2) => acc2 + cur2.count, 0), 0) ?? 0
+
+    return currentOrderCount + prevOrdersCount
+  }
+
   return (
     <Container>
       <Top>
@@ -88,7 +96,7 @@ export default function OrderCard({
         </TimeText>
       </Top>
       <OrderSummary>
-        메뉴 {orders.length}개 총 {totalPrice.toLocaleString()}원
+        메뉴 {getOrderCount()}개 총 {totalPrice.toLocaleString()}원
       </OrderSummary>
       <OrderDetail orders={orders} />
       {!(pathname === ROUTE.HISTORY_MAIN && status === 'single') && <Divider />}
diff --git a/src/pages/process.tsx b/src/pages/process.tsx
index 25804ae..57f3f09 100644
--- a/src/pages/process.tsx
+++ b/src/pages/process.tsx
@@ -53,7 +53,7 @@ export default function ProcessMain() {
                 status={orders.orderHistoryResponseDtoList.length > 1 ? 'multi' : 'single'}
                 tableNumber={orders.tableNumber}
                 time={returnLatestTime(orders)}
-                totalPrice={returnTotalPrice(parseOrder(orders.orderHistoryResponseDtoList[0].orderDetail))}
+                totalPrice={orders.totalPrice}
                 orders={parseOrder(orders.orderHistoryResponseDtoList[0].orderDetail)}
                 prevOrders={returnPrevOrders(orders)}
               />

From 523638abbed58892b0841280c334046d686aec46 Mon Sep 17 00:00:00 2001
From: iOdiO89 <117376841+iOdiO89@users.noreply.github.com>
Date: Thu, 5 Sep 2024 23:54:22 +0900
Subject: [PATCH 7/7] refactor: remove unnecessary dependency

---
 src/components/layout.tsx        |  2 +-
 src/hooks/apis/paymentHistory.ts | 12 ++++++------
 src/pages/process.tsx            |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/layout.tsx b/src/components/layout.tsx
index 4b56198..2954bbd 100644
--- a/src/components/layout.tsx
+++ b/src/components/layout.tsx
@@ -50,7 +50,7 @@ export default function Layout() {
     return () => {
       if (interval) clearInterval(interval)
     }
-  }, [waitingCount])
+  }, [waitingCount, playSound])
 
   return (
     <Container>
diff --git a/src/hooks/apis/paymentHistory.ts b/src/hooks/apis/paymentHistory.ts
index 9f44483..9746f4f 100644
--- a/src/hooks/apis/paymentHistory.ts
+++ b/src/hooks/apis/paymentHistory.ts
@@ -8,6 +8,12 @@ import { useNavigate } from 'react-router-dom'
 import { ROUTE } from 'constants/path'
 import { getProcessCount, getWaitingCount } from 'utils/getAlarmCount'
 
+interface PatchParameterType {
+  orderHistoryId: string
+  paymentHistoryId: string
+  status: string
+}
+
 function useGetWaitingOrder() {
   const [storeId] = useAtom(storeIdAtom)
   const [, setWaitingCount] = useAtom(waitingCountAtom)
@@ -49,12 +55,6 @@ function usePatchPaymentHistory(tableNumber?: number) {
   const [, setModalShow] = useAtom(modalShowAtom)
   const [, setModalDetail] = useAtom(modalDetailAtom)
 
-  interface PatchParameterType {
-    orderHistoryId: string
-    paymentHistoryId: string
-    status: string
-  }
-
   const { mutate } = useMutation({
     mutationKey: ['patchPaymentHistory'],
     mutationFn: ({ orderHistoryId, paymentHistoryId, status }: PatchParameterType) =>
diff --git a/src/pages/process.tsx b/src/pages/process.tsx
index 57f3f09..52895a7 100644
--- a/src/pages/process.tsx
+++ b/src/pages/process.tsx
@@ -5,7 +5,7 @@ import { useGetPaymentHistory } from 'hooks/apis/paymentHistory'
 import { useAtom } from 'jotai'
 import { Container, CardContainer, TabTitle, Loading } from 'styles/shared'
 import { processCountAtom } from 'utils/atom'
-import { parseOrder, returnTotalPrice } from 'utils/order'
+import { parseOrder } from 'utils/order'
 import { OrbitProgress } from 'react-loading-indicators'
 
 export default function ProcessMain() {