Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 70 additions & 2 deletions app/(admin)/admin/detail/[id]/sincerity-temp/page.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,71 @@
export default function SincerityTempPage() {
return <div>SincerityTempPage</div>;
import {
dehydrate,
HydrationBoundary,
QueryClient,
} from '@tanstack/react-query';
import { getSincerityTemperatureHistoryInServer } from '@/features/admin/api/sincerity-temperature-history.server';
import { GetSincerityTemperatureHistoryResponse } from '@/features/admin/api/types';
import SincerityTempTable from '@/features/admin/ui/sincerity-temp-table';
import { getSincerityPresetByLevelName } from '@/shared/config/sincerity-temp-presets';

const LEVEL_NAME_MAP = {
FIRST: '1단계',
SECOND: '2단계',
THIRD: '3단계',
FOURTH: '4단계',
};

export default async function SincerityTempPage({
params,
}: {
params: Promise<{ id: string }>;
}) {
const queryClient = new QueryClient();
const { id } = await params;

const memberId = Number(id);

// 서버 side에서 첫 페이지 데이터 미리 가져오기
await queryClient.prefetchQuery({
queryKey: ['sincerityTemperatureHistory', memberId, 1], // "sincerityTemperatureHistory", memberId, page
queryFn: () =>
getSincerityTemperatureHistoryInServer({
memberId,
page: 1,
}),
});

const data: GetSincerityTemperatureHistoryResponse =
await queryClient.getQueryData([
'sincerityTemperatureHistory',
memberId,
1,
]);

const temperPreset = getSincerityPresetByLevelName(
LEVEL_NAME_MAP[data.sincerityTempLevel],
);

return (
<HydrationBoundary state={dehydrate(queryClient)}>
<div className="flex flex-col gap-300">
<div className="border-border-default rounded-100 flex w-full flex-col gap-200 border p-200">
<span className="font-designer-16b text-text-default">
현재 성실 온도
</span>

<div className="flex items-center">
<temperPreset.Icon className="h-400 w-400" />
<span
className={`${temperPreset.textClass} font-designer-14b pl-[2px]`}
>
{data.currentSincerityTemperature} ℃
</span>
</div>
</div>

<SincerityTempTable memberId={memberId} />
</div>
</HydrationBoundary>
);
}
3 changes: 3 additions & 0 deletions public/icons/trending-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions public/icons/trending-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions src/features/admin/api/sincerity-temperature-history.server.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { axiosServerInstance } from '@/shared/tanstack-query/axios.server';
import {
GetSincerityTemperatureHistoryRequest,
GetSincerityTemperatureHistoryResponse,
} from './types';

// 성실 온도 이력 조회 API 요청 함수
export const getSincerityTemperatureHistoryInServer = async ({
memberId,
page = 1,
}: GetSincerityTemperatureHistoryRequest): Promise<GetSincerityTemperatureHistoryResponse> => {
const queryString = `page=${page}&page-size=10`;

const res = await axiosServerInstance.get(
`/admin/members/${memberId}/sincerity-temperature-histories?${queryString}`,
);

return res.data.content;
};
19 changes: 19 additions & 0 deletions src/features/admin/api/sincerity-temperature-history.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { axiosInstance } from '@/shared/tanstack-query/axios';
import {
GetSincerityTemperatureHistoryRequest,
GetSincerityTemperatureHistoryResponse,
} from './types';

// 성실 온도 이력 조회 API 요청 함수
export const getSincerityTemperatureHistory = async ({
memberId,
page = 1,
}: GetSincerityTemperatureHistoryRequest): Promise<GetSincerityTemperatureHistoryResponse> => {
const queryString = `page=${page}&page-size=10`;

const res = await axiosInstance.get(
`/admin/members/${memberId}/sincerity-temperature-histories?${queryString}`,
);

return res.data.content;
};
31 changes: 31 additions & 0 deletions src/features/admin/api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ export type RoleId = 'ROLE_MEMBER' | 'ROLE_ADMIN' | 'ROLE_MENTOR';
type RoleName = '일반' | '관리자' | '멘토';
export type MemberStatus = 'ACTIVE' | 'PAUSED' | 'PERM_BAN' | 'DORMANT';

// 사용자 리스트 조회 API 요청 타입
export interface GetMemberListRequest {
roleId?: RoleId;
memberStatus?: MemberStatus;
searchKeyword?: string;
page?: number;
}

// 사용자 리스트 조회 API 응답 타입
export interface GetMemberListResponse {
page: number;
size: number;
Expand All @@ -29,10 +31,12 @@ export interface GetMemberListResponse {
}[];
}

// 사용자 계정 이력 조회 API 요청 타입
export interface GetAccountHistoriesRequest {
memberId: number;
}

// 사용자 계정 이력 조회 API 응답 타입
export interface GetAccountHistoriesResponse {
memberId: number;
joinedAt: string;
Expand All @@ -50,12 +54,39 @@ export interface GetAccountHistoriesResponse {
}[];
}

// 사용자 상태 변경 API 요청 타입
export interface ChangeMemberStatusRequest {
memberId: number;
to: MemberStatus;
}

// 사용자 권한 변경 API 요청 타입
export interface ChangeMemberRoleRequest {
memberId: number;
roleId: RoleId;
}

// 성실 온도 이력 조회 API 요청 타입
export interface GetSincerityTemperatureHistoryRequest {
memberId: number;
page: number;
}

// 성실 온도 이력 조회 API 응답 타입
export interface GetSincerityTemperatureHistoryResponse {
currentSincerityTemperature: number;
sincerityTempLevel: 'FIRST' | 'SECOND' | 'THIRD' | 'FOURTH';
sincerityTemperatureHistory: {
content: {
reasonType: 'STUDY_REVIEW';
increment: number;
recordedAt: string;
}[];
page: number;
size: number;
totalElements: number;
totalPages: number;
hasNext: boolean;
hasPrevious: boolean;
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { useQuery } from '@tanstack/react-query';
import { getSincerityTemperatureHistory } from '../api/sincerity-temperature-history';
import { GetSincerityTemperatureHistoryRequest } from '../api/types';

export const useGetSincerityTemperatureHistoryQuery = ({
memberId,
page,
}: GetSincerityTemperatureHistoryRequest) => {
return useQuery({
queryKey: ['sincerityTemperatureHistory', memberId, page],
queryFn: () =>
getSincerityTemperatureHistory({
memberId,
page,
}),
});
};
82 changes: 82 additions & 0 deletions src/features/admin/ui/sincerity-temp-table.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
'use client';

import { useState } from 'react';
import { formatYYYYMMDD } from '@/shared/lib/time';
import Pagination from '@/shared/ui/pagination';
import TrendingDown from 'public/icons/trending-down.svg';
import TrendingUp from 'public/icons/trending-up.svg';
import { useGetSincerityTemperatureHistoryQuery } from '../model/use-sincerity-temperature-history-query';

interface SincerityTempTableProps {
memberId: number;
}

export default function SincerityTempTable({
memberId,
}: SincerityTempTableProps) {
const [page, setPage] = useState<number>(1);

const { data } = useGetSincerityTemperatureHistoryQuery({
memberId,
page,
});

const sincerityTemperatureHistory = data?.sincerityTemperatureHistory.content;

return (
<>
<div className="border-border-default rounded-100 flex w-full flex-col gap-200 border p-200">
<span className="font-designer-16b text-text-default">
성실온도 내역
</span>

<div className="flex w-full flex-col gap-200">
{sincerityTemperatureHistory?.length > 0 ? (
sincerityTemperatureHistory.map((history, idx) => (
<div className="flex items-start gap-150" key={idx}>
<div className="w-[100px]">
<span className="font-designer-16r text-text-subtle">
{history.reasonType === 'STUDY_REVIEW' ? '스터디 리뷰' : ''}
</span>
<span className="font-designer-14r text-text-subtlest">
{formatYYYYMMDD(history.recordedAt)}
</span>
</div>

<div className="flex items-center">
{history.increment > 0 ? (
<>
<span className="text-text-information font-designer-14b">
+{history.increment}℃
</span>
<TrendingUp />
</>
) : (
<>
<span className="text-text-error font-designer-14b">
{history.increment}℃
</span>
<TrendingDown />
</>
)}
</div>
</div>
))
) : (
<div className="font-designer-14r text-text-subtlest py-100 text-center">
성실 온도 내역이 없습니다.
</div>
)}
</div>
</div>

<Pagination
className="mt-300"
page={page}
onChangePage={setPage}
totalPages={data?.sincerityTemperatureHistory.totalPages || 1}
middleButtonCount={4}
/>
</>
);
}