Merge pull request #36 from janog-netcon/add-endpoints-for-local-problems

Add endpoints for local problems

Author: proelbtn

vmdb-api/controller.go

@@ -63,7 +63,7 @@ func (c *Controller) getAnswerID(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	latestAnswer, err := c.repo.findLatestUnconfirmedAnswerBy(
+	latestAnswer, err := c.repo.findLatestAnswerFor(
 		ctx,
 		problemEnvironment.ProblemID.String(),
 		problemEnvironment.TeamID.String(),
@@ -129,7 +129,7 @@ func (c *Controller) listLatestUnconfirmedAnswersForLocalProblem(w http.Response
 			continue
 		}
 
-		answers, err := c.repo.listLatestUnconfirmedAnswersFor(ctx, problem.ID)
+		answers, err := c.repo.listLatestUnscoredAnswersFor(ctx, problem.ID)
 		if err != nil {
 			slog.ErrorContext(ctx, "failed to list latest unconfirmed Answers", "error", err)
 			w.WriteHeader(http.StatusInternalServerError)

vmdb-api/repository.go

@@ -61,23 +61,24 @@ func (r *Repository) findProblemBy(ctx context.Context, code string) (*Problem,
 	return &result, nil
 }
 
-func (r *Repository) listLatestUnconfirmedAnswersFor(ctx context.Context, problemID uuid.UUID) ([]Answer, error) {
+func (r *Repository) listLatestUnscoredAnswersFor(ctx context.Context, problemID uuid.UUID) ([]Answer, error) {
 	var result []Answer
-	err := r.db.NewSelect().Model(&result).
-		Where("confirming = ?", false).
+	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").
-		Scan(ctx)
+		Scan(ctx, &result)
 	if err != nil {
 		return nil, err
 	}
 	return result, nil
 }
 
-func (r *Repository) findLatestUnconfirmedAnswerBy(ctx context.Context, problemID, teamID string) (*Answer, error) {
+func (r *Repository) findLatestAnswerFor(ctx context.Context, problemID, teamID string) (*Answer, error) {
 	var result Answer
 	err := r.db.NewSelect().Model(&result).
-		Where("confirming = ?", false).
 		Where("team_id = ?", teamID).
 		Where("problem_id = ?", problemID).
 		Order("created_at DESC").