細かい部分をきれいにした

Author: proelbtn

vmdb-api/controller.go

@@ -93,8 +93,8 @@ func (c *Controller) getAnswerID(w http.ResponseWriter, r *http.Request) {
 
 	latestAnswer, err := c.repo.findLatestAnswerFor(
 		ctx,
-		problemEnvironment.ProblemID.String(),
-		problemEnvironment.TeamID.String(),
+		problemEnvironment.ProblemID,
+		problemEnvironment.TeamID,
 	)
 	if err != nil {
 		slog.ErrorContext(ctx, "failed to find latest Answer", "error", err)
@@ -118,9 +118,9 @@ func (c *Controller) getAnswerID(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-type listLatestUnconfirmedAnswersForLocalProblemResponse []answerResponse
+type listUnconfirmedAnswersForLocalProblemResponse []answerResponse
 
-func (c *Controller) listLatestUnconfirmedAnswersForLocalProblem(w http.ResponseWriter, r *http.Request) {
+func (c *Controller) listUnscoredAnswersForLocalProblem(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
 	config, err := c.repo.findConfigBy(ctx, "local_problem_codes")
@@ -137,7 +137,7 @@ func (c *Controller) listLatestUnconfirmedAnswersForLocalProblem(w http.Response
 		return
 	}
 
-	response := listLatestUnconfirmedAnswersForLocalProblemResponse{}
+	response := listUnconfirmedAnswersForLocalProblemResponse{}
 	for _, code := range strings.Split(value, ",") {
 		code = strings.TrimSpace(code)
 
@@ -147,24 +147,14 @@ func (c *Controller) listLatestUnconfirmedAnswersForLocalProblem(w http.Response
 			continue
 		}
 
-		answers, err := c.repo.listLatestUnscoredAnswersFor(ctx, problem.ID)
+		answers, err := c.repo.listUnscoredAnswersFor(ctx, problem.ID)
 		if err != nil {
 			slog.ErrorContext(ctx, "failed to list latest unconfirmed Answers", "error", err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
 
-		latestAnswers := map[uuid.UUID]Answer{}
 		for _, answer := range answers {
-			if _, ok := latestAnswers[answer.TeamID]; !ok {
-				latestAnswers[answer.TeamID] = answer
-			}
-			if answer.CreatedAt.After(latestAnswers[answer.TeamID].CreatedAt) {
-				latestAnswers[answer.TeamID] = answer
-			}
-		}
-
-		for _, answer := range latestAnswers {
 			response = append(response, newAnswerResponseFrom(answer, *problem))
 		}
 	}

vmdb-api/main.go

@@ -80,7 +80,7 @@ func (c *Command) RunE(cmd *cobra.Command, _ []string) error {
 	r.Get("/problem-environments", controller.listProblemEnvironments)
 	r.Get("/answer-id", controller.getAnswerID)
 
-	r.Get("/local-problem-answers", controller.listLatestUnconfirmedAnswersForLocalProblem)
+	r.Get("/local-problem-answers", controller.listUnscoredAnswersForLocalProblem)
 	r.Get("/answers/{answerID}", controller.getAnswerInformation)
 
 	server := Server{

vmdb-api/repository.go

@@ -9,9 +9,6 @@ import (
 	"github.com/uptrace/bun"
 )
 
-// ignoredTeams is a list of teams that should be ignored by exporter.
-var ignoredTeams = []string{"staff", "team99", "audience"}
-
 type Repository struct {
 	db *bun.DB
 }
@@ -83,22 +80,21 @@ func (r *Repository) findAnswerBy(ctx context.Context, answerID uuid.UUID) (*Ans
 	return &result, nil
 }
 
-func (r *Repository) listLatestUnscoredAnswersFor(ctx context.Context, problemID uuid.UUID) ([]Answer, error) {
+func (r *Repository) listUnscoredAnswersFor(ctx context.Context, problemID uuid.UUID) ([]Answer, error) {
 	var result []Answer
 	err := r.db.NewSelect().ColumnExpr("answers.*").
 		Table("answers").
 		Join("INNER JOIN scores").JoinOn("answers.id = scores.answer_id").
-		Where("point IS NULL").
 		Where("problem_id = ?", problemID).
-		Order("created_at DESC").
+		Where("point IS NULL").
 		Scan(ctx, &result)
 	if err != nil {
 		return nil, err
 	}
 	return result, nil
 }
 
-func (r *Repository) findLatestAnswerFor(ctx context.Context, problemID, teamID string) (*Answer, error) {
+func (r *Repository) findLatestAnswerFor(ctx context.Context, problemID uuid.UUID, teamID uuid.UUID) (*Answer, error) {
 	var result Answer
 	err := r.db.NewSelect().Model(&result).
 		Where("team_id = ?", teamID).