Merge branch 'develop' into release/2

Author: bearl27

README.md

@@ -15,5 +15,5 @@ type StartGameResult struct {
 }
 
 type CheckAnswerRequest struct {
-	Answer string `json:"answer" binding:"required"`
+	Answer string `json:"answer" binding:"required,max=200"`
 }

backend/dto/game.go

@@ -15,6 +15,7 @@ type IHintRepository interface {
 	BookmarkRound(id uint) error
 	GetRandomBookmarkedRound() (*models.Round, error)
 	GetAllBookmarkedRounds() ([]models.Round, error)
+	GetRecentAnswers(limit int) ([]string, error)
 }
 
 type HintRepository struct {
@@ -79,3 +80,17 @@ func (r *HintRepository) GetAllBookmarkedRounds() ([]models.Round, error) {
 	}
 	return rounds, nil
 }
+
+func (r *HintRepository) GetRecentAnswers(limit int) ([]string, error) {
+	var rounds []models.Round
+	if err := r.db.Order("created_at desc").Limit(limit).Find(&rounds).Error; err != nil {
+		return nil, err
+	}
+	answers := make([]string, 0, len(rounds))
+	for _, round := range rounds {
+		if len(round.Answers) > 0 {
+			answers = append(answers, round.Answers[0])
+		}
+	}
+	return answers, nil
+}

backend/repositories/hint_repository.go

@@ -15,13 +15,17 @@ import (
 	"google.golang.org/genai"
 )
 
-const MinRoundAnswerRevealDuration = 90 * time.Second
+const (
+	MinRoundAnswerRevealDuration = 90 * time.Second
+	RecentAnswersLimit           = 30
+)
 
 var (
-	ErrRoundNotFound    = errors.New("round not found")
-	ErrRoundNotFinished = errors.New("round is not finished yet")
-	ErrRoundTooEarly    = errors.New("game has not been played long enough")
-	ErrBookmarkNotFound = errors.New("bookmark not found")
+	ErrRoundNotFound      = errors.New("round not found")
+	ErrRoundNotFinished   = errors.New("round is not finished yet")
+	ErrRoundTooEarly      = errors.New("game has not been played long enough")
+	ErrBookmarkNotFound   = errors.New("bookmark not found")
+	ErrNoAnswersAvailable = errors.New("no answers available")
 )
 
 type IHintService interface {
@@ -53,7 +57,23 @@ func (s *HintService) StartGame() (*dto.StartGameResult, error) {
 		return nil, fmt.Errorf("failed to create Gemini client: %w", err)
 	}
 
-	const prompt = `
+	// 過去の出題済みお題を取得（直近30件）
+	pastAnswers, err := s.repository.GetRecentAnswers(RecentAnswersLimit)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get recent answers: %w", err)
+	}
+
+	excludeSection := ""
+	if len(pastAnswers) > 0 {
+		excludeSection = fmt.Sprintf(`
+
+		# 禁止お題
+		以下のお題は過去に出題済みなので、絶対に使わないでください：
+		%s
+`, strings.Join(pastAnswers, "、"))
+	}
+
+	const basePrompt = `
 		# Role
 		あなたは京都(上品・皮肉)と大阪(効率・本音)の個性を完璧に描き分ける脚本家であり、厳密なJSONデータを出力するシステムです。
 
@@ -169,10 +189,12 @@ func (s *HintService) StartGame() (*dto.StartGameResult, error) {
 		},
 	}
 
+	fullPrompt := basePrompt + excludeSection
+
 	res, err := client.Models.GenerateContent(
 		ctx,
 		"gemini-2.5-flash",
-		genai.Text(prompt),
+		genai.Text(fullPrompt),
 		config,
 	)
 	if err != nil {
@@ -186,8 +208,6 @@ func (s *HintService) StartGame() (*dto.StartGameResult, error) {
 
 	text := res.Text()
 
-	fmt.Println(text)
-
 	if err := json.Unmarshal([]byte(text), &geminiData); err != nil {
 		return nil, fmt.Errorf("JSONパースに失敗しました: %w (raw: %s)", err, text)
 	}
@@ -221,6 +241,9 @@ func (s *HintService) GetAnswer(id uint) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	if len(round.Answers) == 0 {
+		return "", fmt.Errorf("%w: id=%d", ErrNoAnswersAvailable, id)
+	}
 	if !round.IsFinished {
 		if time.Since(round.CreatedAt) < MinRoundAnswerRevealDuration {
 			return "", fmt.Errorf("%w", ErrRoundTooEarly)
@@ -257,6 +280,9 @@ func (s *HintService) GetFinishedRoundByID(id uint) (*dto.RoundResponse, error)
 	if !round.IsFinished {
 		return nil, fmt.Errorf("%w: id=%d", ErrRoundNotFinished, id)
 	}
+	if len(round.Answers) == 0 {
+		return nil, fmt.Errorf("%w: id=%d", ErrNoAnswersAvailable, id)
+	}
 	result := &dto.RoundResponse{
 		ID:        round.ID,
 		Answer:    round.Answers[0],
@@ -274,6 +300,9 @@ func (s *HintService) BookmarkRound(id uint) (*dto.RoundResponse, error) {
 	if !round.IsFinished {
 		return nil, fmt.Errorf("%w: id=%d", ErrRoundNotFinished, id)
 	}
+	if len(round.Answers) == 0 {
+		return nil, fmt.Errorf("%w: id=%d", ErrNoAnswersAvailable, id)
+	}
 	if err := s.repository.BookmarkRound(id); err != nil {
 		return nil, fmt.Errorf("failed to bookmark round: %w", err)
 	}
@@ -295,6 +324,9 @@ func (s *HintService) GetRandomBookmark() (*dto.RoundResponse, error) {
 		return nil, ErrBookmarkNotFound
 	}
 
+	if len(round.Answers) == 0 {
+		return nil, ErrNoAnswersAvailable
+	}
 	return &dto.RoundResponse{
 		ID:        round.ID,
 		Answer:    round.Answers[0],
@@ -312,6 +344,9 @@ func (s *HintService) GetBookmarkedList() ([]dto.RoundResponse, error) {
 	response := []dto.RoundResponse{}
 
 	for _, r := range rounds {
+		if len(r.Answers) == 0 {
+			continue
+		}
 		limit := 4
 		if len(r.Hints) < limit {
 			limit = len(r.Hints)

backend/services/hint_service.go

@@ -36,7 +36,7 @@ function App() {
 						onClick={() => navigate("/board")}
 						className="title-base-button btn-story"
 					>
-						共有されたストーリー見る
+						みんなのストーリーを見る
 					</Button>
 				</div>
 			</Paper>

frontend/src/App.tsx

@@ -1,6 +1,6 @@
 .board-page-container {
 	width: 100%;
-	height: 100vh;
+	height: 100dvh;
 	margin: 0;
 	padding: 20px 40px;
 	display: flex;
@@ -51,13 +51,50 @@
 
 .loading-container {
 	width: 100%;
-	height: 100vh;
+	height: 100dvh;
 	display: flex;
+	flex-direction: column;
 	justify-content: center;
 	align-items: center;
 	font-size: 24px;
 	color: #555;
 	background-color: #f5f5f5;
+	gap: 12px;
+}
+
+.error-icon-container {
+	width: 80px;
+	height: 80px;
+	border-radius: 50%;
+	overflow: hidden;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: #ffffff;
+	box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
+	border: 3px solid #fff;
+	margin-bottom: 8px;
+}
+
+.error-icon-container img {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+	transform: scale(1.7);
+}
+
+.error-message {
+	font-size: 16px;
+	font-weight: 600;
+	color: #666;
+	margin: 0;
+}
+
+.error-actions {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+	margin-top: 8px;
 }
 
 /* Material Design Color Tokens */

frontend/src/Board/Board.css

@@ -111,6 +111,18 @@
 	align-items: center;
 }
 
+.board-card-story-id {
+	display: inline-block;
+	background-color: #fff4e6;
+	color: #ed6c02;
+	font-size: 0.7rem;
+	font-weight: 700;
+	letter-spacing: 0.03em;
+	padding: 2px 10px;
+	border-radius: 12px;
+	margin-bottom: 10px;
+}
+
 .board-card-date {
 	color: #999;
 	font-size: 0.75rem;
@@ -133,21 +145,66 @@
 	background-color: #faf7f2;
 }
 
-/* --- 空状態 --- */
+/* --- 空状態・エラー状態 --- */
 .board-list-empty {
 	min-height: 100vh;
 	display: flex;
 	flex-direction: column;
 	justify-content: center;
 	align-items: center;
-	gap: 20px;
+	gap: 12px;
 	background-color: #faf7f2;
 	color: #888;
 	font-size: 1.1rem;
 }
 
+.board-list-empty .error-icon-container {
+	width: 80px;
+	height: 80px;
+	border-radius: 50%;
+	overflow: hidden;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: #ffffff;
+	box-shadow: 0 4px 15px rgba(0, 0, 0, 0.1);
+	border: 3px solid #fff;
+	margin-bottom: 4px;
+}
+
+.board-list-empty .error-icon-container img {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+	transform: scale(1.7);
+}
+
+.board-list-empty .error-message {
+	font-size: 16px;
+	font-weight: 600;
+	color: #666;
+	margin: 0;
+}
+
+.board-list-empty .error-actions {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+	margin-top: 4px;
+}
+
 .board-list-back-button {
 	background-color: #ed6c02 !important;
+	color: #ffffff !important;
+	text-transform: none !important;
+	font-weight: bold !important;
+	border-radius: 8px !important;
+}
+
+.board-list-back-button-outlined {
+	background-color: #ffffff !important;
+	color: #ed6c02 !important;
+	border: 1px solid #ed6c02 !important;
 	text-transform: none !important;
 	font-weight: bold !important;
 	border-radius: 8px !important;

frontend/src/Board/BoardList.css

@@ -43,18 +43,25 @@ function BoardList() {
 	const [rounds, setRounds] = useState<Round[]>([]);
 	// ローディング状態
 	const [isLoading, setIsLoading] = useState(true);
+	// エラー状態
+	const [fetchError, setFetchError] = useState(false);
 
 	// ページ表示時にAPIからデータを取得する
 	useEffect(() => {
 		const fetchRounds = async () => {
 			try {
 				const response = await fetch("/api/solo/bookmark/all");
+				if (!response.ok) {
+					throw new Error(`サーバーエラー: ${response.status}`);
+				}
 				const data: ApiResponse = await response.json();
 
-				// results配列をそのままセット
-				setRounds(data.results);
+				const sortedRounds = data.results.sort((a, b) => b.id - a.id);
+				setRounds(sortedRounds);
+				// results配列を降順にセット
 			} catch (error) {
 				console.error("ラウンド一覧の取得に失敗しました:", error);
+				setFetchError(true);
 			} finally {
 				setIsLoading(false);
 			}
@@ -80,6 +87,34 @@ function BoardList() {
 		return <div className="board-list-loading">読み込み中...</div>;
 	}
 
+	// エラー時の表示
+	if (fetchError) {
+		return (
+			<div className="board-list-empty">
+				<div className="error-icon-container">
+					<img src="/Image/Kyoto.jpg" alt="Error" />
+				</div>
+				<p className="error-message">データの読み込みに失敗しました</p>
+				<div className="error-actions">
+					<Button
+						variant="contained"
+						onClick={() => window.location.reload()}
+						className="board-list-back-button"
+					>
+						もう一度試す
+					</Button>
+					<Button
+						variant="outlined"
+						onClick={() => navigate("/")}
+						className="board-list-back-button-outlined"
+					>
+						タイトルに戻る
+					</Button>
+				</div>
+			</div>
+		);
+	}
+
 	// データが空の場合の表示
 	if (rounds.length === 0) {
 		return (
@@ -120,6 +155,9 @@ function BoardList() {
 						className="board-card"
 						onClick={() => navigate(`/board/${round.id}`)}
 					>
+						{/* ストーリーID */}
+						<div className="board-card-story-id">ストーリー #{round.id}</div>
+
 						{/* ヒントのプレビュー（チャット形式で最初の数個を表示） */}
 						<div className="board-card-hints">
 							{round.hints.slice(0, PREVIEW_HINT_COUNT).map((hint, index) => (