generated from VLADIMIR/template
fix actions count
This commit is contained in:
@@ -167,6 +167,14 @@ func (s *AnswerService) GetGameAnswers(ctx context.Context, gameId int) (*GameAn
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
teamIds := make([]int, 0, len(teams))
|
||||||
|
for _, team := range teams {
|
||||||
|
teamIds = append(teamIds, team.ID)
|
||||||
|
}
|
||||||
|
actionsCountByTeamIDs, err := s.actionsRepo.GetActionsCountByTeamIDs(ctx, teamIds)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
rows, err := s.answersRepo.GetAnswersByGameID(ctx, gameId)
|
rows, err := s.answersRepo.GetAnswersByGameID(ctx, gameId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@@ -199,8 +207,10 @@ func (s *AnswerService) GetGameAnswers(ctx context.Context, gameId int) (*GameAn
|
|||||||
}
|
}
|
||||||
answers = append(answers, AnswerScore{QuestionCode: question.Code})
|
answers = append(answers, AnswerScore{QuestionCode: question.Code})
|
||||||
}
|
}
|
||||||
|
mappedTeam := game_model.MapTeam(team)
|
||||||
|
mappedTeam.ActionsCount = actionsCountByTeamIDs[team.ID]
|
||||||
teamAnswers = append(teamAnswers, TeamAnswers{
|
teamAnswers = append(teamAnswers, TeamAnswers{
|
||||||
Team: game_model.MapTeam(team),
|
Team: mappedTeam,
|
||||||
Answers: answers,
|
Answers: answers,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ func TestServicesLifecyclePostgres(t *testing.T) {
|
|||||||
}
|
}
|
||||||
grading, err := answers.GetGameAnswers(ctx, id)
|
grading, err := answers.GetGameAnswers(ctx, id)
|
||||||
check(err)
|
check(err)
|
||||||
if len(grading.Teams) != 1 || grading.Teams[0].Answers[0].Score == nil || *grading.Teams[0].Answers[0].Score != 5 {
|
if len(grading.Teams) != 1 || grading.Teams[0].Team.ActionsCount != 1 || grading.Teams[0].Answers[0].Score == nil || *grading.Teams[0].Answers[0].Score != 5 {
|
||||||
t.Fatal("reset removed answers or scores")
|
t.Fatal("reset removed answers or scores")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user