Skip to content

Commit 910ddf8

Browse files
Merge pull request #246 from ItRecode/FE-235
[FE-235] fix: ์˜ค๋Š˜๋ ˆ์ฝ”๋“œ api ๋ณ€๊ฒฝ์œผ๋กœ ์—ฐ๋™ ๊ตฌํ˜„ ์ˆ˜์ •
2 parents dadc6bb + 3eb0e43 commit 910ddf8

5 files changed

Lines changed: 11 additions & 42 deletions

File tree

โ€Žsrc/apis/myRecord.tsโ€Ž

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ import { AxiosResponse } from 'axios'
22
import { baseInstance } from './instance'
33
import {
44
IMemoryRecordList,
5-
IMyRecordByDateList,
5+
IMyRecord,
66
IMyRecordByKeywordList,
7-
IMyRecordRequestParam,
87
IRecordWithMonthYear,
98
} from 'types/myRecord'
109

@@ -24,18 +23,8 @@ export const getMemoryRecord = (
2423
})
2524
}
2625

27-
export const getRecordByDate = ({
28-
date,
29-
page,
30-
size,
31-
}: IMyRecordRequestParam): Promise<AxiosResponse<IMyRecordByDateList>> => {
32-
return baseInstance.get(`/record`, {
33-
params: {
34-
date,
35-
page,
36-
size,
37-
},
38-
})
26+
export const getRecordOnToday = (): Promise<AxiosResponse<IMyRecord>> => {
27+
return baseInstance.get(`/record/today`)
3928
}
4029

4130
export const getRecordByKeyword = (

โ€Žsrc/pages/DetailRecord/DetailRecord.tsxโ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ export default function DetailRecord() {
189189
onCancel={() => setIsDelete(false)}
190190
onConfirm={() => {
191191
deleteRecordById(POST_ID)
192-
navigate('/myrecord')
192+
navigate(-1)
193193
}}
194194
/>
195195
)}

โ€Žsrc/react-query/hooks/useMemoryRecord.tsโ€Ž

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
import { QUERY_KEYS } from '@react-query/queryKeys'
22
import { useInfiniteQuery } from '@tanstack/react-query'
33
import { getMemoryRecord } from '@apis/myRecord'
4-
import { useState } from 'react'
54

65
export const useMemoryRecord = () => {
7-
const [pageCount, setPageCount] = useState(0)
8-
96
const {
107
data: memoryRecord = null,
118
isLoading,
129
hasNextPage,
1310
fetchNextPage,
1411
isFetchingNextPage,
1512
} = useInfiniteQuery({
16-
queryKey: [QUERY_KEYS.memoryRecord, pageCount],
13+
queryKey: [QUERY_KEYS.memoryRecord],
1714
queryFn: async ({ pageParam = 0 }) => await getMemoryRecord(pageParam),
1815
getNextPageParam: (lastPage): number | null => {
1916
const { data, config } = lastPage
@@ -22,12 +19,6 @@ export const useMemoryRecord = () => {
2219
}
2320
return null
2421
},
25-
retry: false,
26-
onSuccess: ({ pages }) => {
27-
if (pages[0]) {
28-
setPageCount(pages[0].data.totalCount)
29-
}
30-
},
3122
})
3223

3324
return {
Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
1+
import { getRecordOnToday } from '@apis/myRecord'
12
import { QUERY_KEYS } from '@react-query/queryKeys'
23
import { useQuery } from '@tanstack/react-query'
3-
import { getRecordByDate } from '@apis/myRecord'
4-
import { getFormattedDate } from '@utils/getFormattedDate'
54
import { useState } from 'react'
65

76
export const useMyRecordByDate = () => {
87
const [todayRecordId, setTodayRecordId] = useState<number | null>(null)
9-
const today = new Date()
108

11-
const { data: records = null, isLoading } = useQuery(
9+
const { data: record = null, isLoading } = useQuery(
1210
[QUERY_KEYS.myRecord, todayRecordId],
13-
async () =>
14-
await getRecordByDate({
15-
date: getFormattedDate(today, 'hyphen'),
16-
page: 0,
17-
size: 1,
18-
}),
11+
async () => await getRecordOnToday(),
1912
{
2013
retry: false,
2114
onSuccess: ({ data }) => {
22-
if (data.totalCount) {
23-
setTodayRecordId(data.recordByDateDtos[0].recordId)
15+
if (data) {
16+
setTodayRecordId(data.recordId)
2417
} else {
2518
setTodayRecordId(null)
2619
}
@@ -29,7 +22,7 @@ export const useMyRecordByDate = () => {
2922
)
3023

3124
return {
32-
todayRecord: records?.data.recordByDateDtos[0],
25+
todayRecord: record?.data,
3326
isLoading,
3427
}
3528
}

โ€Žsrc/types/myRecord.tsโ€Ž

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ export interface IMyRecord {
2727
createdAt: string
2828
}
2929

30-
export interface IMyRecordByDateList extends PaginationResponse {
31-
recordByDateDtos: IMyRecord[]
32-
}
33-
3430
export interface IMyRecordByKeywordList extends PaginationResponse {
3531
recordBySearchDtos: IMyRecord[]
3632
}

0 commit comments

Comments
ย (0)