-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/58-run-result-page
- Loading branch information
Showing
6 changed files
with
226 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import { Result } from '@mikuroxina/mini-fn'; | ||
| import { describe, expect, it } from 'vitest'; | ||
| import { TeamID } from '../../team/models/team'; | ||
| import { testRankingPreMatchData } from '../../testData/match'; | ||
| import { DummyPreMatchRepository } from '../adaptor/dummy/preMatchRepository'; | ||
| import { GenerateRankingService } from './generateRanking'; | ||
|
|
||
| describe('GenerateRankingService', () => { | ||
| const preMatchRepository = new DummyPreMatchRepository(testRankingPreMatchData); | ||
| const service = new GenerateRankingService(preMatchRepository); | ||
|
|
||
| it('部門ごとのランキングが正しく生成できる', async () => { | ||
| const res = await service.generatePreMatchRanking('elementary'); | ||
| expect(Result.isErr(res)).toBe(false); | ||
| expect(Result.unwrap(res)).toHaveLength(11); | ||
| }); | ||
|
|
||
| it('予選: 同じ順位の場合、ゴールタイムでソートする', async () => { | ||
| const expected = [ | ||
| { rank: 1, teamID: '1' as TeamID, points: 12, goalTimeSeconds: 60 }, | ||
| { rank: 2, teamID: '2' as TeamID, points: 10, goalTimeSeconds: 64 }, | ||
| { rank: 3, teamID: '3' as TeamID, points: 9, goalTimeSeconds: 70 }, | ||
| { rank: 4, teamID: '4' as TeamID, points: 7, goalTimeSeconds: 74 }, | ||
| { rank: 5, teamID: '5' as TeamID, points: 5, goalTimeSeconds: 80 }, | ||
| { rank: 6, teamID: '7' as TeamID, points: 4, goalTimeSeconds: 90 }, | ||
| { rank: 7, teamID: '6' as TeamID, points: 4, goalTimeSeconds: 100 }, | ||
| { rank: 8, teamID: '8' as TeamID, points: 1, goalTimeSeconds: 100 }, | ||
| { rank: 8, teamID: '9' as TeamID, points: 1, goalTimeSeconds: 100 }, | ||
| { rank: 9, teamID: '10' as TeamID, points: 0, goalTimeSeconds: Infinity }, | ||
| { rank: 9, teamID: '11' as TeamID, points: 0, goalTimeSeconds: Infinity }, | ||
| ]; | ||
|
|
||
| const res = await service.generatePreMatchRanking('elementary'); | ||
| expect(Result.isErr(res)).toBe(false); | ||
| expect(Result.unwrap(res)).toStrictEqual(expected); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| import { Result } from '@mikuroxina/mini-fn'; | ||
| import { DepartmentType } from 'config'; | ||
| import { TeamID } from '../../team/models/team'; | ||
| import { PreMatchRepository } from '../model/repository'; | ||
|
|
||
| export interface RankingDatum { | ||
| rank: number; | ||
| teamID: TeamID; | ||
| points: number; | ||
| goalTimeSeconds: number; | ||
| } | ||
|
|
||
| export class GenerateRankingService { | ||
| constructor(private readonly preMatchRepository: PreMatchRepository) {} | ||
|
|
||
| async generatePreMatchRanking( | ||
| departmentType: DepartmentType | ||
| ): Promise<Result.Result<Error, RankingDatum[]>> { | ||
| const matchesRes = await this.preMatchRepository.findAll(); | ||
| if (Result.isErr(matchesRes)) { | ||
| return matchesRes; | ||
| } | ||
| const departmentMatches = Result.unwrap(matchesRes).filter( | ||
| (match) => match.getDepartmentType() === departmentType | ||
| ); | ||
|
|
||
| // 各チームごとに走行結果を集める | ||
| const teamResults = new Map<TeamID, { points: number; goalTimeSeconds: number }>(); | ||
| for (const v of departmentMatches) { | ||
| // チーム1の結果 | ||
| const team1 = v.getTeamId1(); | ||
| // 存在しないなら何もしない | ||
| if (team1 !== undefined) { | ||
| const team1Result = v.getRunResults().filter((v) => v.getTeamId() === team1); | ||
| // 試合が始まっていないなら | ||
| if (team1Result.length === 0) { | ||
| teamResults.set(team1, { | ||
| points: 0, | ||
| goalTimeSeconds: Infinity, | ||
| }); | ||
| } else if (teamResults.has(team1)) { | ||
| const prev = teamResults.get(team1)!; | ||
| // 1つの予選試合には1回ずつしか結果がないので、0個めを取る | ||
| teamResults.set(team1, { | ||
| points: prev.points + team1Result[0].getPoints(), | ||
| // NOTE: 早い方を採用する | ||
| goalTimeSeconds: Math.min(prev.goalTimeSeconds, team1Result[0].getGoalTimeSeconds()), | ||
| }); | ||
| } else { | ||
| teamResults.set(team1, { | ||
| points: team1Result[0].getPoints(), | ||
| goalTimeSeconds: team1Result[0].getGoalTimeSeconds(), | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| // チーム2の結果 | ||
| const team2 = v.getTeamId2(); | ||
| // 存在しないなら何もしない | ||
| if (team2 !== undefined) { | ||
| const team2Result = v.getRunResults().filter((v) => v.getTeamId() === team2); | ||
| if (team2Result.length === 0) { | ||
| teamResults.set(team2, { | ||
| points: 0, | ||
| goalTimeSeconds: Infinity, | ||
| }); | ||
| } else if (teamResults.has(team2)) { | ||
| const prev = teamResults.get(team2)!; | ||
| teamResults.set(team2, { | ||
| // 1つの予選試合には1回ずつしか結果がないので、0個めを取る | ||
| points: prev.points + team2Result[0].getPoints(), | ||
| goalTimeSeconds: Math.min(prev.goalTimeSeconds, team2Result[0].getGoalTimeSeconds()), | ||
| }); | ||
| } else { | ||
| teamResults.set(team2, { | ||
| points: team2Result[0].getPoints(), | ||
| goalTimeSeconds: team2Result[0].getGoalTimeSeconds(), | ||
| }); | ||
| } | ||
| } | ||
| } | ||
| // 点数でソート (ゴールタイム: 早い順(asc)、ポイント: 大きい順(desc)) | ||
| const sortedTeams = [...teamResults.entries()].sort((a, b) => | ||
| a[1].points === b[1].points | ||
| ? a[1].goalTimeSeconds - b[1].goalTimeSeconds | ||
| : b[1].points - a[1].points | ||
| ); | ||
|
|
||
| const rankingData: RankingDatum[] = []; | ||
| // NOTE: Mapをfor..ofで回すと[key,value]しか取れないので一回展開して[index,value]にしている | ||
| for (const [i, v] of [...sortedTeams.entries()]) { | ||
| /** 前回の点数 */ | ||
| const prevPoints = rankingData[i - 1]?.points ?? -1; | ||
| /** 前回のゴールタイム */ | ||
| const prevGoalTime = rankingData[i - 1]?.goalTimeSeconds ?? Infinity; | ||
| const rank = rankingData[i - 1]?.rank ?? 0; | ||
| const isSameRank = v[1].points === prevPoints && v[1].goalTimeSeconds === prevGoalTime; | ||
|
|
||
| rankingData.push({ | ||
| rank: isSameRank ? rank : rank + 1, | ||
| teamID: v[0], | ||
| points: v[1].points, | ||
| goalTimeSeconds: v[1].goalTimeSeconds, | ||
| }); | ||
| } | ||
|
|
||
| return Result.ok(rankingData); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters