スコアがないお題の処理

jphacks · Nov 14, 2024 · 9b0c853 · 9b0c853
1 parent 4602157
commit 9b0c853
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/app/src/app/api/score/assignment/[id]/route.ts b/app/src/app/api/score/assignment/[id]/route.ts
@@ -26,9 +26,9 @@ export async function GET(req: NextRequest) {
 		include: { user: true, assignment: true },
 	});
 
-	if (!scores[0].assignment){
-		return new Response(JSON.stringify({ message: "Not Found" }), {
-			status: 404,
+	if (!scores[0]?.assignment){
+		return new Response(JSON.stringify({}), {
+			status: 200,
 			headers: { "Content-Type": "application/json" },
 		});
 	}
@@ -37,8 +37,6 @@ export async function GET(req: NextRequest) {
 		where: { id: scores[0].assignment.wordId },
 	});
 
-
-
 	const scoreDetails: ScoreDetail[] = scores.map((score) => {
 		if(!score.assignment){
 			return {

diff --git a/app/src/app/ranking/page.tsx b/app/src/app/ranking/page.tsx
@@ -24,12 +24,13 @@ export default function RankingPage() {
 				const response = await fetch("api/assignment/today");
 				const data: todayAssignment[] = await response.json();
 				setTopics(data);
-				setSelectedTopic(data[0].assignmentId);
+				if (data.length > 0) {
+					setSelectedTopic(data[0].assignmentId); // 初期値を設定
+				}
 			} catch (error) {
 				console.error("Error fetching topics:", error);
 			}
 		};
-
 		fetchTopics();
 	}, []);
 

diff --git a/app/src/components/view/ranking/RankingListToday.tsx b/app/src/components/view/ranking/RankingListToday.tsx
@@ -63,13 +63,26 @@ const RankingListToday: React.FC<{ selectedTopic: number }> = ({
 			}
 		};
 
-		fetchData(getDate());
+		if (selectedTopic !== 0) {
+			fetchData(getDate());
+		}
 	}, [selectedTopic, getDate]);
 
 	if (isLoading) {
 		return <LoadingSpinner />;
 	}
 
+	if (!Array.isArray(data) || data.length === 0) {
+		return (
+			<div
+				className="flex items-center justify-center h-40 text-lg text-orange-500"
+			>
+				まだ投稿がありません！<br />
+				1位になれるかも!
+			</div>
+		);
+	}
+
 	return (
 		<div className="mt-4 space-y-4">
 			{data.map((item, index) => {