Merge pull request #17 from su-its/feat/backend/api/v1

Feat/backend/api/v1

Author: h-takeyeah

typing-server/api/cmd/main.go

@@ -14,6 +14,8 @@ import (
 	"time"
 
 	"github.com/go-sql-driver/mysql"
+	"github.com/su-its/typing/typing-server/api/handler"
+	"github.com/su-its/typing/typing-server/api/router"
 	"github.com/su-its/typing/typing-server/domain/repository/ent"
 	"github.com/su-its/typing/typing-server/domain/repository/ent/user"
 )
@@ -54,6 +56,7 @@ func main() {
 		return
 	}
 	defer entClient.Close()
+	handler.SetEntClient(entClient)
 	logger.Info("ent client is opened")
 
 	// スキーマの作成
@@ -65,7 +68,7 @@ func main() {
 
 	// シードデータの挿入
 	if *seedFlag {
-		if err := seedData(context.Background(), entClient); err != nil {
+		if err := seedData(context.Background(), entClient, logger); err != nil {
 			logger.Error("failed to seed data: %v", err)
 			return
 		}
@@ -86,7 +89,14 @@ func main() {
 	go func() {
 		defer wg.Done() // 関数終了時にWaitGroupをデクリメント
 		// サーバーの設定
-		server := &http.Server{Addr: ":8080"}
+		// ルーティングの設定
+		r := router.SetupRouter()
+
+		// サーバーの設定
+		server := &http.Server{
+			Addr:    ":8080",
+			Handler: r,
+		}
 		// 非同期でサーバーを開始
 		go func() {
 			logger.Info("server is running at Addr :8080")
@@ -115,42 +125,77 @@ func main() {
 	logger.Info("server exited")
 }
 
-// TODO: 本番環境では削除する
-func seedData(ctx context.Context, client *ent.Client) error {
+func seedData(ctx context.Context, client *ent.Client, logger *slog.Logger) error {
 	// シードデータの作成
 	for i := 0; i < 10; i++ {
-		isAlreadySeeded, err := client.User.Query().Where(user.StudentNumber(fmt.Sprintf("user%d", i+1))).Exist(ctx)
+		studentNumber := fmt.Sprintf("user%d", i+1)
+		handleName := fmt.Sprintf("handle%d", i+1)
+
+		isAlreadySeeded, err := client.User.Query().Where(user.StudentNumber(studentNumber)).Exist(ctx)
 		if err != nil {
 			return err
 		}
 		if isAlreadySeeded {
+			logger.Info("User with student number already seeded, skipping", slog.String("studentNumber", studentNumber))
 			continue
 		}
 
 		u, err := client.User.Create().
-			SetStudentNumber(fmt.Sprintf("user%d", i+1)).
-			SetHandleName(fmt.Sprintf("handle%d", i+1)).
+			SetStudentNumber(studentNumber).
+			SetHandleName(handleName).
 			Save(ctx)
 		if err != nil {
 			panic(err)
 		}
 
+		logger.Info("Created user", slog.String("studentNumber", studentNumber), slog.String("handleName", handleName))
+
+		var maxKeystrokesScore, maxAccuracyScore *ent.Score
+
 		for j := 0; j < 5; j++ {
-			score, err := client.Score.Create().
-				SetKeystrokes(rand.Intn(200)).
-				SetAccuracy(rand.Float64()).
+			keystrokes := rand.Intn(200) + 100
+			accuracy := rand.Float64()
+
+			s, err := client.Score.Create().
+				SetKeystrokes(keystrokes).
+				SetAccuracy(accuracy).
 				SetCreatedAt(time.Now()).
+				SetUser(u).
 				Save(ctx)
 			if err != nil {
 				panic(err)
 			}
 
-			_, err = client.User.UpdateOne(u).
-				AddScores(score).Save(ctx)
+			logger.Info("Created score", slog.Int("keystrokes", keystrokes), slog.Float64("accuracy", accuracy), slog.String("studentNumber", studentNumber))
+
+			if s.Keystrokes < 120 || s.Accuracy < 0.95 {
+				continue
+			}
+
+			if maxKeystrokesScore == nil || s.Keystrokes > maxKeystrokesScore.Keystrokes {
+				maxKeystrokesScore = s
+			}
+			if maxAccuracyScore == nil || s.Accuracy > maxAccuracyScore.Accuracy {
+				maxAccuracyScore = s
+			}
+		}
+
+		// 最大のKeystrokesスコアと最大のAccuracyスコアのフラグを設定
+		if maxKeystrokesScore != nil {
+			err = maxKeystrokesScore.Update().SetIsMaxKeystrokes(true).Exec(ctx)
 			if err != nil {
-				panic(err)
+				return err
 			}
+			logger.Info("Set is_max_keystrokes flag", slog.Int("keystrokes", maxKeystrokesScore.Keystrokes), slog.String("studentNumber", studentNumber))
+		}
+		if maxAccuracyScore != nil {
+			err = maxAccuracyScore.Update().SetIsMaxAccuracy(true).Exec(ctx)
+			if err != nil {
+				return err
+			}
+			logger.Info("Set is_max_accuracy flag", slog.Float64("accuracy", maxAccuracyScore.Accuracy), slog.String("studentNumber", studentNumber))
 		}
 	}
+
 	return nil
 }

typing-server/api/controller/system/health.go

@@ -0,0 +1,14 @@
+package handler
+
+import (
+	"log/slog"
+	"net/http"
+)
+
+func HealthCheck(w http.ResponseWriter, r *http.Request) {
+	w.WriteHeader(http.StatusOK)
+	_, err := w.Write([]byte("API is running"))
+	if err != nil {
+		slog.Error("failed to write response: %v", err)
+	}
+}

typing-server/api/handler/health.go

@@ -0,0 +1,9 @@
+package handler
+
+import "github.com/su-its/typing/typing-server/domain/repository/ent"
+
+var entClient *ent.Client
+
+func SetEntClient(client *ent.Client) {
+	entClient = client
+}

typing-server/api/handler/options.go

@@ -0,0 +1,76 @@
+package handler
+
+import (
+	"encoding/json"
+	"net/http"
+	"strconv"
+
+	"github.com/google/uuid"
+	"github.com/su-its/typing/typing-server/api/service"
+)
+
+func GetScoresRanking(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+
+	sortBy := r.URL.Query().Get("sort_by")
+	if sortBy == "" {
+		sortBy = "keystrokes"
+	}
+
+	startStr := r.URL.Query().Get("start")
+	start, err := strconv.Atoi(startStr)
+	if err != nil {
+		start = 1
+	}
+
+	limitStr := r.URL.Query().Get("limit")
+	limit, err := strconv.Atoi(limitStr)
+	if err != nil {
+		limit = 10
+	}
+
+	rankings, err := service.GetScoresRanking(ctx, entClient, sortBy, start, limit)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	err = json.NewEncoder(w).Encode(rankings)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+}
+
+func PostScore(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+
+	userIDStr := r.URL.Query().Get("user_id")
+	userID, err := uuid.Parse(userIDStr)
+	if err != nil {
+		http.Error(w, "Invalid user_id", http.StatusBadRequest)
+		return
+	}
+
+	keystrokesStr := r.URL.Query().Get("keystrokes")
+	keystrokes, err := strconv.Atoi(keystrokesStr)
+	if err != nil {
+		http.Error(w, "Invalid keystrokes", http.StatusBadRequest)
+		return
+	}
+
+	accuracyStr := r.URL.Query().Get("accuracy")
+	accuracy, err := strconv.ParseFloat(accuracyStr, 64)
+	if err != nil {
+		http.Error(w, "Invalid accuracy", http.StatusBadRequest)
+		return
+	}
+
+	if err := service.CreateScore(ctx, entClient, userID, keystrokes, accuracy); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusCreated)
+}

typing-server/api/handler/score.go

@@ -0,0 +1,31 @@
+package handler
+
+import (
+	"encoding/json"
+	"net/http"
+
+	"github.com/su-its/typing/typing-server/api/service"
+)
+
+func GetUser(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+
+	studentNumber := r.URL.Query().Get("student_number")
+	if studentNumber == "" {
+		http.Error(w, "student_number is required", http.StatusBadRequest)
+		return
+	}
+
+	user, err := service.GetUserByStudentNumber(ctx, entClient, studentNumber)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	err = json.NewEncoder(w).Encode(user)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+}