Feat/nagi/247 fix backend n plus one

.gitignore

@@ -26,3 +26,6 @@ api/lib/interface
 api/env/*
 api/seeds/*
 web/prod/*
+
+# Claude Code working files
+.claude/

api/lib/internals/repository/abstract/abstract_repository.go

@@ -4,11 +4,14 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"os"
 
 	"github.com/NUTFes/SeeFT/api/lib/externals/db"
 	"github.com/pkg/errors"
 )
 
+var debugSQL = os.Getenv("DEBUG_SQL") == "1"
+
 type abstractRepository struct {
 	client db.Client
 }
@@ -28,13 +31,17 @@ func (a abstractRepository) Read(ctx context.Context, query string) (*sql.Rows,
 	if err != nil {
 		return nil, errors.Wrapf(err, "cannot connect SQL")
 	}
-	fmt.Printf("\x1b[36m%s\n", query)
+	if debugSQL {
+		fmt.Printf("\x1b[36m%s\n", query)
+	}
 	return rows, nil
 }
 
 func (a abstractRepository) ReadByID(ctx context.Context, query string) (*sql.Row, error) {
 	row := a.client.DB().QueryRowContext(ctx, query)
-	fmt.Printf("\x1b[36m%s\n", query)
+	if debugSQL {
+		fmt.Printf("\x1b[36m%s\n", query)
+	}
 	return row, nil
 }
 
@@ -43,7 +50,9 @@ func (a abstractRepository) UpdateDB(ctx context.Context, query string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Printf("\x1b[36m%s\n", query)
+	if debugSQL {
+		fmt.Printf("\x1b[36m%s\n", query)
+	}
 	return err
 }
 

api/lib/internals/repository/session_repository.go

@@ -3,10 +3,14 @@ package repository
 import (
 	"context"
 	"database/sql"
-	"github.com/NUTFes/SeeFT/api/lib/externals/db"
 	"fmt"
+	"os"
+
+	"github.com/NUTFes/SeeFT/api/lib/externals/db"
 )
 
+var sessionDebugSQL = os.Getenv("DEBUG_SQL") == "1"
+
 
 type sessionRepository struct {
 	client db.Client
@@ -30,7 +34,9 @@ func (r *sessionRepository) Create(c context.Context, userID string, accessToken
 	if err != nil {
 		return err
 	}
-	fmt.Printf("\x1b[36m%s\n", query)
+	if sessionDebugSQL {
+		fmt.Printf("\x1b[36m%s\n", query)
+	}
 	return nil
 }
 
@@ -42,15 +48,19 @@ func (r *sessionRepository) Delete(c context.Context, accessToken string) error
 	if err != nil {
 		return err
 	}
-	fmt.Printf("\x1b[36m%s\n", query)
+	if sessionDebugSQL {
+		fmt.Printf("\x1b[36m%s\n", query)
+	}
 	return nil
 }
 
 // アクセストークンからセッションを取得
 func (r *sessionRepository) FindSessionByAccessToken(c context.Context, accessToken string) *sql.Row {
 	query := "select * from session where access_token = '" + accessToken + "'"
 	row := r.client.DB().QueryRowContext(c, query)
-	fmt.Printf("\x1b[36m%s\n", query)
+	if sessionDebugSQL {
+		fmt.Printf("\x1b[36m%s\n", query)
+	}
 	return row
 }
 
@@ -61,6 +71,8 @@ func (r *sessionRepository) DeleteByUserID(c context.Context, userID string) err
 	if err != nil {
 		return err
 	}
-	fmt.Printf("\x1b[36m%s\n", query)
+	if sessionDebugSQL {
+		fmt.Printf("\x1b[36m%s\n", query)
+	}
 	return nil
 }

api/lib/internals/repository/shift_repository.go

@@ -58,10 +58,10 @@ func (b *shiftRepository) User(c context.Context, id string) (*sql.Rows, error)
 	return rows, nil
 }
 
-// 特定のタスクのユーザ取得
+// 特定のタスクのユーザ取得（JOINでユーザー情報も一括取得）
 func (b *shiftRepository) Users(c context.Context, task string, year string, date string, time string, weather string) (*sql.Rows, error) {
-	query := "SELECT user_id FROM shifts WHERE task_id = " + task + " AND year_id = " + year + " AND date_id = " + date + " AND time_id = " + time + " AND weather_id = " + weather
-	rows, err := b.client.DB().QueryContext(c, query)
+	query := "SELECT u.id, u.name, u.mail, u.grade_id, u.department_id, u.bureau_id, u.role_id, u.student_number, u.tel, u.created_at, u.updated_at FROM shifts s JOIN users u ON s.user_id = u.id WHERE s.task_id = $1 AND s.year_id = $2 AND s.date_id = $3 AND s.time_id = $4 AND s.weather_id = $5"
+	rows, err := b.client.DB().QueryContext(c, query, task, year, date, time, weather)
 	if err != nil {
 		return nil, errors.Wrapf(err, "cannot connect SQL")
 	}

api/lib/internals/repository/task_repository.go

@@ -4,12 +4,16 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"os"
 
 	"github.com/NUTFes/SeeFT/api/lib/externals/db"
 	"github.com/NUTFes/SeeFT/api/lib/internals/repository/abstract"
+	"github.com/lib/pq"
 	"github.com/pkg/errors"
 )
 
+var taskDebugSQL = os.Getenv("DEBUG_SQL") != "0"
+
 type taskRepository struct {
 	client db.Client
 	crud   abstract.Crud
@@ -25,6 +29,7 @@ type TaskRepository interface {
 	FindNewRecord(context.Context) (*sql.Row, error)
 	FindByName(context.Context, string) (*sql.Row, error)
 	FindByUserID(context.Context, string) (*sql.Rows, error)
+	FindByNames(context.Context, []string) (*sql.Rows, error)
 }
 
 func NewTaskRepository(c db.Client, ac abstract.Crud) TaskRepository {
@@ -50,7 +55,9 @@ func (b *taskRepository) Shift(c context.Context, name string) (*sql.Rows, error
 	if err != nil {
 		return nil, errors.Wrapf(err, "cannot connect SQL")
 	}
-	fmt.Printf("\x1b[36m%s\n", query)
+	if taskDebugSQL {
+		fmt.Printf("\x1b[36m%s\n", query)
+	}
 	return rows, nil
 }
 
@@ -92,6 +99,18 @@ func (b *taskRepository) FindByName(c context.Context, name string) (*sql.Row, e
 	return b.client.DB().QueryRowContext(c, query), nil
 }
 
+// 複数のタスク名から一括でタスクを取得する（N+1問題対策）
+func (b *taskRepository) FindByNames(c context.Context, names []string) (*sql.Rows, error) {
+	if len(names) == 0 {
+		// 空の結果を返す
+		query := "SELECT * FROM tasks WHERE 1=0"
+		return b.client.DB().QueryContext(c, query)
+	}
+
+	query := "SELECT * FROM tasks WHERE task = ANY($1::text[])"
+	return b.client.DB().QueryContext(c, query, pq.Array(names))
+}
+
 // 指定したuserIDの全てのタスクを取得する
 func (b *taskRepository) FindByUserID(c context.Context, userID string) (*sql.Rows, error) {
 	query := `
@@ -101,7 +120,9 @@ func (b *taskRepository) FindByUserID(c context.Context, userID string) (*sql.Ro
 	WHERE s.user_id = $1
 	ORDER BY t.task
 	`
-	fmt.Printf("\x1b[36m%s\n", query)
+	if taskDebugSQL {
+		fmt.Printf("\x1b[36m%s\n", query)
+	}
 
 	return b.client.DB().QueryContext(c, query, userID)
 }

api/lib/internals/repository/user_repository.go

@@ -4,11 +4,15 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"os"
 
 	"github.com/NUTFes/SeeFT/api/lib/externals/db"
 	"github.com/NUTFes/SeeFT/api/lib/internals/repository/abstract"
+	"github.com/lib/pq"
 )
 
+var userDebugSQL = os.Getenv("DEBUG_SQL") != "0"
+
 type userRepository struct {
 	client db.Client
 	crud   abstract.Crud
@@ -23,6 +27,7 @@ type UserRepository interface {
 	Delete(context.Context, string) error
 	FindNewRecord(context.Context) (*sql.Row, error)
 	FindByName(context.Context, string) (*sql.Row, error)
+	FindByNames(context.Context, []string) (*sql.Rows, error)
 }
 
 func NewUserRepository(c db.Client, ac abstract.Crud) UserRepository {
@@ -45,7 +50,9 @@ func (ur *userRepository) Find(c context.Context, id string) (*sql.Row, error) {
 func (ur *userRepository) FindByStudentNumber(c context.Context, studentNumber string) *sql.Row {
 	query := "SELECT * FROM users WHERE student_number = " + studentNumber
 	row := ur.client.DB().QueryRowContext(c, query)
-	fmt.Printf("\x1b[36m%s\n", query)
+	if userDebugSQL {
+		fmt.Printf("\x1b[36m%s\n", query)
+	}
 	return row
 }
 
@@ -93,3 +100,15 @@ func (b *userRepository) FindByName(c context.Context, name string) (*sql.Row, e
 	query := "SELECT * FROM users WHERE name = '" + name + "'"
 	return b.client.DB().QueryRowContext(c, query), nil
 }
+
+// 複数のユーザー名から一括でユーザーを取得する（N+1問題対策）
+func (b *userRepository) FindByNames(c context.Context, names []string) (*sql.Rows, error) {
+	if len(names) == 0 {
+		// 空の結果を返す
+		query := "SELECT * FROM users WHERE 1=0"
+		return b.client.DB().QueryContext(c, query)
+	}
+
+	query := "SELECT * FROM users WHERE name = ANY($1::text[])"
+	return b.client.DB().QueryContext(c, query, pq.Array(names))
+}