Skip to content

Commit b94a086

Browse files
authored
Merge pull request #302 from boostcampwm-2024/dev-front
[FE] 데이터 요청 수정
2 parents 8c9606d + 446f0da commit b94a086

File tree

2 files changed

+38
-32
lines changed

2 files changed

+38
-32
lines changed

frontend/src/hook/api/useRankData.ts

+7-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,14 @@ import {
77
import { useSuspenseQuery } from '@tanstack/react-query';
88

99
export default function useRankData(rankType: string, generation: string) {
10+
const now = new Date();
11+
const tomorrowMidnight = new Date();
12+
tomorrowMidnight.setHours(24, 0, 0, 0);
13+
const timeUntilMidnight = tomorrowMidnight.getTime() - now.getTime();
14+
1015
const queryOptions = {
11-
staleTime: 3600000,
12-
gcTime: 86400000
16+
staleTime: tomorrowMidnight.getTime(),
17+
gcTime: timeUntilMidnight
1318
};
1419

1520
switch (rankType) {

frontend/src/hook/api/useTotalDatas.ts

+31-30
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,40 @@ import {
55
getDailyDifferenceTraffic,
66
getTotalElapsedTime
77
} from '@api/get/MainPage';
8-
import { useSuspenseQuery } from '@tanstack/react-query';
8+
import { useSuspenseQueries } from '@tanstack/react-query';
99

1010
export default function useTotalDatas(generation: string) {
11-
const { data: trafficData } = useSuspenseQuery({
12-
queryKey: ['totalTraffic', generation],
13-
queryFn: () => getTotalTrafficCount(generation)
14-
});
15-
16-
const { data: projectData } = useSuspenseQuery({
17-
queryKey: ['totalProjectCount', generation],
18-
queryFn: () => getTotalProjectCount(generation)
19-
});
20-
21-
const { data: responseData } = useSuspenseQuery({
22-
queryKey: ['totalResponseRate', generation],
23-
queryFn: () => getTotalResponseRate(generation)
24-
});
25-
26-
const { data: dailyDifferenceTraffic } = useSuspenseQuery({
27-
queryKey: ['dailyDifferenceTraffic', generation],
28-
queryFn: () => getDailyDifferenceTraffic(generation)
29-
});
30-
31-
const { data: elapsedTime } = useSuspenseQuery({
32-
queryKey: ['elapsedTime', generation],
33-
queryFn: () => getTotalElapsedTime(generation)
34-
});
11+
const [trafficResult, projectResult, responseResult, dailyDifferenceResult, elapsedTimeResult] =
12+
useSuspenseQueries({
13+
queries: [
14+
{
15+
queryKey: ['totalTraffic', generation],
16+
queryFn: () => getTotalTrafficCount(generation)
17+
},
18+
{
19+
queryKey: ['totalProjectCount', generation],
20+
queryFn: () => getTotalProjectCount(generation)
21+
},
22+
{
23+
queryKey: ['totalResponseRate', generation],
24+
queryFn: () => getTotalResponseRate(generation)
25+
},
26+
{
27+
queryKey: ['dailyDifferenceTraffic', generation],
28+
queryFn: () => getDailyDifferenceTraffic(generation)
29+
},
30+
{
31+
queryKey: ['elapsedTime', generation],
32+
queryFn: () => getTotalElapsedTime(generation)
33+
}
34+
]
35+
});
3536

3637
return {
37-
totalTraffic: trafficData.count,
38-
totalProjectCount: projectData.count,
39-
totalResponseRate: responseData.success_rate,
40-
dailyDifferenceTraffic: dailyDifferenceTraffic.traffic_daily_difference,
41-
elapsedTime: elapsedTime.avg_elapsed_time
38+
totalTraffic: trafficResult.data.count,
39+
totalProjectCount: projectResult.data.count,
40+
totalResponseRate: responseResult.data.success_rate,
41+
dailyDifferenceTraffic: dailyDifferenceResult.data.traffic_daily_difference,
42+
elapsedTime: elapsedTimeResult.data.avg_elapsed_time
4243
};
4344
}

0 commit comments

Comments
 (0)